From ff9407abd181211e7303302b854f127e4ef28fa0 Mon Sep 17 00:00:00 2001 From: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:50:20 +0200 Subject: [PATCH] wip --- sequencesender/txbuilder/zkevm_cond_max_size.go | 1 + test/config/test.kurtosis_template.toml | 8 ++++---- test/scripts/config_kurtosis.sh | 9 +++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sequencesender/txbuilder/zkevm_cond_max_size.go b/sequencesender/txbuilder/zkevm_cond_max_size.go index 4a41f3d6..3218d015 100644 --- a/sequencesender/txbuilder/zkevm_cond_max_size.go +++ b/sequencesender/txbuilder/zkevm_cond_max_size.go @@ -49,6 +49,7 @@ func (c *NewSequenceConditionalMaxSize) NewSequenceIfWorthToSend(ctx context.Con return sequence, err } + log.Infof("[SeqSender] [MaxSize] current size:%d max_size:%d num_batches: %d", tx.Size(), c.maxTxSizeForL1, sequence.Len()) return nil, nil } diff --git a/test/config/test.kurtosis_template.toml b/test/config/test.kurtosis_template.toml index b4ff3066..25abf430 100644 --- a/test/config/test.kurtosis_template.toml +++ b/test/config/test.kurtosis_template.toml @@ -2,7 +2,7 @@ ForkUpgradeBatchNumber = 0 ForkUpgradeNewForkId = 0 [Common] -IsValidiumMode = true +IsValidiumMode = ${zkevm_is_validium} ContractVersions = "elderberry" [Common.Translator] FullMatchRules = [ @@ -48,7 +48,7 @@ MaxPendingTx = 1 [SequenceSender.EthTxManager.Etherman] URL = "http://127.0.0.1:${l1_rpc_port}" MultiGasProvider = false - L1ChainID = ${zkevm_l1_chain_id} + L1ChainID = ${l1_chain_id} [Aggregator] Host = "0.0.0.0" Port = 50081 @@ -100,7 +100,7 @@ SequencerPrivateKey = {} FinalizedStatusL1NumberOfBlocks = 0 [Aggregator.EthTxManager.Etherman] URL = "" - L1ChainID = 11155111 + L1ChainID = ${l1_chain_id} HTTPHeaders = [] [Aggregator.Synchronizer] [Aggregator.Synchronizer.DB] @@ -120,4 +120,4 @@ SequencerPrivateKey = {} OverrideStorageCheck = false [Aggregator.Synchronizer.Etherman] [Aggregator.Synchronizer.Etherman.Validium] - Enabled = false + Enabled = ${zkevm_is_validium} diff --git a/test/scripts/config_kurtosis.sh b/test/scripts/config_kurtosis.sh index b2066ea7..009c59ba 100755 --- a/test/scripts/config_kurtosis.sh +++ b/test/scripts/config_kurtosis.sh @@ -27,8 +27,13 @@ export zkevm_data_streamer_port=$(kurtosis enclave inspect $ENCLAVE | grep "data kurtosis files download $ENCLAVE zkevm-sequence-sender-config-artifact $DEST export zkevm_l2_sequencer_address=$(cat $DEST/config.toml |grep L2Coinbase | cut -f 2 -d "="| tr -d '"' | tr -d ' ') export zkevm_l2_keystore_password=$(cat $DEST/config.toml |grep -A1 L2Coinbase | tr ',' '\n' | grep Password | cut -f 2 -d '=' | tr -d '}' | tr -d '"' | tr -d ' ') -export zkevm_l1_chain_id=$(cat $DEST/config.toml |grep L1ChainID | cut -f 2 -d '=') +export l1_chain_id=$(cat $DEST/config.toml |grep L1ChainID | cut -f 2 -d '=') +export zkevm_is_validium=$(cat $DEST/config.toml |grep IsValidiumMode | cut -f 2 -d '=') #build_vars_file envsubst < test/config/test.kurtosis_template.toml > $DEST/test.kurtosis.toml -#kurtosis files rendertemplate $ENCLAVE config/test.kurtosis_template.toml $DEST/vars.json config/test.kurtosis.toml \ No newline at end of file + +echo "rember to stop sequence-sender:" +echo "-----------------------------------------------------------" +echo "kurtosis service stop cdk-v1 zkevm-node-sequence-sender-001" +