Sync from fork #74

Merged
0xmuralik merged 232 commits from murali/update-fork into main 2023-01-10 04:50:57 +00:00
3 changed files with 18 additions and 4 deletions
Showing only changes of commit d359cbd9c9 - Show all commits

View File

@ -42,6 +42,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (cli) [tharsis#1086](https://github.com/tharsis/ethermint/pull/1086) Add rollback command. * (cli) [tharsis#1086](https://github.com/tharsis/ethermint/pull/1086) Add rollback command.
### Bug Fixes
* (rpc) [tharsis#1082](https://github.com/tharsis/ethermint/pull/1082) fix gas price returned in getTransaction api.
## [v0.15.0] - 2022-05-09 ## [v0.15.0] - 2022-05-09
### State Machine Breaking ### State Machine Breaking

View File

@ -586,7 +586,7 @@ func (b *Backend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransactio
common.Hash{}, common.Hash{},
uint64(0), uint64(0),
uint64(0), uint64(0),
b.chainID, nil,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -649,12 +649,17 @@ func (b *Backend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransactio
return nil, errors.New("can't find index of ethereum tx") return nil, errors.New("can't find index of ethereum tx")
} }
baseFee, err := b.BaseFee(block.Block.Height)
if err != nil {
return nil, err
}
return types.NewTransactionFromMsg( return types.NewTransactionFromMsg(
msg, msg,
common.BytesToHash(block.BlockID.Hash.Bytes()), common.BytesToHash(block.BlockID.Hash.Bytes()),
uint64(res.Height), uint64(res.Height),
txIndex, txIndex,
b.chainID, baseFee,
) )
} }

View File

@ -764,12 +764,17 @@ func (e *PublicAPI) getTransactionByBlockAndIndex(block *tmrpctypes.ResultBlock,
msg = ethMsgs[i] msg = ethMsgs[i]
} }
baseFee, err := e.backend.BaseFee(block.Block.Height)
if err != nil {
return nil, err
}
return rpctypes.NewTransactionFromMsg( return rpctypes.NewTransactionFromMsg(
msg, msg,
common.BytesToHash(block.Block.Hash()), common.BytesToHash(block.Block.Hash()),
uint64(block.Block.Height), uint64(block.Block.Height),
uint64(idx), uint64(idx),
e.chainIDEpoch, baseFee,
) )
} }
@ -983,7 +988,7 @@ func (e *PublicAPI) GetPendingTransactions() ([]*rpctypes.RPCTransaction, error)
common.Hash{}, common.Hash{},
uint64(0), uint64(0),
uint64(0), uint64(0),
e.chainIDEpoch, nil,
) )
if err != nil { if err != nil {
return nil, err return nil, err