mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 06:36:43 +00:00
* added new api to support conditional transactions (EIP-4337) (#700) * Refactored the code and updated the miner to check for the validity of options (#793) * refactored the code and updated the miner to check for the validity of options * added new errors -32003 and -32005 * added unit tests * addressed comments * Aa 4337 update generics (#799) * poc * minor bug fix * use common.Hash * updated UnmarshalJSON function (reference - tynes) * fix * done * linters * with test * undo some unintentional changes --------- Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> * handelling the block range and timestamp range, also made timestamp a pointer --------- Co-authored-by: Evgeny Danilenko <6655321@bk.ru> * Added filtering of conditional transactions in txpool (#920) * added filtering of conditional transactions in txpool * minor fix in ValidateKnownAccounts * bug fix * Supporting nil knownAccounts * lints * bundled transactions are not announced/broadcasted to the peers * fixed after upstream merge * few fixes * sentry reject conditional transaction * Changed the namespace of conditional transaction API from `eth` to `bor` (#985) * added conditional transaction to bor namespace * test comit * test comit * added conditional transaction * namespapce changed to bor * cleanup * cleanup * addressed comments * reverted changes in ValidateKnownAccounts * addressed comments and removed unwanted code * addressed comments * bug fix * lint * removed licence from core/types/transaction_conditional_test.go --------- Co-authored-by: Evgeny Danilenko <6655321@bk.ru>
341 lines
13 KiB
Go
341 lines
13 KiB
Go
// Copyright 2014 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package state
|
|
|
|
import (
|
|
"bytes"
|
|
"math/big"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
)
|
|
|
|
type stateTest struct {
|
|
db ethdb.Database
|
|
state *StateDB
|
|
}
|
|
|
|
func newStateTest() *stateTest {
|
|
db := rawdb.NewMemoryDatabase()
|
|
sdb, _ := New(common.Hash{}, NewDatabase(db), nil)
|
|
|
|
return &stateTest{db: db, state: sdb}
|
|
}
|
|
|
|
func TestDump(t *testing.T) {
|
|
db := rawdb.NewMemoryDatabase()
|
|
sdb, _ := New(common.Hash{}, NewDatabaseWithConfig(db, &trie.Config{Preimages: true}), nil)
|
|
s := &stateTest{db: db, state: sdb}
|
|
|
|
// generate a few entries
|
|
obj1 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01}))
|
|
obj1.AddBalance(big.NewInt(22))
|
|
|
|
obj2 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
|
|
obj2.SetCode(crypto.Keccak256Hash([]byte{3, 3, 3, 3, 3, 3, 3}), []byte{3, 3, 3, 3, 3, 3, 3})
|
|
|
|
obj3 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x02}))
|
|
obj3.SetBalance(big.NewInt(44))
|
|
|
|
// write some of them to the trie
|
|
s.state.updateStateObject(obj1)
|
|
s.state.updateStateObject(obj2)
|
|
s.state.Commit(false)
|
|
|
|
// check that DumpToCollector contains the state objects that are in trie
|
|
got := string(s.state.Dump(nil))
|
|
want := `{
|
|
"root": "71edff0130dd2385947095001c73d9e28d862fc286fca2b922ca6f6f3cddfdd2",
|
|
"accounts": {
|
|
"0x0000000000000000000000000000000000000001": {
|
|
"balance": "22",
|
|
"nonce": 0,
|
|
"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
|
|
"codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
|
|
"key": "0x1468288056310c82aa4c01a7e12a10f8111a0560e72b700555479031b86c357d"
|
|
},
|
|
"0x0000000000000000000000000000000000000002": {
|
|
"balance": "44",
|
|
"nonce": 0,
|
|
"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
|
|
"codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
|
|
"key": "0xd52688a8f926c816ca1e079067caba944f158e764817b83fc43594370ca9cf62"
|
|
},
|
|
"0x0000000000000000000000000000000000000102": {
|
|
"balance": "0",
|
|
"nonce": 0,
|
|
"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
|
|
"codeHash": "0x87874902497a5bb968da31a2998d8f22e949d1ef6214bcdedd8bae24cca4b9e3",
|
|
"code": "0x03030303030303",
|
|
"key": "0xa17eacbc25cda025e81db9c5c62868822c73ce097cee2a63e33a2e41268358a1"
|
|
}
|
|
}
|
|
}`
|
|
|
|
if got != want {
|
|
t.Errorf("DumpToCollector mismatch:\ngot: %s\nwant: %s\n", got, want)
|
|
}
|
|
}
|
|
|
|
func TestNull(t *testing.T) {
|
|
s := newStateTest()
|
|
address := common.HexToAddress("0x823140710bf13990e4500136726d8b55")
|
|
s.state.CreateAccount(address)
|
|
//value := common.FromHex("0x823140710bf13990e4500136726d8b55")
|
|
var value common.Hash
|
|
|
|
s.state.SetState(address, common.Hash{}, value)
|
|
s.state.Commit(false)
|
|
|
|
if value := s.state.GetState(address, common.Hash{}); value != (common.Hash{}) {
|
|
t.Errorf("expected empty current value, got %x", value)
|
|
}
|
|
|
|
if value := s.state.GetCommittedState(address, common.Hash{}); value != (common.Hash{}) {
|
|
t.Errorf("expected empty committed value, got %x", value)
|
|
}
|
|
}
|
|
|
|
func TestSnapshot(t *testing.T) {
|
|
stateobjaddr := common.BytesToAddress([]byte("aa"))
|
|
|
|
var storageaddr common.Hash
|
|
|
|
data1 := common.BytesToHash([]byte{42})
|
|
data2 := common.BytesToHash([]byte{43})
|
|
s := newStateTest()
|
|
|
|
// snapshot the genesis state
|
|
genesis := s.state.Snapshot()
|
|
|
|
// set initial state object value
|
|
s.state.SetState(stateobjaddr, storageaddr, data1)
|
|
snapshot := s.state.Snapshot()
|
|
|
|
// set a new state object value, revert it and ensure correct content
|
|
s.state.SetState(stateobjaddr, storageaddr, data2)
|
|
s.state.RevertToSnapshot(snapshot)
|
|
|
|
if v := s.state.GetState(stateobjaddr, storageaddr); v != data1 {
|
|
t.Errorf("wrong storage value %v, want %v", v, data1)
|
|
}
|
|
|
|
if v := s.state.GetCommittedState(stateobjaddr, storageaddr); v != (common.Hash{}) {
|
|
t.Errorf("wrong committed storage value %v, want %v", v, common.Hash{})
|
|
}
|
|
|
|
// revert up to the genesis state and ensure correct content
|
|
s.state.RevertToSnapshot(genesis)
|
|
|
|
if v := s.state.GetState(stateobjaddr, storageaddr); v != (common.Hash{}) {
|
|
t.Errorf("wrong storage value %v, want %v", v, common.Hash{})
|
|
}
|
|
|
|
if v := s.state.GetCommittedState(stateobjaddr, storageaddr); v != (common.Hash{}) {
|
|
t.Errorf("wrong committed storage value %v, want %v", v, common.Hash{})
|
|
}
|
|
}
|
|
|
|
func TestSnapshotEmpty(t *testing.T) {
|
|
s := newStateTest()
|
|
s.state.RevertToSnapshot(s.state.Snapshot())
|
|
}
|
|
|
|
func TestSnapshot2(t *testing.T) {
|
|
state, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase()), nil)
|
|
|
|
stateobjaddr0 := common.BytesToAddress([]byte("so0"))
|
|
stateobjaddr1 := common.BytesToAddress([]byte("so1"))
|
|
|
|
var storageaddr common.Hash
|
|
|
|
data0 := common.BytesToHash([]byte{17})
|
|
data1 := common.BytesToHash([]byte{18})
|
|
|
|
state.SetState(stateobjaddr0, storageaddr, data0)
|
|
state.SetState(stateobjaddr1, storageaddr, data1)
|
|
|
|
// db, trie are already non-empty values
|
|
so0 := state.getStateObject(stateobjaddr0)
|
|
so0.SetBalance(big.NewInt(42))
|
|
so0.SetNonce(43)
|
|
so0.SetCode(crypto.Keccak256Hash([]byte{'c', 'a', 'f', 'e'}), []byte{'c', 'a', 'f', 'e'})
|
|
so0.suicided = false
|
|
so0.deleted = false
|
|
state.setStateObject(so0)
|
|
|
|
root, _ := state.Commit(false)
|
|
state, _ = New(root, state.db, state.snaps)
|
|
|
|
// and one with deleted == true
|
|
so1 := state.getStateObject(stateobjaddr1)
|
|
so1.SetBalance(big.NewInt(52))
|
|
so1.SetNonce(53)
|
|
so1.SetCode(crypto.Keccak256Hash([]byte{'c', 'a', 'f', 'e', '2'}), []byte{'c', 'a', 'f', 'e', '2'})
|
|
so1.suicided = true
|
|
so1.deleted = true
|
|
state.setStateObject(so1)
|
|
|
|
so1 = state.getStateObject(stateobjaddr1)
|
|
if so1 != nil {
|
|
t.Fatalf("deleted object not nil when getting")
|
|
}
|
|
|
|
snapshot := state.Snapshot()
|
|
state.RevertToSnapshot(snapshot)
|
|
|
|
so0Restored := state.getStateObject(stateobjaddr0)
|
|
// Update lazily-loaded values before comparing.
|
|
so0Restored.GetState(state.db, storageaddr)
|
|
so0Restored.Code(state.db)
|
|
// non-deleted is equal (restored)
|
|
compareStateObjects(so0Restored, so0, t)
|
|
|
|
// deleted should be nil, both before and after restore of state copy
|
|
so1Restored := state.getStateObject(stateobjaddr1)
|
|
if so1Restored != nil {
|
|
t.Fatalf("deleted object not nil after restoring snapshot: %+v", so1Restored)
|
|
}
|
|
}
|
|
|
|
func compareStateObjects(so0, so1 *stateObject, t *testing.T) {
|
|
if so0.Address() != so1.Address() {
|
|
t.Fatalf("Address mismatch: have %v, want %v", so0.address, so1.address)
|
|
}
|
|
|
|
if so0.Balance().Cmp(so1.Balance()) != 0 {
|
|
t.Fatalf("Balance mismatch: have %v, want %v", so0.Balance(), so1.Balance())
|
|
}
|
|
|
|
if so0.Nonce() != so1.Nonce() {
|
|
t.Fatalf("Nonce mismatch: have %v, want %v", so0.Nonce(), so1.Nonce())
|
|
}
|
|
|
|
if so0.data.Root != so1.data.Root {
|
|
t.Errorf("Root mismatch: have %x, want %x", so0.data.Root[:], so1.data.Root[:])
|
|
}
|
|
|
|
if !bytes.Equal(so0.CodeHash(), so1.CodeHash()) {
|
|
t.Fatalf("CodeHash mismatch: have %v, want %v", so0.CodeHash(), so1.CodeHash())
|
|
}
|
|
|
|
if !bytes.Equal(so0.code, so1.code) {
|
|
t.Fatalf("Code mismatch: have %v, want %v", so0.code, so1.code)
|
|
}
|
|
|
|
if len(so1.dirtyStorage) != len(so0.dirtyStorage) {
|
|
t.Errorf("Dirty storage size mismatch: have %d, want %d", len(so1.dirtyStorage), len(so0.dirtyStorage))
|
|
}
|
|
|
|
for k, v := range so1.dirtyStorage {
|
|
if so0.dirtyStorage[k] != v {
|
|
t.Errorf("Dirty storage key %x mismatch: have %v, want %v", k, so0.dirtyStorage[k], v)
|
|
}
|
|
}
|
|
|
|
for k, v := range so0.dirtyStorage {
|
|
if so1.dirtyStorage[k] != v {
|
|
t.Errorf("Dirty storage key %x mismatch: have %v, want none.", k, v)
|
|
}
|
|
}
|
|
|
|
if len(so1.originStorage) != len(so0.originStorage) {
|
|
t.Errorf("Origin storage size mismatch: have %d, want %d", len(so1.originStorage), len(so0.originStorage))
|
|
}
|
|
|
|
for k, v := range so1.originStorage {
|
|
if so0.originStorage[k] != v {
|
|
t.Errorf("Origin storage key %x mismatch: have %v, want %v", k, so0.originStorage[k], v)
|
|
}
|
|
}
|
|
|
|
for k, v := range so0.originStorage {
|
|
if so1.originStorage[k] != v {
|
|
t.Errorf("Origin storage key %x mismatch: have %v, want none.", k, v)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateKnownAccounts(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
knownAccounts := make(types.KnownAccounts)
|
|
|
|
types.InsertKnownAccounts(knownAccounts, common.HexToAddress("0xadd1add1add1add1add1add1add1add1add1add1"), common.HexToHash("0x2d6f8a898e7dec0bb7a50e8c142be32d7c98c096ff68ed57b9b08280d9aca1ce"))
|
|
types.InsertKnownAccounts(knownAccounts, common.HexToAddress("0xadd2add2add2add2add2add2add2add2add2add2"), map[common.Hash]common.Hash{
|
|
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000aaa"): common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000bbb"),
|
|
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ccc"): common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ddd"),
|
|
})
|
|
|
|
stateobjaddr1 := common.HexToAddress("0xadd1add1add1add1add1add1add1add1add1add1")
|
|
stateobjaddr2 := common.HexToAddress("0xadd2add2add2add2add2add2add2add2add2add2")
|
|
|
|
storageaddr1 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000zzz")
|
|
storageaddr21 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000aaa")
|
|
storageaddr22 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ccc")
|
|
|
|
data1 := common.BytesToHash([]byte{24})
|
|
data21 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000bbb")
|
|
data22 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ddd")
|
|
|
|
s := newStateTest()
|
|
|
|
// set initial state object value
|
|
s.state.SetState(stateobjaddr1, storageaddr1, data1)
|
|
s.state.SetState(stateobjaddr2, storageaddr21, data21)
|
|
s.state.SetState(stateobjaddr2, storageaddr22, data22)
|
|
|
|
require.NoError(t, s.state.ValidateKnownAccounts(knownAccounts))
|
|
|
|
types.InsertKnownAccounts(knownAccounts, common.HexToAddress("0xadd1add1add1add1add1add1add1add1add1add2"), common.HexToHash("0x2d6f8a898e7dec0bb7a50e8c142be32d7c98c096ff68ed57b9b08280d9aca1cf"))
|
|
|
|
stateobjaddr3 := common.HexToAddress("0xadd1add1add1add1add1add1add1add1add1add2")
|
|
storageaddr3 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000yyy")
|
|
data3 := common.BytesToHash([]byte{24})
|
|
|
|
s.state.SetState(stateobjaddr3, storageaddr3, data3)
|
|
|
|
// expected error
|
|
err := s.state.ValidateKnownAccounts(knownAccounts)
|
|
require.Error(t, err, "should have been an error")
|
|
|
|
// correct the previous mistake "0x2d6f8a898e7dec0bb7a50e8c142be32d7c98c096ff68ed57b9b08280d9aca1cf" -> "0x2d6f8a898e7dec0bb7a50e8c142be32d7c98c096ff68ed57b9b08280d9aca1ce"
|
|
types.InsertKnownAccounts(knownAccounts, common.HexToAddress("0xadd1add1add1add1add1add1add1add1add1add2"), common.HexToHash("0x2d6f8a898e7dec0bb7a50e8c142be32d7c98c096ff68ed57b9b08280d9aca1ce"))
|
|
types.InsertKnownAccounts(knownAccounts, common.HexToAddress("0xadd2add2add2add2add2add2add2add2add2add3"), map[common.Hash]common.Hash{
|
|
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000aaa"): common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000bbb"),
|
|
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ccc"): common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ddd"),
|
|
})
|
|
|
|
stateobjaddr4 := common.HexToAddress("0xadd2add2add2add2add2add2add2add2add2add3")
|
|
storageaddr41 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000aaa")
|
|
storageaddr42 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000ccc")
|
|
data4 := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000bbb")
|
|
|
|
s.state.SetState(stateobjaddr4, storageaddr41, data4)
|
|
s.state.SetState(stateobjaddr4, storageaddr42, data4)
|
|
|
|
// expected error
|
|
err = s.state.ValidateKnownAccounts(knownAccounts)
|
|
require.Error(t, err, "should have been an error")
|
|
}
|