@@ -23,7 +23,7 @@ import (
2323 "github.com/ethereum/go-ethereum/eth"
2424 "github.com/ethereum/go-ethereum/eth/tracers"
2525 "github.com/ethereum/go-ethereum/ethdb"
26- "github.com/ethereum/go-ethereum/lib/ethapi "
26+ "github.com/ethereum/go-ethereum/export "
2727 "github.com/ethereum/go-ethereum/params"
2828 "github.com/ethereum/go-ethereum/rpc"
2929 "github.com/sei-protocol/sei-chain/utils"
@@ -64,15 +64,15 @@ type AccessListResult struct {
6464 GasUsed hexutil.Uint64 `json:"gasUsed"`
6565}
6666
67- func (s * SimulationAPI ) CreateAccessList (ctx context.Context , args ethapi .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash ) (result * AccessListResult , returnErr error ) {
67+ func (s * SimulationAPI ) CreateAccessList (ctx context.Context , args export .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash ) (result * AccessListResult , returnErr error ) {
6868 startTime := time .Now ()
6969 defer recordMetrics ("eth_createAccessList" , s .connectionType , startTime , returnErr == nil )
7070 bNrOrHash := rpc .BlockNumberOrHashWithNumber (rpc .PendingBlockNumber )
7171 if blockNrOrHash != nil {
7272 bNrOrHash = * blockNrOrHash
7373 }
7474 ctx = context .WithValue (ctx , CtxIsWasmdPrecompileCallKey , wasmd .IsWasmdCall (args .To ))
75- acl , gasUsed , vmerr , err := ethapi .AccessList (ctx , s .backend , bNrOrHash , args )
75+ acl , gasUsed , vmerr , err := export .AccessList (ctx , s .backend , bNrOrHash , args )
7676 if err != nil {
7777 return nil , err
7878 }
@@ -83,31 +83,31 @@ func (s *SimulationAPI) CreateAccessList(ctx context.Context, args ethapi.Transa
8383 return result , nil
8484}
8585
86- func (s * SimulationAPI ) EstimateGas (ctx context.Context , args ethapi .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * ethapi .StateOverride ) (result hexutil.Uint64 , returnErr error ) {
86+ func (s * SimulationAPI ) EstimateGas (ctx context.Context , args export .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * export .StateOverride ) (result hexutil.Uint64 , returnErr error ) {
8787 startTime := time .Now ()
8888 defer recordMetricsWithError ("eth_estimateGas" , s .connectionType , startTime , returnErr )
8989 bNrOrHash := rpc .BlockNumberOrHashWithNumber (rpc .LatestBlockNumber )
9090 if blockNrOrHash != nil {
9191 bNrOrHash = * blockNrOrHash
9292 }
9393 ctx = context .WithValue (ctx , CtxIsWasmdPrecompileCallKey , wasmd .IsWasmdCall (args .To ))
94- estimate , err := ethapi .DoEstimateGas (ctx , s .backend , args , bNrOrHash , overrides , s .backend .RPCGasCap ())
94+ estimate , err := export .DoEstimateGas (ctx , s .backend , args , bNrOrHash , overrides , nil , s .backend .RPCGasCap ())
9595 return estimate , err
9696}
9797
98- func (s * SimulationAPI ) EstimateGasAfterCalls (ctx context.Context , args ethapi .TransactionArgs , calls []ethapi .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * ethapi .StateOverride ) (result hexutil.Uint64 , returnErr error ) {
98+ func (s * SimulationAPI ) EstimateGasAfterCalls (ctx context.Context , args export .TransactionArgs , calls []export .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * export .StateOverride ) (result hexutil.Uint64 , returnErr error ) {
9999 startTime := time .Now ()
100100 defer recordMetricsWithError ("eth_estimateGasAfterCalls" , s .connectionType , startTime , returnErr )
101101 bNrOrHash := rpc .BlockNumberOrHashWithNumber (rpc .LatestBlockNumber )
102102 if blockNrOrHash != nil {
103103 bNrOrHash = * blockNrOrHash
104104 }
105105 ctx = context .WithValue (ctx , CtxIsWasmdPrecompileCallKey , wasmd .IsWasmdCall (args .To ))
106- estimate , err := ethapi .DoEstimateGasAfterCalls (ctx , s .backend , args , calls , bNrOrHash , overrides , s .backend .RPCEVMTimeout (), s .backend .RPCGasCap ())
106+ estimate , err := export .DoEstimateGasAfterCalls (ctx , s .backend , args , calls , bNrOrHash , overrides , s .backend .RPCEVMTimeout (), s .backend .RPCGasCap ())
107107 return estimate , err
108108}
109109
110- func (s * SimulationAPI ) Call (ctx context.Context , args ethapi .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * ethapi .StateOverride , blockOverrides * ethapi .BlockOverrides ) (result hexutil.Bytes , returnErr error ) {
110+ func (s * SimulationAPI ) Call (ctx context.Context , args export .TransactionArgs , blockNrOrHash * rpc.BlockNumberOrHash , overrides * export .StateOverride , blockOverrides * export .BlockOverrides ) (result hexutil.Bytes , returnErr error ) {
111111 startTime := time .Now ()
112112 defer recordMetrics ("eth_call" , s .connectionType , startTime , returnErr == nil )
113113 defer func () {
@@ -124,7 +124,7 @@ func (s *SimulationAPI) Call(ctx context.Context, args ethapi.TransactionArgs, b
124124 blockNrOrHash = & latest
125125 }
126126 ctx = context .WithValue (ctx , CtxIsWasmdPrecompileCallKey , wasmd .IsWasmdCall (args .To ))
127- callResult , err := ethapi .DoCall (ctx , s .backend , args , * blockNrOrHash , overrides , blockOverrides , s .backend .RPCEVMTimeout (), s .backend .RPCGasCap ())
127+ callResult , err := export .DoCall (ctx , s .backend , args , * blockNrOrHash , overrides , blockOverrides , s .backend .RPCEVMTimeout (), s .backend .RPCGasCap ())
128128 if err != nil {
129129 return nil , err
130130 }
@@ -204,16 +204,16 @@ func (b *Backend) StateAndHeaderByNumberOrHash(ctx context.Context, blockNrOrHas
204204 return state .NewDBImpl (sdkCtx , b .keeper , true ), b .getHeader (big .NewInt (height )), nil
205205}
206206
207- func (b * Backend ) GetTransaction (ctx context.Context , txHash common.Hash ) (tx * ethtypes.Transaction , blockHash common.Hash , blockNumber uint64 , index uint64 , err error ) {
207+ func (b * Backend ) GetTransaction (ctx context.Context , txHash common.Hash ) (found bool , tx * ethtypes.Transaction , blockHash common.Hash , blockNumber uint64 , index uint64 , err error ) {
208208 sdkCtx := b .ctxProvider (LatestCtxHeight )
209209 receipt , err := b .keeper .GetReceipt (sdkCtx , txHash )
210210 if err != nil {
211- return nil , common.Hash {}, 0 , 0 , err
211+ return false , nil , common.Hash {}, 0 , 0 , err
212212 }
213213 txHeight := int64 (receipt .BlockNumber )
214214 block , err := blockByNumber (ctx , b .tmClient , & txHeight )
215215 if err != nil {
216- return nil , common.Hash {}, 0 , 0 , err
216+ return false , nil , common.Hash {}, 0 , 0 , err
217217 }
218218 txIndex := hexutil .Uint (receipt .TransactionIndex )
219219 tmTx := block .Block .Txs [int (txIndex )]
@@ -223,11 +223,11 @@ func (b *Backend) GetTransaction(ctx context.Context, txHash common.Hash) (tx *e
223223 return err == nil
224224 })
225225 if ! found {
226- return nil , common.Hash {}, 0 , 0 , errors .New ("failed to find transaction in block" )
226+ return false , nil , common.Hash {}, 0 , 0 , errors .New ("failed to find transaction in block" )
227227 }
228228 tx = getEthTxForTxBz (tmTx , b .txDecoder )
229229 blockHash = common .BytesToHash (block .Block .Header .Hash ().Bytes ())
230- return tx , blockHash , uint64 (txHeight ), uint64 (evmTxIndex ), nil
230+ return true , tx , blockHash , uint64 (txHeight ), uint64 (evmTxIndex ), nil
231231}
232232
233233func (b * Backend ) ChainDb () ethdb.Database {
@@ -323,7 +323,6 @@ func (b *Backend) StateAtTransaction(ctx context.Context, block *ethtypes.Block,
323323 if err != nil {
324324 return nil , vm.BlockContext {}, nil , nil , err
325325 }
326- txContext := core .NewEVMTxContext (msg )
327326 blockContext , err := b .keeper .GetVMBlockContext (b .ctxProvider (prevBlockHeight ), core .GasPool (b .RPCGasCap ()))
328327 if err != nil {
329328 return nil , vm.BlockContext {}, nil , nil , err
@@ -352,7 +351,7 @@ func (b *Backend) StateAtTransaction(ctx context.Context, block *ethtypes.Block,
352351 }
353352 statedb .WithCtx (statedb .Ctx ().WithEVMEntryViaWasmdPrecompile (wasmd .IsWasmdCall (tx .To ())))
354353 // Not yet the searched for transaction, execute on top of the current state
355- vmenv := vm .NewEVM (* blockContext , txContext , statedb , b .ChainConfig (), vm.Config {})
354+ vmenv := vm .NewEVM (* blockContext , statedb , b .ChainConfig (), vm.Config {})
356355 statedb .SetTxContext (tx .Hash (), idx )
357356 if _ , err := core .ApplyMessage (vmenv , msg , new (core.GasPool ).AddGas (tx .Gas ())); err != nil {
358357 return nil , vm.BlockContext {}, nil , nil , fmt .Errorf ("transaction %#x failed: %v" , tx .Hash (), err )
@@ -391,11 +390,10 @@ func (b *Backend) StateAtBlock(ctx context.Context, block *ethtypes.Block, reexe
391390}
392391
393392func (b * Backend ) GetEVM (_ context.Context , msg * core.Message , stateDB vm.StateDB , _ * ethtypes.Header , vmConfig * vm.Config , blockCtx * vm.BlockContext ) * vm.EVM {
394- txContext := core .NewEVMTxContext (msg )
395393 if blockCtx == nil {
396394 blockCtx , _ = b .keeper .GetVMBlockContext (b .ctxProvider (LatestCtxHeight ).WithIsEVM (true ).WithEVMEntryViaWasmdPrecompile (wasmd .IsWasmdCall (msg .To )), core .GasPool (b .RPCGasCap ()))
397395 }
398- return vm .NewEVM (* blockCtx , txContext , stateDB , b .ChainConfig (), * vmConfig )
396+ return vm .NewEVM (* blockCtx , stateDB , b .ChainConfig (), * vmConfig )
399397}
400398
401399func (b * Backend ) CurrentHeader () * ethtypes.Header {
0 commit comments