-
Notifications
You must be signed in to change notification settings - Fork 233
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* introduce e upgrade * map upgrades * check if upgrade is non-nil * fix checkForks * Fix tests * revert test changes * fix tests * remove block no param from IsCancun * add UT * use avalanche defaults for timestamps * sync API code from upstream * add GetActiveRulesAt API * use non-zero timestamps in genesis configs * fix test timestamps * add timestamp to ethapi genesis * fix blockchain test genesis timestamp * fix test * review fixes * fix deps * use vmerrs
- Loading branch information
Showing
3 changed files
with
213 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| // (c) 2019-2024, Ava Labs, Inc. All rights reserved. | ||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package ethapi | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "math/big" | ||
|
|
||
| "github.com/ava-labs/subnet-evm/commontype" | ||
| "github.com/ava-labs/subnet-evm/core" | ||
| "github.com/ava-labs/subnet-evm/core/types" | ||
| "github.com/ava-labs/subnet-evm/params" | ||
| "github.com/ava-labs/subnet-evm/rpc" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| "github.com/ethereum/go-ethereum/rlp" | ||
| ) | ||
|
|
||
| func (s *BlockChainAPI) GetChainConfig(ctx context.Context) *params.ChainConfigWithUpgradesJSON { | ||
| return s.b.ChainConfig().ToWithUpgradesJSON() | ||
| } | ||
|
|
||
| type DetailedExecutionResult struct { | ||
| UsedGas uint64 `json:"gas"` // Total used gas but include the refunded gas | ||
| ErrCode int `json:"errCode"` // EVM error code | ||
| Err string `json:"err"` // Any error encountered during the execution(listed in core/vm/errors.go) | ||
| ReturnData hexutil.Bytes `json:"returnData"` // Data from evm(function result or data supplied with revert opcode) | ||
| } | ||
|
|
||
| // CallDetailed performs the same call as Call, but returns the full context | ||
| func (s *BlockChainAPI) CallDetailed(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride) (*DetailedExecutionResult, error) { | ||
| result, err := DoCall(ctx, s.b, args, blockNrOrHash, overrides, nil, s.b.RPCEVMTimeout(), s.b.RPCGasCap()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| reply := &DetailedExecutionResult{ | ||
| UsedGas: result.UsedGas, | ||
| ReturnData: result.ReturnData, | ||
| } | ||
| if result.Err != nil { | ||
| if err, ok := result.Err.(rpc.Error); ok { | ||
| reply.ErrCode = err.ErrorCode() | ||
| } | ||
| reply.Err = result.Err.Error() | ||
| } | ||
| // If the result contains a revert reason, try to unpack and return it. | ||
| if len(result.Revert()) > 0 { | ||
| err := newRevertError(result.Revert()) | ||
| reply.ErrCode = err.ErrorCode() | ||
| reply.Err = err.Error() | ||
| } | ||
| return reply, nil | ||
| } | ||
|
|
||
| // Note: this API is moved directly from ./eth/api.go to ensure that it is available under an API that is enabled by | ||
| // default without duplicating the code and serving the same API in the original location as well without creating a | ||
| // cyclic import. | ||
| // | ||
| // BadBlockArgs represents the entries in the list returned when bad blocks are queried. | ||
| type BadBlockArgs struct { | ||
| Hash common.Hash `json:"hash"` | ||
| Block map[string]interface{} `json:"block"` | ||
| RLP string `json:"rlp"` | ||
| Reason *core.BadBlockReason `json:"reason"` | ||
| } | ||
|
|
||
| // GetBadBlocks returns a list of the last 'bad blocks' that the client has seen on the network | ||
| // and returns them as a JSON list of block hashes. | ||
| func (s *BlockChainAPI) GetBadBlocks(ctx context.Context) ([]*BadBlockArgs, error) { | ||
| var ( | ||
| badBlocks, reasons = s.b.BadBlocks() | ||
| results = make([]*BadBlockArgs, 0, len(badBlocks)) | ||
| ) | ||
| for i, block := range badBlocks { | ||
| var ( | ||
| blockRlp string | ||
| blockJSON map[string]interface{} | ||
| ) | ||
| if rlpBytes, err := rlp.EncodeToBytes(block); err != nil { | ||
| blockRlp = err.Error() // Hacky, but hey, it works | ||
| } else { | ||
| blockRlp = fmt.Sprintf("%#x", rlpBytes) | ||
| } | ||
| blockJSON = RPCMarshalBlock(block, true, true, s.b.ChainConfig()) | ||
| results = append(results, &BadBlockArgs{ | ||
| Hash: block.Hash(), | ||
| RLP: blockRlp, | ||
| Block: blockJSON, | ||
| Reason: reasons[i], | ||
| }) | ||
| } | ||
| return results, nil | ||
| } | ||
|
|
||
| type FeeConfigResult struct { | ||
| FeeConfig commontype.FeeConfig `json:"feeConfig"` | ||
| LastChangedAt *big.Int `json:"lastChangedAt,omitempty"` | ||
| } | ||
|
|
||
| func (s *BlockChainAPI) FeeConfig(ctx context.Context, blockNrOrHash *rpc.BlockNumberOrHash) (*FeeConfigResult, error) { | ||
| var ( | ||
| header *types.Header | ||
| err error | ||
| ) | ||
| if blockNrOrHash == nil { | ||
| header = s.b.CurrentHeader() | ||
| } else { | ||
| header, err = s.b.HeaderByNumberOrHash(ctx, *blockNrOrHash) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| feeConfig, lastChangedAt, err := s.b.GetFeeConfigAt(header) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &FeeConfigResult{FeeConfig: feeConfig, LastChangedAt: lastChangedAt}, nil | ||
| } | ||
|
|
||
| // GetActivePrecompilesAt returns the active precompile configs at the given block timestamp. | ||
| func (s *BlockChainAPI) GetActivePrecompilesAt(ctx context.Context, blockTimestamp *uint64) params.Precompiles { | ||
| var timestamp uint64 | ||
| if blockTimestamp == nil { | ||
| timestamp = s.b.CurrentHeader().Time | ||
| } else { | ||
| timestamp = *blockTimestamp | ||
| } | ||
|
|
||
| return s.b.ChainConfig().EnabledStatefulPrecompiles(timestamp) | ||
| } | ||
|
|
||
| func (s *BlockChainAPI) GetActiveRulesAt(ctx context.Context, blockTimestamp *uint64) params.Rules { | ||
| var timestamp uint64 | ||
| if blockTimestamp == nil { | ||
| timestamp = s.b.CurrentHeader().Time | ||
| } else { | ||
| timestamp = *blockTimestamp | ||
| } | ||
| return s.b.ChainConfig().Rules(common.Big0, timestamp) | ||
| } |
Oops, something went wrong.