Merge branch 'master' into make-filterlogsfunction-public

Author: ganeshvanahalli

core/genesis.go

@@ -73,6 +73,9 @@ type Genesis struct {
 	BaseFee       *big.Int    `json:"baseFeePerGas"` // EIP-1559
 	ExcessBlobGas *uint64     `json:"excessBlobGas"` // EIP-4844
 	BlobGasUsed   *uint64     `json:"blobGasUsed"`   // EIP-4844
+
+	// Arbitrum
+	ArbOSInit *params.ArbOSInit `json:"arbOSInit,omitempty"`
 }
 
 // copy copies the genesis.

core/state/statedb.go

@@ -479,6 +479,13 @@ func (s *StateDB) ExpectBalanceBurn(amount *big.Int) {
 	s.arbExtraData.unexpectedBalanceDelta.Add(s.arbExtraData.unexpectedBalanceDelta, amount)
 }
 
+func (s *StateDB) ExpectBalanceMint(amount *big.Int) {
+	if amount.Sign() < 0 {
+		panic(fmt.Sprintf("ExpectBalanceMint called with negative amount %v", amount))
+	}
+	s.arbExtraData.unexpectedBalanceDelta.Sub(s.arbExtraData.unexpectedBalanceDelta, amount)
+}
+
 func (s *StateDB) SetNonce(addr common.Address, nonce uint64, reason tracing.NonceChangeReason) {
 	stateObject := s.getOrNewStateObject(addr)
 	if stateObject != nil {

core/state/statedb_hooked.go

@@ -362,6 +362,10 @@ func (s *hookedStateDB) ExpectBalanceBurn(b *big.Int) {
 	s.inner.ExpectBalanceBurn(b)
 }
 
+func (s *hookedStateDB) ExpectBalanceMint(b *big.Int) {
+	s.inner.ExpectBalanceMint(b)
+}
+
 func (s *hookedStateDB) GetSelfDestructs() []common.Address {
 	return s.inner.GetSelfDestructs()
 }

core/tracing/gen_balance_change_reason_stringer.go

@@ -307,6 +307,9 @@ const (
 	// Stylus
 	BalanceChangeTransferActivationFee
 	BalanceChangeTransferActivationReimburse
+	// Native token minting and burning
+	BalanceIncreaseMintNativeToken
+	BalanceDecreaseBurnNativeToken
 )
 
 // Str gives the arbitrum specific string for the corresponding BalanceChangeReason

core/tracing/hooks.go

@@ -22,6 +22,7 @@ var ArbStatisticsAddress = common.HexToAddress("0x6f")
 var ArbOwnerAddress = common.HexToAddress("0x70")
 var ArbWasmAddress = common.HexToAddress("0x71")
 var ArbWasmCacheAddress = common.HexToAddress("0x72")
+var ArbNativeTokenManagerAddress = common.HexToAddress("0x73")
 var NodeInterfaceAddress = common.HexToAddress("0xc8")
 var NodeInterfaceDebugAddress = common.HexToAddress("0xc9")
 var ArbDebugAddress = common.HexToAddress("0xff")

core/types/arbitrum_signer.go

@@ -66,6 +66,7 @@ type StateDB interface {
 	AddBalance(common.Address, *uint256.Int, tracing.BalanceChangeReason) uint256.Int
 	GetBalance(common.Address) *uint256.Int
 	ExpectBalanceBurn(*big.Int)
+	ExpectBalanceMint(*big.Int)
 
 	GetNonce(common.Address) uint64
 	SetNonce(common.Address, uint64, tracing.NonceChangeReason)

core/vm/interface.go

@@ -194,6 +194,9 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend, head
 	if args.BlobFeeCap != nil && args.BlobFeeCap.ToInt().Sign() == 0 {
 		return errors.New("maxFeePerBlobGas, if specified, must be non-zero")
 	}
+	if b.ChainConfig().IsCancun(head.Number, head.Time, types.DeserializeHeaderExtraInformation(head).ArbOSFormatVersion) {
+		args.setCancunFeeDefaults(b.ChainConfig(), head)
+	}
 	// If both gasPrice and at least one of the EIP-1559 fee parameters are specified, error.
 	if args.GasPrice != nil && (args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil) {
 		return errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
@@ -211,10 +214,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend, head
 		if args.MaxFeePerGas.ToInt().Cmp(args.MaxPriorityFeePerGas.ToInt()) < 0 {
 			return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", args.MaxFeePerGas, args.MaxPriorityFeePerGas)
 		}
-		// No need to set anything other than CancunFeeDefaults, user already set MaxFeePerGas and MaxPriorityFeePerGas
-		if err := args.setCancunFeeDefaults(ctx, b.ChainConfig(), head, b); err != nil {
-			return err
-		}
+		return nil // No need to set anything, user already set MaxFeePerGas and MaxPriorityFeePerGas
 	}
 
 	// Sanity check the non-EIP-1559 fee parameters.
@@ -228,14 +228,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend, head
 	}
 
 	// Now attempt to fill in default value depending on whether London is active or not.
-	if b.ChainConfig().IsCancun(head.Number, head.Time, types.DeserializeHeaderExtraInformation(head).ArbOSFormatVersion) {
-		if err := args.setCancunFeeDefaults(ctx, b.ChainConfig(), head, b); err != nil {
-			return err
-		}
-	} else if isLondon {
-		if args.BlobFeeCap != nil {
-			return errors.New("maxFeePerBlobGas is not valid before Cancun is active")
-		}
+	if isLondon {
 		// London is active, set maxPriorityFeePerGas and maxFeePerGas.
 		if err := args.setLondonFeeDefaults(ctx, head, b); err != nil {
 			return err
@@ -255,7 +248,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend, head
 }
 
 // setCancunFeeDefaults fills in reasonable default fee values for unspecified fields.
-func (args *TransactionArgs) setCancunFeeDefaults(ctx context.Context, config *params.ChainConfig, head *types.Header, b Backend) error {
+func (args *TransactionArgs) setCancunFeeDefaults(config *params.ChainConfig, head *types.Header) {
 	// Set maxFeePerBlobGas if it is missing.
 	if args.BlobHashes != nil && args.BlobFeeCap == nil {
 		blobBaseFee := eip4844.CalcBlobFee(config, head)
@@ -265,7 +258,6 @@ func (args *TransactionArgs) setCancunFeeDefaults(ctx context.Context, config *p
 		val := new(big.Int).Mul(blobBaseFee, big.NewInt(2))
 		args.BlobFeeCap = (*hexutil.Big)(val)
 	}
-	return args.setLondonFeeDefaults(ctx, head, b)
 }
 
 // setLondonFeeDefaults fills in reasonable default fee values for unspecified fields.

internal/ethapi/transaction_args.go

@@ -344,6 +344,12 @@ var NetworkNames = map[string]string{
 	HoleskyChainConfig.ChainID.String(): "holesky",
 }
 
+// Arbitrum
+// ArbOSInit defines some initialization values for ArbOS state.
+type ArbOSInit struct {
+	NativeTokenSupplyManagementEnabled bool `json:"nativeTokenSupplyManagementEnabled"`
+}
+
 // ChainConfig is the core config which determines the blockchain settings.
 //
 // ChainConfig is stored in the database on a per block basis. This means

params/config.go

@@ -37,13 +37,14 @@ const ArbosVersion_30 = uint64(30)
 const ArbosVersion_31 = uint64(31)
 const ArbosVersion_32 = uint64(32)
 const ArbosVersion_40 = uint64(40)
+const ArbosVersion_41 = uint64(41)
 
 const ArbosVersion_FixRedeemGas = ArbosVersion_11
 const ArbosVersion_Stylus = ArbosVersion_30
 const ArbosVersion_StylusFixes = ArbosVersion_31
 const ArbosVersion_StylusChargingFixes = ArbosVersion_32
 const MaxArbosVersionSupported = ArbosVersion_40
-const MaxDebugArbosVersionSupported = ArbosVersion_40
+const MaxDebugArbosVersionSupported = ArbosVersion_41
 
 type ArbitrumChainParams struct {
 	EnableArbOS               bool