From 4e7da041fa60633d4491537a77c86bc89cf78c94 Mon Sep 17 00:00:00 2001 From: ganeshvanahalli Date: Mon, 27 Nov 2023 19:49:44 +0530 Subject: [PATCH 1/2] Rename MaxCodeSize and MaxInitCodeSize to DefaultMaxCodeSize and DefaultMaxInitCodeSize --- params/config_arbitrum.go | 2 +- params/protocol_params.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/params/config_arbitrum.go b/params/config_arbitrum.go index 6d93a685e1..b9c74f4c10 100644 --- a/params/config_arbitrum.go +++ b/params/config_arbitrum.go @@ -43,7 +43,7 @@ func (c *ChainConfig) IsArbitrumNitro(num *big.Int) bool { func (c *ChainConfig) MaxCodeSize() uint64 { if c.ArbitrumChainParams.MaxCodeSize == 0 { - return MaxCodeSize + return DefaultMaxCodeSize } return c.ArbitrumChainParams.MaxCodeSize } diff --git a/params/protocol_params.go b/params/protocol_params.go index a407ed1473..1430a602b2 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -124,8 +124,8 @@ const ( DefaultElasticityMultiplier = 2 // Bounds the maximum gas limit an EIP-1559 block may have. InitialBaseFee = 1000000000 // Initial base fee for EIP-1559 blocks. - MaxCodeSize = 24576 // Maximum bytecode to permit for a contract - MaxInitCodeSize = 2 * MaxCodeSize // Maximum initcode to permit in a creation transaction and create instructions + DefaultMaxCodeSize = 24576 // Maximum bytecode to permit for a contract + DefaultMaxInitCodeSize = 2 * DefaultMaxCodeSize // Maximum initcode to permit in a creation transaction and create instructions // Precompiled contract gas prices From 197f5ff0c9bff867301506aaa459735e3b05b19f Mon Sep 17 00:00:00 2001 From: ganeshvanahalli Date: Mon, 27 Nov 2023 19:56:36 +0530 Subject: [PATCH 2/2] minor fix --- core/state_processor_test.go | 2 +- params/config_arbitrum.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/state_processor_test.go b/core/state_processor_test.go index b31bf0076d..87f03d3cbc 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -128,7 +128,7 @@ func TestStateProcessorErrors(t *testing.T) { }, } blockchain, _ = NewBlockChain(db, nil, nil, gspec, nil, beacon.New(ethash.NewFaker()), vm.Config{}, nil, nil) - tooBigInitCode = [params.MaxInitCodeSize + 1]byte{} + tooBigInitCode = [params.DefaultMaxInitCodeSize + 1]byte{} ) defer blockchain.Stop() diff --git a/params/config_arbitrum.go b/params/config_arbitrum.go index b9c74f4c10..869386415b 100644 --- a/params/config_arbitrum.go +++ b/params/config_arbitrum.go @@ -29,8 +29,8 @@ type ArbitrumChainParams struct { InitialArbOSVersion uint64 InitialChainOwner common.Address GenesisBlockNum uint64 - MaxCodeSize uint64 `json:"MaxCodeSize,omitempty"` // Maximum bytecode to permit for a contract. 0 value implies params.MaxCodeSize - MaxInitCodeSize uint64 `json:"MaxInitCodeSize,omitempty"` // Maximum initcode to permit in a creation transaction and create instructions. 0 value implies params.MaxInitCodeSize + MaxCodeSize uint64 `json:"MaxCodeSize,omitempty"` // Maximum bytecode to permit for a contract. 0 value implies params.DefaultMaxCodeSize + MaxInitCodeSize uint64 `json:"MaxInitCodeSize,omitempty"` // Maximum initcode to permit in a creation transaction and create instructions. 0 value implies params.DefaultMaxInitCodeSize } func (c *ChainConfig) IsArbitrum() bool {