address PR comments

OffchainLabs · Sep 28, 2023 · 76a5008 · 76a5008
1 parent b5d5c2b
commit 76a5008
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/core/genesis_test.go b/core/genesis_test.go
@@ -41,24 +41,22 @@ func TestInvalidCliqueConfig(t *testing.T) {
 	}
 }
 
-func newUint64(val uint64) *uint64 { return &val }
-
 func TestSetupGenesis(t *testing.T) {
 	var (
 		customghash = common.HexToHash("0x89c99d90b79719238d2645c7642f2c9295246e80775b38cfd162b696817fbd50")
 		customg     = Genesis{
 			Config: &params.ChainConfig{HomesteadBlock: big.NewInt(3), ArbitrumChainParams: params.ArbitrumChainParams{
-				MaxCodeSize:     newUint64(params.MaxCodeSize),
-				MaxInitCodeSize: newUint64(params.MaxInitCodeSize)}},
+				MaxCodeSize:     params.MaxCodeSize,
+				MaxInitCodeSize: params.MaxInitCodeSize}},
 			Alloc: GenesisAlloc{
 				{1}: {Balance: big.NewInt(1), Storage: map[common.Hash]common.Hash{{1}: {1}}},
 			},
 		}
 		oldcustomg = customg
 	)
 	oldcustomg.Config = &params.ChainConfig{HomesteadBlock: big.NewInt(2), ArbitrumChainParams: params.ArbitrumChainParams{
-		MaxCodeSize:     newUint64(params.MaxCodeSize),
-		MaxInitCodeSize: newUint64(params.MaxInitCodeSize)}}
+		MaxCodeSize:     params.MaxCodeSize,
+		MaxInitCodeSize: params.MaxInitCodeSize}}
 	tests := []struct {
 		name       string
 		fn         func(ethdb.Database) (*params.ChainConfig, common.Hash, error)

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -59,8 +59,8 @@ func TestStateProcessorErrors(t *testing.T) {
 			LondonBlock:         big.NewInt(0),
 			Ethash:              new(params.EthashConfig),
 			ArbitrumChainParams: params.ArbitrumChainParams{
-				MaxCodeSize:     newUint64(params.MaxCodeSize),
-				MaxInitCodeSize: newUint64(params.MaxInitCodeSize),
+				MaxCodeSize:     params.MaxCodeSize,
+				MaxInitCodeSize: params.MaxInitCodeSize,
 			},
 		}
 		signer  = types.LatestSigner(config)
@@ -242,8 +242,8 @@ func TestStateProcessorErrors(t *testing.T) {
 					IstanbulBlock:       big.NewInt(0),
 					MuirGlacierBlock:    big.NewInt(0),
 					ArbitrumChainParams: params.ArbitrumChainParams{
-						MaxCodeSize:     newUint64(params.MaxCodeSize),
-						MaxInitCodeSize: newUint64(params.MaxInitCodeSize),
+						MaxCodeSize:     params.MaxCodeSize,
+						MaxInitCodeSize: params.MaxInitCodeSize,
 					},
 				},
 				Alloc: GenesisAlloc{
@@ -342,8 +342,8 @@ func TestStateProcessorErrors(t *testing.T) {
 					TerminalTotalDifficultyPassed: true,
 					ShanghaiTime:                  u64(0),
 					ArbitrumChainParams: params.ArbitrumChainParams{
-						MaxCodeSize:     newUint64(params.MaxCodeSize),
-						MaxInitCodeSize: newUint64(params.MaxInitCodeSize),
+						MaxCodeSize:     params.MaxCodeSize,
+						MaxInitCodeSize: params.MaxInitCodeSize,
 					},
 				},
 				Alloc: GenesisAlloc{

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -408,8 +408,8 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 	}
 
 	// Check whether the init code size has been exceeded.
-	if rules.IsShanghai && contractCreation && len(msg.Data) > int(*st.evm.ChainConfig().ArbitrumChainParams.MaxInitCodeSize) {
-		return nil, fmt.Errorf("%w: code size %v limit %v", ErrMaxInitCodeSizeExceeded, len(msg.Data), int(*st.evm.ChainConfig().ArbitrumChainParams.MaxInitCodeSize))
+	if rules.IsShanghai && contractCreation && len(msg.Data) > int(st.evm.ChainConfig().ArbitrumChainParams.MaxInitCodeSize) {
+		return nil, fmt.Errorf("%w: code size %v limit %v", ErrMaxInitCodeSizeExceeded, len(msg.Data), int(st.evm.ChainConfig().ArbitrumChainParams.MaxInitCodeSize))
 	}
 
 	// Execute the preparatory steps for state transition which includes:

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
@@ -615,8 +615,8 @@ func (pool *TxPool) validateTxBasics(tx *types.Transaction, local bool) error {
 		return ErrOversizedData
 	}
 	// Check whether the init code size has been exceeded.
-	if pool.shanghai.Load() && tx.To() == nil && len(tx.Data()) > int(*pool.chainconfig.ArbitrumChainParams.MaxInitCodeSize) {
-		return fmt.Errorf("%w: code size %v limit %v", core.ErrMaxInitCodeSizeExceeded, len(tx.Data()), int(*pool.chainconfig.ArbitrumChainParams.MaxInitCodeSize))
+	if pool.shanghai.Load() && tx.To() == nil && len(tx.Data()) > int(pool.chainconfig.ArbitrumChainParams.MaxInitCodeSize) {
+		return fmt.Errorf("%w: code size %v limit %v", core.ErrMaxInitCodeSizeExceeded, len(tx.Data()), int(pool.chainconfig.ArbitrumChainParams.MaxInitCodeSize))
 	}
 	// Transactions can't be negative. This may never happen using RLP decoded
 	// transactions but may occur if you create a transaction using the RPC.

diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -504,7 +504,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
 	ret, err := evm.interpreter.Run(contract, nil, false)
 
 	// Check whether the max code size has been exceeded, assign err if the case.
-	if err == nil && evm.chainRules.IsEIP158 && len(ret) > int(*evm.chainConfig.ArbitrumChainParams.MaxCodeSize) {
+	if err == nil && evm.chainRules.IsEIP158 && len(ret) > int(evm.chainConfig.ArbitrumChainParams.MaxCodeSize) {
 		err = ErrMaxCodeSizeExceeded
 	}
 

diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
@@ -308,7 +308,7 @@ func gasCreateEip3860(evm *EVM, contract *Contract, stack *Stack, mem *Memory, m
 		return 0, err
 	}
 	size, overflow := stack.Back(2).Uint64WithOverflow()
-	if overflow || size > *evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize {
+	if overflow || size > evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize {
 		return 0, ErrGasUintOverflow
 	}
 	// Since size <= *evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize, these multiplication cannot overflow
@@ -324,7 +324,7 @@ func gasCreate2Eip3860(evm *EVM, contract *Contract, stack *Stack, mem *Memory,
 		return 0, err
 	}
 	size, overflow := stack.Back(2).Uint64WithOverflow()
-	if overflow || size > *evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize {
+	if overflow || size > evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize {
 		return 0, ErrGasUintOverflow
 	}
 	// Since size <= *evm.chainConfig.ArbitrumChainParams.MaxInitCodeSize, these multiplication cannot overflow

diff --git a/params/config.go b/params/config.go
@@ -318,11 +318,11 @@ func (c *ChainConfig) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &cfgJSON); err != nil {
 		return err
 	}
-	if cfgJSON.ArbitrumChainParams.MaxCodeSize == nil {
-		cfgJSON.ArbitrumChainParams.MaxCodeSize = newUint64(MaxCodeSize)
+	if cfgJSON.ArbitrumChainParams.MaxCodeSize == 0 {
+		cfgJSON.ArbitrumChainParams.MaxCodeSize = MaxCodeSize
 	}
-	if cfgJSON.ArbitrumChainParams.MaxInitCodeSize == nil {
-		cfgJSON.ArbitrumChainParams.MaxInitCodeSize = newUint64(MaxInitCodeSize)
+	if cfgJSON.ArbitrumChainParams.MaxInitCodeSize == 0 {
+		cfgJSON.ArbitrumChainParams.MaxInitCodeSize = MaxInitCodeSize
 	}
 	*c = ChainConfig(cfgJSON)
 	return nil

diff --git 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
-	MaxInitCodeSize           *uint64 `json:"maxInitCodeSize,omitempty"` // Maximum initcode to permit in a creation transaction and create instructions
+	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. o vale implies params.MaxInitCodeSize
 }
 
 func (c *ChainConfig) IsArbitrum() bool {
@@ -138,8 +138,8 @@ func DisableArbitrumParams() ArbitrumChainParams {
 		DataAvailabilityCommittee: false,
 		InitialArbOSVersion:       0,
 		InitialChainOwner:         common.Address{},
-		MaxCodeSize:               newUint64(MaxCodeSize),
-		MaxInitCodeSize:           newUint64(MaxInitCodeSize),
+		MaxCodeSize:               MaxCodeSize,
+		MaxInitCodeSize:           MaxInitCodeSize,
 	}
 }
 

diff --git a/params/config_test.go b/params/config_test.go
@@ -156,6 +156,8 @@ var unmarshalChainConfigTests = []marshalUnMarshalTest{
 		want: [2]uint64{MaxCodeSize, 10}},
 	{input: `{"arbitrum": {} }`,
 		want: [2]uint64{MaxCodeSize, MaxInitCodeSize}},
+	{input: `{"arbitrum": {"maxCodeSize": 0, "maxInitCodeSize": 0} }`,
+		want: [2]uint64{MaxCodeSize, MaxInitCodeSize}},
 }
 
 func TestUnmarshalChainConfig(t *testing.T) {
@@ -165,9 +167,9 @@ func TestUnmarshalChainConfig(t *testing.T) {
 			t.Errorf("failed to unmarshal. Error: %q", err)
 		}
 		expected := test.want.([2]uint64)
-		if *c.ArbitrumChainParams.MaxCodeSize != expected[0] || *c.ArbitrumChainParams.MaxInitCodeSize != expected[1] {
+		if c.ArbitrumChainParams.MaxCodeSize != expected[0] || c.ArbitrumChainParams.MaxInitCodeSize != expected[1] {
 			t.Errorf("failed to unmarshal MaxCodeSize and MaxInitCodeSize correctly. unmarshalled as (%d %d) want (%d %d))",
-				*c.ArbitrumChainParams.MaxCodeSize, *c.ArbitrumChainParams.MaxInitCodeSize, expected[0], expected[1])
+				c.ArbitrumChainParams.MaxCodeSize, c.ArbitrumChainParams.MaxInitCodeSize, expected[0], expected[1])
 		}
 	}
 }