cerc-io/laconicd
18
0
Fork 2
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 10 Wiki Activity

Remove recomputing of tx bytes (#217)

Browse Source
This commit is contained in:
Austin Abell 2020-04-10 16:47:56 -04:00 committed by GitHub
parent 75f7de22d0
commit 9b8dd598bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x/evm/handler.go
View File

@ -7,7 +7,6 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
authutils "github.com/cosmos/cosmos-sdk/x/auth/client/utils"
emint "github.com/cosmos/ethermint/types" emint "github.com/cosmos/ethermint/types"
"github.com/cosmos/ethermint/x/evm/types" "github.com/cosmos/ethermint/x/evm/types"
@ -44,13 +43,7 @@ func HandleMsgEthereumTx(ctx sdk.Context, k Keeper, msg types.MsgEthereumTx) sdk
return sdk.ResultFromError(err) return sdk.ResultFromError(err)
} }
// Encode transaction by default Tx encoder txHash := tmtypes.Tx(ctx.TxBytes()).Hash()
txEncoder := authutils.GetTxEncoder(types.ModuleCdc)
txBytes, err := txEncoder(msg)
if err != nil {
return sdk.ResultFromError(err)
}
txHash := tmtypes.Tx(txBytes).Hash()
ethHash := common.BytesToHash(txHash) ethHash := common.BytesToHash(txHash)
st := types.StateTransition{ st := types.StateTransition{
@ -120,6 +113,9 @@ func HandleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) sdk.R
return emint.ErrInvalidChainID(fmt.Sprintf("invalid chainID: %s", ctx.ChainID())).Result() return emint.ErrInvalidChainID(fmt.Sprintf("invalid chainID: %s", ctx.ChainID())).Result()
} }
txHash := tmtypes.Tx(ctx.TxBytes()).Hash()
ethHash := common.BytesToHash(txHash)
st := types.StateTransition{ st := types.StateTransition{
Sender: common.BytesToAddress(msg.From.Bytes()), Sender: common.BytesToAddress(msg.From.Bytes()),
AccountNonce: msg.AccountNonce, AccountNonce: msg.AccountNonce,
@ -129,6 +125,7 @@ func HandleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) sdk.R
Payload: msg.Payload, Payload: msg.Payload,
Csdb: k.CommitStateDB.WithContext(ctx), Csdb: k.CommitStateDB.WithContext(ctx),
ChainID: intChainID, ChainID: intChainID,
THash: &ethHash,
Simulate: ctx.IsCheckTx(), Simulate: ctx.IsCheckTx(),
} }
@ -138,7 +135,7 @@ func HandleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) sdk.R
} }
// Prepare db for logs // Prepare db for logs
k.CommitStateDB.Prepare(common.Hash{}, common.Hash{}, k.TxCount) // Cannot provide tx hash k.CommitStateDB.Prepare(ethHash, common.Hash{}, k.TxCount)
k.TxCount++ k.TxCount++
returnData, err := st.TransitionCSDB(ctx) returnData, err := st.TransitionCSDB(ctx)