fix: local configuration bumping kurtosis to 0.2.29 (#176)

* fix: var zkevm_path_rw_data is defined in kurtosis/main but not yet on 0.2.8, try to override it * fix: bump kurtosis 0.2.19 to have the new variable
0xPolygon · Nov 8, 2024 · 242f2f3 · 242f2f3
1 parent 7d144a0
commit 242f2f3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
       with:
         repository: 0xPolygon/kurtosis-cdk
         path: "kurtosis-cdk"
-        ref: "v0.2.18"
+        ref: "v0.2.19"
 
     - name: Setup Bats and bats libs
       uses: bats-core/[email protected]

diff --git a/scripts/local_config b/scripts/local_config
@@ -316,10 +316,10 @@ EOF
 ###############################################################################
 function create_dest_folder(){
     export DEST=${TMP_CDK_FOLDER}/local_config
-    export path_rw_data=${TMP_CDK_FOLDER}/runtime
+    export zkevm_path_rw_data=${TMP_CDK_FOLDER}/runtime
     [ ! -d ${DEST} ] && mkdir -p ${DEST}
     rm $DEST/*
-    mkdir $path_rw_data
+    mkdir $zkevm_path_rw_data
 }
 ###############################################################################
 function download_kurtosis_artifacts(){

diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml
@@ -7,3 +7,4 @@ args:
   zkevm_use_gas_token_contract: true
   data_availability_mode: rollup
   sequencer_type: erigon
+
diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
@@ -6,3 +6,5 @@ args:
   zkevm_use_gas_token_contract: true
   data_availability_mode: cdk-validium
   sequencer_type: erigon
+
+
diff --git a/test/config/kurtosis-cdk-node-config.toml.template b/test/config/kurtosis-cdk-node-config.toml.template
@@ -1,12 +1,17 @@
-PathRWData = "/tmp/"
+PathRWData = "{{.zkevm_path_rw_data}}/"
 L1URL="{{.l1_rpc_url}}"
 L2URL="http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
 AggLayerURL="{{.agglayer_url}}"
 
 ForkId = {{.zkevm_rollup_fork_id}}
 IsValidiumMode = {{.is_cdk_validium}}
+
 {{if eq .zkevm_rollup_fork_id "12"}}
 ContractVersions = "banana"
+{{else if eq .zkevm_rollup_fork_id "13"}}
+# Doesn't look like this is needed at the moment, but soon perhaps?
+# ContractVersions = "durian"
+ContractVersions = "banana"
 {{else}}
 ContractVersions = "elderberry"
 {{end}}
@@ -46,7 +51,10 @@ Outputs = ["stderr"]
 
 [Aggregator]
         Port = "{{.zkevm_aggregator_port}}"
-
+        RetryTime = "30s"
+        VerifyProofInterval = "10s"
+        GasOffset = 150000
+        SettlementBackend = "agglayer"
         [Aggregator.DB]
                 Name = "{{.aggregator_db.name}}"
                 User = "{{.aggregator_db.user}}"
@@ -57,4 +65,8 @@ Outputs = ["stderr"]
                 MaxConns = 200
 
 [AggSender]
-SequencerPrivateKey = {Path = "{{or .zkevm_l2_agglayer_keystore_file "/pk/sequencer.keystore"}}", Password = "{{.zkevm_l2_agglayer_keystore_password}}"}
+CertificateSendInterval = "1m"
+CheckSettledInterval = "5s"
+SaveCertificatesToFilesPath = "{{.zkevm_path_rw_data}}/"
+
+