From 48bb8cd5509146c4df8b8a17052e12467a42b60a Mon Sep 17 00:00:00 2001 From: Matt Curtis Date: Tue, 27 Feb 2024 10:48:44 +0000 Subject: [PATCH 1/2] Batch limit: increase max to 36kb --- integration/common/constants.go | 2 +- integration/simulation/devnetwork/node.go | 2 +- integration/simulation/network/network_utils.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/common/constants.go b/integration/common/constants.go index c0efda30a0..c96503d3bc 100644 --- a/integration/common/constants.go +++ b/integration/common/constants.go @@ -80,7 +80,7 @@ func DefaultEnclaveConfig() *config.EnclaveConfig { SequencerID: gethcommon.BytesToAddress([]byte("")), ObscuroGenesis: "", DebugNamespaceEnabled: false, - MaxBatchSize: 1024 * 32, + MaxBatchSize: 1024 * 36, MaxRollupSize: 1024 * 64, GasPaymentAddress: gethcommon.HexToAddress("0xd6C9230053f45F873Cb66D8A02439380a37A4fbF"), BaseFee: new(big.Int).SetUint64(params.InitialBaseFee), diff --git a/integration/simulation/devnetwork/node.go b/integration/simulation/devnetwork/node.go index 493ea6a415..dbb0fba254 100644 --- a/integration/simulation/devnetwork/node.go +++ b/integration/simulation/devnetwork/node.go @@ -178,7 +178,7 @@ func (n *InMemNodeOperator) createEnclaveContainer() *enclavecontainer.EnclaveCo MessageBusAddress: n.l1Data.MessageBusAddr, SqliteDBPath: n.enclaveDBFilepath, DebugNamespaceEnabled: true, - MaxBatchSize: 1024 * 32, + MaxBatchSize: 1024 * 36, MaxRollupSize: 1024 * 64, BaseFee: defaultCfg.BaseFee, // todo @siliev:: fix test transaction builders so this can be different GasBatchExecutionLimit: defaultCfg.GasBatchExecutionLimit, diff --git a/integration/simulation/network/network_utils.go b/integration/simulation/network/network_utils.go index 6e758ed85d..e5c8953d46 100644 --- a/integration/simulation/network/network_utils.go +++ b/integration/simulation/network/network_utils.go @@ -91,7 +91,7 @@ func createInMemObscuroNode( MinGasPrice: gethcommon.Big1, MessageBusAddress: l1BusAddress, ManagementContractAddress: *mgtContractAddress, - MaxBatchSize: 1024 * 32, + MaxBatchSize: 1024 * 36, MaxRollupSize: 1024 * 64, BaseFee: big.NewInt(1), // todo @siliev:: fix test transaction builders so this can be different GasLocalExecutionCapFlag: params.MaxGasLimit / 2, From 03e15172772630830990ed67a4adaae3a1a0050f Mon Sep 17 00:00:00 2001 From: Matt Curtis Date: Tue, 27 Feb 2024 11:56:48 +0000 Subject: [PATCH 2/2] missed a couple --- go/config/enclave_cli_flags.go | 2 +- go/node/docker_node.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/config/enclave_cli_flags.go b/go/config/enclave_cli_flags.go index 202b8b9ae5..0633920f80 100644 --- a/go/config/enclave_cli_flags.go +++ b/go/config/enclave_cli_flags.go @@ -52,7 +52,7 @@ var EnclaveFlags = map[string]*flag.TenFlag{ MinGasPriceFlag: flag.NewInt64Flag(MinGasPriceFlag, 1, "The minimum gas price for mining a transaction"), MessageBusAddressFlag: flag.NewStringFlag(MessageBusAddressFlag, "", "The address of the L1 message bus contract owned by the management contract."), SequencerIDFlag: flag.NewStringFlag(SequencerIDFlag, "", "The 20 bytes of the address of the sequencer for this network"), - MaxBatchSizeFlag: flag.NewUint64Flag(MaxBatchSizeFlag, 1024*32, "The maximum size a batch is allowed to reach uncompressed"), + MaxBatchSizeFlag: flag.NewUint64Flag(MaxBatchSizeFlag, 1024*36, "The maximum size a batch is allowed to reach uncompressed"), MaxRollupSizeFlag: flag.NewUint64Flag(MaxRollupSizeFlag, 1024*64, "The maximum size a rollup is allowed to reach"), L2BaseFeeFlag: flag.NewUint64Flag(L2BaseFeeFlag, params.InitialBaseFee, ""), L2CoinbaseFlag: flag.NewStringFlag(L2CoinbaseFlag, "0xd6C9230053f45F873Cb66D8A02439380a37A4fbF", ""), diff --git a/go/node/docker_node.go b/go/node/docker_node.go index 525517711f..7ce9cc5ec9 100644 --- a/go/node/docker_node.go +++ b/go/node/docker_node.go @@ -179,7 +179,7 @@ func (d *DockerNode) startEnclave() error { "-logPath", "sys_out", "-logLevel", fmt.Sprintf("%d", log.LvlInfo), fmt.Sprintf("-debugNamespaceEnabled=%t", d.cfg.debugNamespaceEnabled), - "-maxBatchSize=32768", + "-maxBatchSize=36864", "-maxRollupSize=65536", fmt.Sprintf("-logLevel=%d", d.cfg.logLevel), "-obscuroGenesis", "{}",