status-im/op-geth
2
0
Fork 0
mirror of https://github.com/status-im/op-geth.git synced 2025-02-12 14:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ethapi/api: updates to optimism daisy chain post-testing

Browse Source
This commit is contained in:
Matthew Slipper 2023-01-19 17:51:09 -07:00 committed by protolambda
parent 459d1342bb
commit 3518fe99f6
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
1 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
internal/ethapi/api.go
View File

@ -25,6 +25,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/tyler-smith/go-bip39" "github.com/tyler-smith/go-bip39"
@ -631,12 +633,12 @@ func (s *BlockChainAPI) BlockNumber() hexutil.Uint64 {
// given block number. The rpc.LatestBlockNumber and rpc.PendingBlockNumber meta // given block number. The rpc.LatestBlockNumber and rpc.PendingBlockNumber meta
// block numbers are also allowed. // block numbers are also allowed.
func (s *BlockChainAPI) GetBalance(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (*hexutil.Big, error) { func (s *BlockChainAPI) GetBalance(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (*hexutil.Big, error) {
state, header, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if state == nil || err != nil { if err != nil {
return nil, err return nil, err
} }
if header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Big var res hexutil.Big
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getBalance", address, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getBalance", address, blockNrOrHash)
@ -649,6 +651,11 @@ func (s *BlockChainAPI) GetBalance(ctx context.Context, address common.Address,
} }
} }
state, _, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
if state == nil || err != nil {
return nil, err
}
return (*hexutil.Big)(state.GetBalance(address)), state.Error() return (*hexutil.Big)(state.GetBalance(address)), state.Error()
} }
@ -671,11 +678,11 @@ type StorageResult struct {
// GetProof returns the Merkle-proof for a given account and optionally some storage keys. // GetProof returns the Merkle-proof for a given account and optionally some storage keys.
func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, storageKeys []string, blockNrOrHash rpc.BlockNumberOrHash) (*AccountResult, error) { func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, storageKeys []string, blockNrOrHash rpc.BlockNumberOrHash) (*AccountResult, error) {
state, header, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if state == nil || err != nil { if err != nil {
return nil, err return nil, err
} }
if header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res AccountResult var res AccountResult
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getProof", address, storageKeys, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getProof", address, storageKeys, blockNrOrHash)
@ -687,6 +694,10 @@ func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, st
return nil, rpc.ErrNoHistoricalFallback return nil, rpc.ErrNoHistoricalFallback
} }
} }
state, _, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
if state == nil || err != nil {
return nil, err
}
storageTrie, err := state.StorageTrie(address) storageTrie, err := state.StorageTrie(address)
if err != nil { if err != nil {
return nil, err return nil, err
@ -863,12 +874,12 @@ func (s *BlockChainAPI) GetUncleCountByBlockHash(ctx context.Context, blockHash
// GetCode returns the code stored at the given address in the state for the given block number. // GetCode returns the code stored at the given address in the state for the given block number.
func (s *BlockChainAPI) GetCode(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) { func (s *BlockChainAPI) GetCode(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) {
state, header, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if state == nil || err != nil { if err != nil {
return nil, err return nil, err
} }
if header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Bytes var res hexutil.Bytes
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getCode", address, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getCode", address, blockNrOrHash)
@ -881,6 +892,11 @@ func (s *BlockChainAPI) GetCode(ctx context.Context, address common.Address, blo
} }
} }
state, _, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
if state == nil || err != nil {
return nil, err
}
code := state.GetCode(address) code := state.GetCode(address)
return code, state.Error() return code, state.Error()
} }
@ -889,12 +905,12 @@ func (s *BlockChainAPI) GetCode(ctx context.Context, address common.Address, blo
// block number. The rpc.LatestBlockNumber and rpc.PendingBlockNumber meta block // block number. The rpc.LatestBlockNumber and rpc.PendingBlockNumber meta block
// numbers are also allowed. // numbers are also allowed.
func (s *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Address, hexKey string, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) { func (s *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Address, hexKey string, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) {
state, header, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if state == nil || err != nil { if err != nil {
return nil, err return nil, err
} }
if header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Bytes var res hexutil.Bytes
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getStorageAt", address, hexKey, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getStorageAt", address, hexKey, blockNrOrHash)
@ -907,6 +923,11 @@ func (s *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Address
} }
} }
state, _, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
if state == nil || err != nil {
return nil, err
}
key, err := decodeHash(hexKey) key, err := decodeHash(hexKey)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to decode storage key: %s", err) return nil, fmt.Errorf("unable to decode storage key: %s", err)
@ -915,6 +936,18 @@ func (s *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Address
return res[:], state.Error() return res[:], state.Error()
} }
// The HeaderByNumberOrHash method returns a nil error and nil header
// if the header is not found, but only for nonexistent block numbers. This is
// different from StateAndHeaderByNumberOrHash. To account for this discrepancy,
// headerOrNumberByHash will properly convert the error into an ethereum.NotFound.
func headerByNumberOrHash(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrHash) (*types.Header, error) {
header, err := b.HeaderByNumberOrHash(ctx, blockNrOrHash)
if header == nil {
return nil, fmt.Errorf("header %w", ethereum.NotFound)
}
return header, err
}
// OverrideAccount indicates the overriding fields of account during the execution // OverrideAccount indicates the overriding fields of account during the execution
// of a message call. // of a message call.
// Note, state and stateDiff can't be specified at the same time. If state is // Note, state and stateDiff can't be specified at the same time. If state is
@ -1102,8 +1135,12 @@ func (e *revertError) ErrorData() interface{} {
// Note, this function doesn't make and changes in the state/blockchain and is // Note, this function doesn't make and changes in the state/blockchain and is
// useful to execute and retrieve values. // useful to execute and retrieve values.
func (s *BlockChainAPI) Call(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride) (hexutil.Bytes, error) { func (s *BlockChainAPI) Call(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride) (hexutil.Bytes, error) {
header, err := s.b.HeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if err == nil && header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if err != nil {
return nil, err
}
if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Bytes var res hexutil.Bytes
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_call", args, blockNrOrHash, overrides) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_call", args, blockNrOrHash, overrides)
@ -1255,8 +1292,12 @@ func (s *BlockChainAPI) EstimateGas(ctx context.Context, args TransactionArgs, b
bNrOrHash = *blockNrOrHash bNrOrHash = *blockNrOrHash
} }
header, err := s.b.HeaderByNumberOrHash(ctx, bNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, bNrOrHash)
if err == nil && header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if err != nil {
return 0, err
}
if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Uint64 var res hexutil.Uint64
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_estimateGas", args, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_estimateGas", args, blockNrOrHash)
@ -1524,7 +1565,7 @@ func (s *BlockChainAPI) CreateAccessList(ctx context.Context, args TransactionAr
bNrOrHash = *blockNrOrHash bNrOrHash = *blockNrOrHash
} }
header, err := s.b.HeaderByNumberOrHash(ctx, bNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, bNrOrHash)
if err == nil && header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if err == nil && header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res accessListResult var res accessListResult
@ -1691,12 +1732,12 @@ func (s *TransactionAPI) GetTransactionCount(ctx context.Context, address common
return (*hexutil.Uint64)(&nonce), nil return (*hexutil.Uint64)(&nonce), nil
} }
// Resolve block number and use its state to ask for the nonce // Resolve block number and use its state to ask for the nonce
state, header, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash) header, err := headerByNumberOrHash(ctx, s.b, blockNrOrHash)
if state == nil || err != nil { if err != nil {
return nil, err return nil, err
} }
if header != nil && s.b.ChainConfig().IsOptimismPreBedrock(header.Number) { if s.b.ChainConfig().IsOptimismPreBedrock(header.Number) {
if s.b.HistoricalRPCService() != nil { if s.b.HistoricalRPCService() != nil {
var res hexutil.Uint64 var res hexutil.Uint64
err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getTransactionCount", address, blockNrOrHash) err := s.b.HistoricalRPCService().CallContext(ctx, &res, "eth_getTransactionCount", address, blockNrOrHash)
@ -1709,6 +1750,11 @@ func (s *TransactionAPI) GetTransactionCount(ctx context.Context, address common
} }
} }
state, _, err := s.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
if state == nil || err != nil {
return nil, err
}
nonce := state.GetNonce(address) nonce := state.GetNonce(address)
return (*hexutil.Uint64)(&nonce), state.Error() return (*hexutil.Uint64)(&nonce), state.Error()
} }