From 177574aafa34683ccd1823cdb8ca5642f271e48d Mon Sep 17 00:00:00 2001 From: KamiD <44460798+KamiD@users.noreply.github.com> Date: Tue, 9 Feb 2021 07:54:18 +0800 Subject: [PATCH] fix error of timeout when using Truffle to deploy contract (#768) * fix error of timeout when using Truffle to deploy contract * fix CHANGELOG.MD Co-authored-by: Daniel Choi <13338103+araskachoi@users.noreply.github.com> --- CHANGELOG.md | 2 ++ rpc/types/utils.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f75947e..869914fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (evm) [\#670](https://github.com/cosmos/ethermint/pull/670) Migrate types to the ones defined by the protobuf messages, which are required for the stargate release. ### Bug Fixes + +* (evm) [\#767](https://github.com/cosmos/ethermint/issues/767) Fix error of timeout when using Truffle to deploy contract. * (evm) [\#751](https://github.com/cosmos/ethermint/issues/751) Fix misused method to calculate block hash in evm related function. * (evm) [\#721](https://github.com/cosmos/ethermint/issues/721) Fix mismatch block hash in rpc response when use eht.getBlock. * (evm) [\#730](https://github.com/cosmos/ethermint/issues/730) Fix 'EIP2028' not open when Istanbul version has been enabled. diff --git a/rpc/types/utils.go b/rpc/types/utils.go index 202786db..e2fe14df 100644 --- a/rpc/types/utils.go +++ b/rpc/types/utils.go @@ -125,7 +125,7 @@ func EthTransactionsFromTendermint(clientCtx clientcontext.CLIContext, txs []tmt continue } // TODO: Remove gas usage calculation if saving gasUsed per block - gasUsed.Add(gasUsed, ethTx.Fee()) + gasUsed.Add(gasUsed, big.NewInt(int64(ethTx.GetGas()))) transactionHashes = append(transactionHashes, common.BytesToHash(tx.Hash())) }