Merge pull request #16046 from MinaProtocol/sai/fix-nightly

removing devnet config and adding testnet overrides for devnet profile
MinaProtocol · Sep 14, 2024 · 7a3ad2b · 7a3ad2b
2 parents 4d7d7d2 + e43c573
commit 7a3ad2b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/scripts/docker/helper.sh b/scripts/docker/helper.sh
@@ -43,6 +43,18 @@ function export_suffixes () {
             ;;
         esac
         ;;
+        lightnet)
+        case "${DEB_BUILD_FLAGS}" in
+            *instrumented)
+            export DOCKER_DEB_SUFFIX="--build-arg deb_suffix=lightnet-instrumented"
+            export BUILD_FLAG_SUFFIX="lightnet-instrumented"
+            ;;
+            *)
+            export DOCKER_DEB_SUFFIX="--build-arg deb_suffix=lightnet"
+            export BUILD_FLAG_SUFFIX="-lightnet"
+            ;;
+        esac
+        ;;
         *)
         case "${DEB_BUILD_FLAGS}" in 
             *instrumented)

diff --git a/src/lib/integration_test_lib/test_config.ml b/src/lib/integration_test_lib/test_config.ml
@@ -85,14 +85,14 @@ type t =
 
 let proof_config_default : Runtime_config.Proof_keys.t =
   { level = Some Full
-  ; sub_windows_per_window = None
-  ; ledger_depth = None
-  ; work_delay = None
+  ; sub_windows_per_window = Some 11
+  ; ledger_depth = Some 35
+  ; work_delay = Some 2
   ; block_window_duration_ms = Some 120000
-  ; transaction_capacity = None
-  ; coinbase_amount = None
-  ; supercharged_coinbase_factor = None
-  ; account_creation_fee = None
+  ; transaction_capacity = Some (Log_2 7)
+  ; coinbase_amount = Some (Currency.Amount.of_mina_int_exn 720)
+  ; supercharged_coinbase_factor = Some 1
+  ; account_creation_fee = Some (Currency.Fee.of_mina_string_exn "1")
   ; fork = None
   }
 

diff --git a/src/lib/integration_test_local_engine/docker_node_config.ml b/src/lib/integration_test_local_engine/docker_node_config.ml
@@ -105,6 +105,7 @@ module Base_node_config = struct
       mina accounts import -config-directory /root/.mina-config -privkey-path "$key_file"
     fi
   done
+  rm /var/lib/coda/config*
   # Execute the puppeteer script
   exec /mina_daemon_puppeteer.py "$@"
   |}

diff --git a/src/lib/integration_test_local_engine/mina_docker.ml b/src/lib/integration_test_local_engine/mina_docker.ml
@@ -158,16 +158,16 @@ module Network_config = struct
           Some
             { txpool_max_size = Some txpool_max_size
             ; peer_list_url = None
-            ; zkapp_proof_update_cost = None
-            ; zkapp_signed_single_update_cost = None
-            ; zkapp_signed_pair_update_cost = None
-            ; zkapp_transaction_cost_limit = None
-            ; max_event_elements = None
-            ; max_action_elements = None
-            ; zkapp_cmd_limit_hardcap = None
+            ; zkapp_proof_update_cost = Some 10.26
+            ; zkapp_signed_single_update_cost = Some 9.140000000000001
+            ; zkapp_signed_pair_update_cost = Some 10.08
+            ; zkapp_transaction_cost_limit = Some 69.45
+            ; max_event_elements = Some 100
+            ; max_action_elements = Some 100
+            ; zkapp_cmd_limit_hardcap = Some 128
             ; slot_tx_end
             ; slot_chain_end
-            ; minimum_user_command_fee = None
+            ; minimum_user_command_fee = Some (Currency.Fee.of_string "1000000")
             ; network_id
             }
       ; genesis =