Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

fix consensus error #513

Merged
merged 2 commits into from
Sep 14, 2020
Merged

fix consensus error #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d2b7d0
fix state transition to not use st.Csdb
noot Sep 14, 2020
90dc4be
update rpc tests
noot Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/rpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ func TestEth_EstimateGas(t *testing.T) {
err := json.Unmarshal(rpcRes.Result, &gas)
require.NoError(t, err, string(rpcRes.Result))

require.Equal(t, "0xfd40", gas)
require.Equal(t, "0xf76c", gas)
}

func TestEth_EstimateGas_ContractDeployment(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions x/evm/types/state_transition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ func (st StateTransition) TransitionDb(ctx sdk.Context, config ChainConfig) (*Ex
)

// Get nonce of account outside of the EVM
currentNonce := st.Csdb.GetNonce(st.Sender)
currentNonce := csdb.GetNonce(st.Sender)
// Set nonce of sender account before evm state transition for usage in generating Create address
st.Csdb.SetNonce(st.Sender, st.AccountNonce)
csdb.SetNonce(st.Sender, st.AccountNonce)

// create contract or execute call
switch contractCreation {
Expand All @@ -143,7 +143,7 @@ func (st StateTransition) TransitionDb(ctx sdk.Context, config ChainConfig) (*Ex
}

// Resets nonce to value pre state transition
st.Csdb.SetNonce(st.Sender, currentNonce)
csdb.SetNonce(st.Sender, currentNonce)

// Generate bloom filter to be saved in tx receipt data
bloomInt := big.NewInt(0)
Expand All @@ -166,7 +166,7 @@ func (st StateTransition) TransitionDb(ctx sdk.Context, config ChainConfig) (*Ex
if !st.Simulate {
// Finalise state if not a simulated transaction
// TODO: change to depend on config
if err := st.Csdb.Finalise(true); err != nil {
if err := csdb.Finalise(true); err != nil {
return nil, err
}
}
Expand Down