cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix handler csdb usage, fixes consensus error again (#516)

Browse Source
This commit is contained in:
noot 2020-09-16 20:29:22 -04:00 committed by GitHub
parent 244d836669
commit 73d6c41b72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/rpc_test.go
View File

@ -758,7 +758,7 @@ func TestEth_EstimateGas(t *testing.T) {
err := json.Unmarshal(rpcRes.Result, &gas) err := json.Unmarshal(rpcRes.Result, &gas)
require.NoError(t, err, string(rpcRes.Result)) require.NoError(t, err, string(rpcRes.Result))
require.Equal(t, "0xf76c", gas) require.Equal(t, "0xef7e", gas)
} }
func TestEth_EstimateGas_ContractDeployment(t *testing.T) { func TestEth_EstimateGas_ContractDeployment(t *testing.T) {
@ -777,7 +777,7 @@ func TestEth_EstimateGas_ContractDeployment(t *testing.T) {
err := json.Unmarshal(rpcRes.Result, &gas) err := json.Unmarshal(rpcRes.Result, &gas)
require.NoError(t, err, string(rpcRes.Result)) require.NoError(t, err, string(rpcRes.Result))
require.Equal(t, "0x1cab2", gas.String()) require.Equal(t, "0x1c2c4", gas.String())
} }
func TestEth_ExportAccount(t *testing.T) { func TestEth_ExportAccount(t *testing.T) {

38
x/evm/handler.go
View File

@ -62,8 +62,10 @@ func handleMsgEthereumTx(ctx sdk.Context, k Keeper, msg types.MsgEthereumTx) (*s
// Prepare db for logs // Prepare db for logs
// TODO: block hash // TODO: block hash
k.CommitStateDB.Prepare(ethHash, common.Hash{}, k.TxCount) if !st.Simulate {
k.TxCount++ k.CommitStateDB.Prepare(ethHash, common.Hash{}, k.TxCount)
k.TxCount++
}
config, found := k.GetChainConfig(ctx) config, found := k.GetChainConfig(ctx)
if !found { if !found {
@ -75,13 +77,15 @@ func handleMsgEthereumTx(ctx sdk.Context, k Keeper, msg types.MsgEthereumTx) (*s
return nil, err return nil, err
} }
// update block bloom filter if !st.Simulate {
k.Bloom.Or(k.Bloom, executionResult.Bloom) // update block bloom filter
k.Bloom.Or(k.Bloom, executionResult.Bloom)
// update transaction logs in KVStore // update transaction logs in KVStore
err = k.SetLogs(ctx, common.BytesToHash(txHash), executionResult.Logs) err = k.SetLogs(ctx, common.BytesToHash(txHash), executionResult.Logs)
if err != nil { if err != nil {
panic(err) panic(err)
}
} }
// log successful execution // log successful execution
@ -143,8 +147,10 @@ func handleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) (*sdk
} }
// Prepare db for logs // Prepare db for logs
k.CommitStateDB.Prepare(ethHash, common.Hash{}, k.TxCount) if !st.Simulate {
k.TxCount++ k.CommitStateDB.Prepare(ethHash, common.Hash{}, k.TxCount)
k.TxCount++
}
config, found := k.GetChainConfig(ctx) config, found := k.GetChainConfig(ctx)
if !found { if !found {
@ -157,12 +163,14 @@ func handleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) (*sdk
} }
// update block bloom filter // update block bloom filter
k.Bloom.Or(k.Bloom, executionResult.Bloom) if !st.Simulate {
k.Bloom.Or(k.Bloom, executionResult.Bloom)
// update transaction logs in KVStore // update transaction logs in KVStore
err = k.SetLogs(ctx, common.BytesToHash(txHash), executionResult.Logs) err = k.SetLogs(ctx, common.BytesToHash(txHash), executionResult.Logs)
if err != nil { if err != nil {
panic(err) panic(err)
}
} }
// log successful execution // log successful execution