diff --git a/plugin/dapp/evm/executor/exec_local.go b/plugin/dapp/evm/executor/exec_local.go index b43ee8e1b..eaaccaa59 100644 --- a/plugin/dapp/evm/executor/exec_local.go +++ b/plugin/dapp/evm/executor/exec_local.go @@ -30,26 +30,26 @@ func (evm *EVMExecutor) execEvmNonce(dbSet *types.LocalDBSet, tx *types.Transact nonceV, err := evm.GetLocalDB().Get(nonceLocalKey) if err == nil { _ = types.Decode(nonceV, evmNonce) + + } + + if evmNonce.GetNonce() == 0 { //等同于not found + evmNonce.Addr = tx.From() + evmNonce.Nonce = 1 + } else { if evmNonce.GetNonce() == tx.GetNonce() { evmNonce.Nonce++ - } else { //nonce 不匹配 - if evm.GetAPI().GetConfig().IsDappFork(evm.GetHeight(), "evm", evmtypes.ForkEvmExecNonce) { //分叉之后的逻辑 - elog.Error("execEvmNonce err", "height", evm.GetHeight(), "idx", index, "txHash", common.ToHex(tx.Hash()), - "from", fromAddr, "expect", evmNonce.GetNonce(), "actual", tx.GetNonce()) - return errInvalidEvmNonce - } else { - //分叉之前 不做任何处理 - } + } else if evm.GetAPI().GetConfig().IsDappFork(evm.GetHeight(), "evm", evmtypes.ForkEvmExecNonce) { //分叉之后的逻辑 + elog.Error("execEvmNonce err", "height", evm.GetHeight(), "idx", index, "txHash", common.ToHex(tx.Hash()), + "from", fromAddr, "expect", evmNonce.GetNonce(), "actual", tx.GetNonce()) + return errInvalidEvmNonce + } else { + //分叉之前 不做任何处理 } - } else { //不存在nonceLocalKey - evmNonce.Addr = tx.From() - evmNonce.Nonce = 1 } - //evmNonce.Addr = fromAddr - //evmNonce.Nonce++ dbSet.KV = append(dbSet.KV, &types.KeyValue{Key: nonceLocalKey, Value: types.Encode(evmNonce)}) return nil } diff --git a/plugin/dapp/evm/executor/exec_test.go b/plugin/dapp/evm/executor/exec_test.go index 4c6c6c5e1..459fe1a87 100644 --- a/plugin/dapp/evm/executor/exec_test.go +++ b/plugin/dapp/evm/executor/exec_test.go @@ -47,6 +47,30 @@ func TestExecNonce(t *testing.T) { _, err := localDB.Get(secp256k1eth.CaculCoinsEvmAccountKey(addr)) require.Equal(t, types.ErrNotFound, err) + tx := newEvmTestTx(int64(3), priv) + set, err := exec.ExecLocal(tx, recp, 3) + require.Equal(t, nil, err) + for _, kv := range set.GetKV() { + err = localDB.Set(kv.Key, kv.Value) + require.Nil(t, err) + } + nonceV, err := localDB.Get(secp256k1eth.CaculCoinsEvmAccountKey(addr)) + require.Equal(t, nil, err) + evmNonce := &types.EvmAccountNonce{} + _ = types.Decode(nonceV, evmNonce) + require.Equal(t, int64(1), evmNonce.GetNonce()) + set, err = exec.ExecDelLocal(tx, recp, 0) + require.Nil(t, err) + for _, kv := range set.GetKV() { + err = localDB.Set(kv.Key, kv.Value) + require.Nil(t, err) + } + + nonceV, err = localDB.Get(secp256k1eth.CaculCoinsEvmAccountKey(addr)) + require.Equal(t, nil, err) + _ = types.Decode(nonceV, evmNonce) + require.Equal(t, int64(0), evmNonce.GetNonce()) + // exec local count := 10 for i := 0; i < count; i++ { @@ -62,14 +86,14 @@ func TestExecNonce(t *testing.T) { } } - evmNonce := &types.EvmAccountNonce{} - nonceV, err := localDB.Get(secp256k1eth.CaculCoinsEvmAccountKey(addr)) + evmNonce = &types.EvmAccountNonce{} + nonceV, err = localDB.Get(secp256k1eth.CaculCoinsEvmAccountKey(addr)) require.Nil(t, err) _ = types.Decode(nonceV, evmNonce) require.Equal(t, int64(count), evmNonce.GetNonce()) require.Equal(t, addr, evmNonce.Addr) - tx := newEvmTestTx(5, priv) + tx = newEvmTestTx(5, priv) _, err = exec.ExecLocal(tx, recp, 0) require.Equal(t, errInvalidEvmNonce, err) @@ -91,4 +115,5 @@ func TestExecNonce(t *testing.T) { tx = newEvmTestTx(5, priv) _, err = exec.ExecLocal(tx, recp, 0) require.Nil(t, err) + }