Merge pull request ethereum#94 from OffchainLabs/extend-node-interface

`NodeInterfaceDebug.sol` address
joshuacolvin0 · Apr 27, 2022 · 6ff0381 · 6ff0381
2 parents 9ff50a5 + 426875b
commit 6ff0381
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/arbitrum/apibackend.go b/arbitrum/apibackend.go
@@ -97,16 +97,7 @@ func (a *APIBackend) FeeHistory(
 	}
 
 	nitroGenesis := core.NitroGenesisBlock
-	latestBlock := rpc.BlockNumber(a.CurrentBlock().NumberU64())
-	if newestBlock == rpc.LatestBlockNumber || newestBlock == rpc.PendingBlockNumber {
-		newestBlock = latestBlock
-	}
-	if newestBlock > latestBlock {
-		newestBlock = latestBlock
-	}
-	if newestBlock < nitroGenesis {
-		newestBlock = nitroGenesis
-	}
+	newestBlock, latestBlock := ClipToPostNitroGenesis(a, newestBlock)
 
 	maxFeeHistory := int(a.b.config.FeeHistoryMaxBlockCount)
 	if blocks > maxFeeHistory {
@@ -425,3 +416,21 @@ func (a *APIBackend) ChainConfig() *params.ChainConfig {
 func (a *APIBackend) Engine() consensus.Engine {
 	return a.blockChain().Engine()
 }
+
+type GetsCurrentBlock interface {
+	CurrentBlock() *types.Block
+}
+
+func ClipToPostNitroGenesis(getter GetsCurrentBlock, blockNum rpc.BlockNumber) (rpc.BlockNumber, rpc.BlockNumber) {
+	currentBlock := rpc.BlockNumber(getter.CurrentBlock().NumberU64())
+	if blockNum == rpc.LatestBlockNumber || blockNum == rpc.PendingBlockNumber {
+		blockNum = currentBlock
+	}
+	if blockNum > currentBlock {
+		blockNum = currentBlock
+	}
+	if blockNum < core.NitroGenesisBlock {
+		blockNum = core.NitroGenesisBlock
+	}
+	return blockNum, currentBlock
+}
diff --git a/core/arbitrum_hooks.go b/core/arbitrum_hooks.go
@@ -34,6 +34,7 @@ var InterceptRPCMessage func(
 	msg types.Message,
 	ctx context.Context,
 	statedb *state.StateDB,
+	header *types.Header,
 	backend NodeInterfaceBackendAPI,
 ) (types.Message, *ExecutionResult, error)
 
@@ -53,4 +54,5 @@ type NodeInterfaceBackendAPI interface {
 	CurrentBlock() *types.Block
 	BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Block, error)
 	GetLogs(ctx context.Context, blockHash common.Hash) ([][]*types.Log, error)
+	GetEVM(ctx context.Context, msg Message, state *state.StateDB, header *types.Header, vmConfig *vm.Config) (*vm.EVM, func() error, error)
 }
diff --git a/core/types/arbitrum_signer.go b/core/types/arbitrum_signer.go
@@ -10,6 +10,7 @@ var ArbosAddress = common.HexToAddress("0xa4b05")
 var ArbSysAddress = common.HexToAddress("0x64")
 var ArbRetryableTxAddress = common.HexToAddress("0x6e")
 var NodeInterfaceAddress = common.HexToAddress("0xc8")
+var NodeInterfaceDebugAddress = common.HexToAddress("0xc9")
 
 type arbitrumSigner struct{ Signer }
 

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -929,7 +929,7 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
 	// Arbitrum: support NodeInterface.sol by swapping out the message if needed
 	if core.InterceptRPCMessage != nil {
 		var res *core.ExecutionResult
-		msg, res, err = core.InterceptRPCMessage(msg, ctx, state, b)
+		msg, res, err = core.InterceptRPCMessage(msg, ctx, state, header, b)
 		if err != nil || res != nil {
 			return res, err
 		}