Merge branch 'master' into fix-closing-triedb

OffchainLabs · Nov 28, 2023 · 6fb2e3c · 6fb2e3c
2 parents 2c31c9b + c494d0b
commit 6fb2e3c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1623,6 +1623,8 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
 		result.MaxSubmissionFee = (*hexutil.Big)(inner.MaxSubmissionFee)
 		result.GasFeeCap = (*hexutil.Big)(inner.GasFeeCap)
 		result.ChainID = (*hexutil.Big)(inner.ChainId)
+	case *types.ArbitrumUnsignedTx:
+		result.ChainID = (*hexutil.Big)(inner.ChainId)
 	}
 	return result
 }

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. 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 {
@@ -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
@@ -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