forked from cerc-io/plugeth
all: implement EIP-1153 transient storage (#26003)
Implements TSTORE and TLOAD as specified by the following EIP: https://eips.ethereum.org/EIPS/eip-1153 https://ethereum-magicians.org/t/eip-1153-transient-storage-opcodes/553 Co-authored-by: Sara Reynolds <snreynolds2506@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Gary Rong <garyrong0905@gmail.com>
This commit is contained in:
parent
bc90a88263
commit
b4ea2bf7dd
@ -173,7 +173,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
|
|||||||
}
|
}
|
||||||
vmConfig.Tracer = tracer
|
vmConfig.Tracer = tracer
|
||||||
vmConfig.Debug = (tracer != nil)
|
vmConfig.Debug = (tracer != nil)
|
||||||
statedb.Prepare(tx.Hash(), txIndex)
|
statedb.SetTxContext(tx.Hash(), txIndex)
|
||||||
txContext := core.NewEVMTxContext(msg)
|
txContext := core.NewEVMTxContext(msg)
|
||||||
snapshot := statedb.Snapshot()
|
snapshot := statedb.Snapshot()
|
||||||
evm := vm.NewEVM(vmContext, txContext, statedb, chainConfig, vmConfig)
|
evm := vm.NewEVM(vmContext, txContext, statedb, chainConfig, vmConfig)
|
||||||
|
@ -4093,3 +4093,97 @@ func testCreateThenDelete(t *testing.T, config *params.ChainConfig) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestTransientStorageReset ensures the transient storage is wiped correctly
|
||||||
|
// between transactions.
|
||||||
|
func TestTransientStorageReset(t *testing.T) {
|
||||||
|
var (
|
||||||
|
engine = ethash.NewFaker()
|
||||||
|
key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
|
||||||
|
address = crypto.PubkeyToAddress(key.PublicKey)
|
||||||
|
destAddress = crypto.CreateAddress(address, 0)
|
||||||
|
funds = big.NewInt(1000000000000000)
|
||||||
|
vmConfig = vm.Config{
|
||||||
|
ExtraEips: []int{1153}, // Enable transient storage EIP
|
||||||
|
}
|
||||||
|
)
|
||||||
|
code := append([]byte{
|
||||||
|
// TLoad value with location 1
|
||||||
|
byte(vm.PUSH1), 0x1,
|
||||||
|
byte(vm.TLOAD),
|
||||||
|
|
||||||
|
// PUSH location
|
||||||
|
byte(vm.PUSH1), 0x1,
|
||||||
|
|
||||||
|
// SStore location:value
|
||||||
|
byte(vm.SSTORE),
|
||||||
|
}, make([]byte, 32-6)...)
|
||||||
|
initCode := []byte{
|
||||||
|
// TSTORE 1:1
|
||||||
|
byte(vm.PUSH1), 0x1,
|
||||||
|
byte(vm.PUSH1), 0x1,
|
||||||
|
byte(vm.TSTORE),
|
||||||
|
|
||||||
|
// Get the runtime-code on the stack
|
||||||
|
byte(vm.PUSH32)}
|
||||||
|
initCode = append(initCode, code...)
|
||||||
|
initCode = append(initCode, []byte{
|
||||||
|
byte(vm.PUSH1), 0x0, // offset
|
||||||
|
byte(vm.MSTORE),
|
||||||
|
byte(vm.PUSH1), 0x6, // size
|
||||||
|
byte(vm.PUSH1), 0x0, // offset
|
||||||
|
byte(vm.RETURN), // return 6 bytes of zero-code
|
||||||
|
}...)
|
||||||
|
gspec := &Genesis{
|
||||||
|
Config: params.TestChainConfig,
|
||||||
|
Alloc: GenesisAlloc{
|
||||||
|
address: {Balance: funds},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
nonce := uint64(0)
|
||||||
|
signer := types.HomesteadSigner{}
|
||||||
|
_, blocks, _ := GenerateChainWithGenesis(gspec, engine, 1, func(i int, b *BlockGen) {
|
||||||
|
fee := big.NewInt(1)
|
||||||
|
if b.header.BaseFee != nil {
|
||||||
|
fee = b.header.BaseFee
|
||||||
|
}
|
||||||
|
b.SetCoinbase(common.Address{1})
|
||||||
|
tx, _ := types.SignNewTx(key, signer, &types.LegacyTx{
|
||||||
|
Nonce: nonce,
|
||||||
|
GasPrice: new(big.Int).Set(fee),
|
||||||
|
Gas: 100000,
|
||||||
|
Data: initCode,
|
||||||
|
})
|
||||||
|
nonce++
|
||||||
|
b.AddTxWithVMConfig(tx, vmConfig)
|
||||||
|
|
||||||
|
tx, _ = types.SignNewTx(key, signer, &types.LegacyTx{
|
||||||
|
Nonce: nonce,
|
||||||
|
GasPrice: new(big.Int).Set(fee),
|
||||||
|
Gas: 100000,
|
||||||
|
To: &destAddress,
|
||||||
|
})
|
||||||
|
b.AddTxWithVMConfig(tx, vmConfig)
|
||||||
|
nonce++
|
||||||
|
})
|
||||||
|
|
||||||
|
// Initialize the blockchain with 1153 enabled.
|
||||||
|
chain, err := NewBlockChain(rawdb.NewMemoryDatabase(), nil, gspec, nil, engine, vmConfig, nil, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to create tester chain: %v", err)
|
||||||
|
}
|
||||||
|
// Import the blocks
|
||||||
|
if _, err := chain.InsertChain(blocks); err != nil {
|
||||||
|
t.Fatalf("failed to insert into chain: %v", err)
|
||||||
|
}
|
||||||
|
// Check the storage
|
||||||
|
state, err := chain.StateAt(chain.CurrentHeader().Root)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Failed to load state %v", err)
|
||||||
|
}
|
||||||
|
loc := common.BytesToHash([]byte{1})
|
||||||
|
slot := state.GetState(destAddress, loc)
|
||||||
|
if slot != (common.Hash{}) {
|
||||||
|
t.Fatalf("Unexpected dirty storage slot")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -79,6 +79,26 @@ func (b *BlockGen) SetDifficulty(diff *big.Int) {
|
|||||||
b.header.Difficulty = diff
|
b.header.Difficulty = diff
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// addTx adds a transaction to the generated block. If no coinbase has
|
||||||
|
// been set, the block's coinbase is set to the zero address.
|
||||||
|
//
|
||||||
|
// There are a few options can be passed as well in order to run some
|
||||||
|
// customized rules.
|
||||||
|
// - bc: enables the ability to query historical block hashes for BLOCKHASH
|
||||||
|
// - vmConfig: extends the flexibility for customizing evm rules, e.g. enable extra EIPs
|
||||||
|
func (b *BlockGen) addTx(bc *BlockChain, vmConfig vm.Config, tx *types.Transaction) {
|
||||||
|
if b.gasPool == nil {
|
||||||
|
b.SetCoinbase(common.Address{})
|
||||||
|
}
|
||||||
|
b.statedb.SetTxContext(tx.Hash(), len(b.txs))
|
||||||
|
receipt, err := ApplyTransaction(b.config, bc, &b.header.Coinbase, b.gasPool, b.statedb, b.header, tx, &b.header.GasUsed, vmConfig)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
b.txs = append(b.txs, tx)
|
||||||
|
b.receipts = append(b.receipts, receipt)
|
||||||
|
}
|
||||||
|
|
||||||
// AddTx adds a transaction to the generated block. If no coinbase has
|
// AddTx adds a transaction to the generated block. If no coinbase has
|
||||||
// been set, the block's coinbase is set to the zero address.
|
// been set, the block's coinbase is set to the zero address.
|
||||||
//
|
//
|
||||||
@ -88,7 +108,7 @@ func (b *BlockGen) SetDifficulty(diff *big.Int) {
|
|||||||
// added. Notably, contract code relying on the BLOCKHASH instruction
|
// added. Notably, contract code relying on the BLOCKHASH instruction
|
||||||
// will panic during execution.
|
// will panic during execution.
|
||||||
func (b *BlockGen) AddTx(tx *types.Transaction) {
|
func (b *BlockGen) AddTx(tx *types.Transaction) {
|
||||||
b.AddTxWithChain(nil, tx)
|
b.addTx(nil, vm.Config{}, tx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddTxWithChain adds a transaction to the generated block. If no coinbase has
|
// AddTxWithChain adds a transaction to the generated block. If no coinbase has
|
||||||
@ -100,16 +120,14 @@ func (b *BlockGen) AddTx(tx *types.Transaction) {
|
|||||||
// added. If contract code relies on the BLOCKHASH instruction,
|
// added. If contract code relies on the BLOCKHASH instruction,
|
||||||
// the block in chain will be returned.
|
// the block in chain will be returned.
|
||||||
func (b *BlockGen) AddTxWithChain(bc *BlockChain, tx *types.Transaction) {
|
func (b *BlockGen) AddTxWithChain(bc *BlockChain, tx *types.Transaction) {
|
||||||
if b.gasPool == nil {
|
b.addTx(bc, vm.Config{}, tx)
|
||||||
b.SetCoinbase(common.Address{})
|
}
|
||||||
}
|
|
||||||
b.statedb.Prepare(tx.Hash(), len(b.txs))
|
// AddTxWithVMConfig adds a transaction to the generated block. If no coinbase has
|
||||||
receipt, err := ApplyTransaction(b.config, bc, &b.header.Coinbase, b.gasPool, b.statedb, b.header, tx, &b.header.GasUsed, vm.Config{})
|
// been set, the block's coinbase is set to the zero address.
|
||||||
if err != nil {
|
// The evm interpreter can be customized with the provided vm config.
|
||||||
panic(err)
|
func (b *BlockGen) AddTxWithVMConfig(tx *types.Transaction, config vm.Config) {
|
||||||
}
|
b.addTx(nil, config, tx)
|
||||||
b.txs = append(b.txs, tx)
|
|
||||||
b.receipts = append(b.receipts, receipt)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBalance returns the balance of the given address at the generated block.
|
// GetBalance returns the balance of the given address at the generated block.
|
||||||
|
@ -138,6 +138,11 @@ type (
|
|||||||
address *common.Address
|
address *common.Address
|
||||||
slot *common.Hash
|
slot *common.Hash
|
||||||
}
|
}
|
||||||
|
|
||||||
|
transientStorageChange struct {
|
||||||
|
account *common.Address
|
||||||
|
key, prevalue common.Hash
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func (ch createObjectChange) revert(s *StateDB) {
|
func (ch createObjectChange) revert(s *StateDB) {
|
||||||
@ -213,6 +218,14 @@ func (ch storageChange) dirtied() *common.Address {
|
|||||||
return ch.account
|
return ch.account
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ch transientStorageChange) revert(s *StateDB) {
|
||||||
|
s.setTransientState(*ch.account, ch.key, ch.prevalue)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ch transientStorageChange) dirtied() *common.Address {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (ch refundChange) revert(s *StateDB) {
|
func (ch refundChange) revert(s *StateDB) {
|
||||||
s.refund = ch.prev
|
s.refund = ch.prev
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,7 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/crypto"
|
"github.com/ethereum/go-ethereum/crypto"
|
||||||
"github.com/ethereum/go-ethereum/log"
|
"github.com/ethereum/go-ethereum/log"
|
||||||
"github.com/ethereum/go-ethereum/metrics"
|
"github.com/ethereum/go-ethereum/metrics"
|
||||||
|
"github.com/ethereum/go-ethereum/params"
|
||||||
"github.com/ethereum/go-ethereum/rlp"
|
"github.com/ethereum/go-ethereum/rlp"
|
||||||
"github.com/ethereum/go-ethereum/trie"
|
"github.com/ethereum/go-ethereum/trie"
|
||||||
)
|
)
|
||||||
@ -102,6 +103,9 @@ type StateDB struct {
|
|||||||
// Per-transaction access list
|
// Per-transaction access list
|
||||||
accessList *accessList
|
accessList *accessList
|
||||||
|
|
||||||
|
// Transient storage
|
||||||
|
transientStorage transientStorage
|
||||||
|
|
||||||
// Journal of state modifications. This is the backbone of
|
// Journal of state modifications. This is the backbone of
|
||||||
// Snapshot and RevertToSnapshot.
|
// Snapshot and RevertToSnapshot.
|
||||||
journal *journal
|
journal *journal
|
||||||
@ -146,6 +150,7 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
|
|||||||
preimages: make(map[common.Hash][]byte),
|
preimages: make(map[common.Hash][]byte),
|
||||||
journal: newJournal(),
|
journal: newJournal(),
|
||||||
accessList: newAccessList(),
|
accessList: newAccessList(),
|
||||||
|
transientStorage: newTransientStorage(),
|
||||||
hasher: crypto.NewKeccakState(),
|
hasher: crypto.NewKeccakState(),
|
||||||
}
|
}
|
||||||
if sdb.snaps != nil {
|
if sdb.snaps != nil {
|
||||||
@ -452,6 +457,35 @@ func (s *StateDB) Suicide(addr common.Address) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetTransientState sets transient storage for a given account. It
|
||||||
|
// adds the change to the journal so that it can be rolled back
|
||||||
|
// to its previous value if there is a revert.
|
||||||
|
func (s *StateDB) SetTransientState(addr common.Address, key, value common.Hash) {
|
||||||
|
prev := s.GetTransientState(addr, key)
|
||||||
|
if prev == value {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
s.journal.append(transientStorageChange{
|
||||||
|
account: &addr,
|
||||||
|
key: key,
|
||||||
|
prevalue: prev,
|
||||||
|
})
|
||||||
|
|
||||||
|
s.setTransientState(addr, key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// setTransientState is a lower level setter for transient storage. It
|
||||||
|
// is called during a revert to prevent modifications to the journal.
|
||||||
|
func (s *StateDB) setTransientState(addr common.Address, key, value common.Hash) {
|
||||||
|
s.transientStorage.Set(addr, key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTransientState gets transient storage for a given account.
|
||||||
|
func (s *StateDB) GetTransientState(addr common.Address, key common.Hash) common.Hash {
|
||||||
|
return s.transientStorage.Get(addr, key)
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Setting, updating & deleting state object methods.
|
// Setting, updating & deleting state object methods.
|
||||||
//
|
//
|
||||||
@ -708,6 +742,8 @@ func (s *StateDB) Copy() *StateDB {
|
|||||||
// to not blow up if we ever decide copy it in the middle of a transaction
|
// to not blow up if we ever decide copy it in the middle of a transaction
|
||||||
state.accessList = s.accessList.Copy()
|
state.accessList = s.accessList.Copy()
|
||||||
|
|
||||||
|
state.transientStorage = s.transientStorage.Copy()
|
||||||
|
|
||||||
// If there's a prefetcher running, make an inactive copy of it that can
|
// If there's a prefetcher running, make an inactive copy of it that can
|
||||||
// only access data but does not actively preload (since the user will not
|
// only access data but does not actively preload (since the user will not
|
||||||
// know that they need to explicitly terminate an active copy).
|
// know that they need to explicitly terminate an active copy).
|
||||||
@ -880,9 +916,10 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
|
|||||||
return s.trie.Hash()
|
return s.trie.Hash()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare sets the current transaction hash and index which are
|
// SetTxContext sets the current transaction hash and index which are
|
||||||
// used when the EVM emits new state logs.
|
// used when the EVM emits new state logs. It should be invoked before
|
||||||
func (s *StateDB) Prepare(thash common.Hash, ti int) {
|
// transaction execution.
|
||||||
|
func (s *StateDB) SetTxContext(thash common.Hash, ti int) {
|
||||||
s.thash = thash
|
s.thash = thash
|
||||||
s.txIndex = ti
|
s.txIndex = ti
|
||||||
}
|
}
|
||||||
@ -1020,33 +1057,39 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
|
|||||||
return root, nil
|
return root, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// PrepareAccessList handles the preparatory steps for executing a state transition with
|
// Prepare handles the preparatory steps for executing a state transition with.
|
||||||
// regards to both EIP-2929 and EIP-2930:
|
// This method must be invoked before state transition.
|
||||||
//
|
//
|
||||||
|
// Berlin fork:
|
||||||
// - Add sender to access list (2929)
|
// - Add sender to access list (2929)
|
||||||
// - Add destination to access list (2929)
|
// - Add destination to access list (2929)
|
||||||
// - Add precompiles to access list (2929)
|
// - Add precompiles to access list (2929)
|
||||||
// - Add the contents of the optional tx access list (2930)
|
// - Add the contents of the optional tx access list (2930)
|
||||||
//
|
//
|
||||||
// This method should only be called if Berlin/2929+2930 is applicable at the current number.
|
// Potential EIPs:
|
||||||
func (s *StateDB) PrepareAccessList(sender common.Address, dst *common.Address, precompiles []common.Address, list types.AccessList) {
|
// - Reset transient storage(1153)
|
||||||
// Clear out any leftover from previous executions
|
func (s *StateDB) Prepare(rules params.Rules, sender common.Address, dst *common.Address, precompiles []common.Address, list types.AccessList) {
|
||||||
s.accessList = newAccessList()
|
if rules.IsBerlin {
|
||||||
|
// Clear out any leftover from previous executions
|
||||||
|
s.accessList = newAccessList()
|
||||||
|
|
||||||
s.AddAddressToAccessList(sender)
|
s.AddAddressToAccessList(sender)
|
||||||
if dst != nil {
|
if dst != nil {
|
||||||
s.AddAddressToAccessList(*dst)
|
s.AddAddressToAccessList(*dst)
|
||||||
// If it's a create-tx, the destination will be added inside evm.create
|
// If it's a create-tx, the destination will be added inside evm.create
|
||||||
}
|
}
|
||||||
for _, addr := range precompiles {
|
for _, addr := range precompiles {
|
||||||
s.AddAddressToAccessList(addr)
|
s.AddAddressToAccessList(addr)
|
||||||
}
|
}
|
||||||
for _, el := range list {
|
for _, el := range list {
|
||||||
s.AddAddressToAccessList(el.Address)
|
s.AddAddressToAccessList(el.Address)
|
||||||
for _, key := range el.StorageKeys {
|
for _, key := range el.StorageKeys {
|
||||||
s.AddSlotToAccessList(el.Address, key)
|
s.AddSlotToAccessList(el.Address, key)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Reset transient storage at the beginning of transaction execution
|
||||||
|
s.transientStorage = newTransientStorage()
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddAddressToAccessList adds the given address to the access list
|
// AddAddressToAccessList adds the given address to the access list
|
||||||
|
@ -342,6 +342,16 @@ func newTestAction(addr common.Address, r *rand.Rand) testAction {
|
|||||||
},
|
},
|
||||||
args: make([]int64, 1),
|
args: make([]int64, 1),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "SetTransientState",
|
||||||
|
fn: func(a testAction, s *StateDB) {
|
||||||
|
var key, val common.Hash
|
||||||
|
binary.BigEndian.PutUint16(key[:], uint16(a.args[0]))
|
||||||
|
binary.BigEndian.PutUint16(val[:], uint16(a.args[1]))
|
||||||
|
s.SetTransientState(addr, key, val)
|
||||||
|
},
|
||||||
|
args: make([]int64, 2),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
action := actions[r.Intn(len(actions))]
|
action := actions[r.Intn(len(actions))]
|
||||||
var nameargs []string
|
var nameargs []string
|
||||||
@ -954,3 +964,37 @@ func TestFlushOrderDataLoss(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStateDBTransientStorage(t *testing.T) {
|
||||||
|
memDb := rawdb.NewMemoryDatabase()
|
||||||
|
db := NewDatabase(memDb)
|
||||||
|
state, _ := New(common.Hash{}, db, nil)
|
||||||
|
|
||||||
|
key := common.Hash{0x01}
|
||||||
|
value := common.Hash{0x02}
|
||||||
|
addr := common.Address{}
|
||||||
|
|
||||||
|
state.SetTransientState(addr, key, value)
|
||||||
|
if exp, got := 1, state.journal.length(); exp != got {
|
||||||
|
t.Fatalf("journal length mismatch: have %d, want %d", got, exp)
|
||||||
|
}
|
||||||
|
// the retrieved value should equal what was set
|
||||||
|
if got := state.GetTransientState(addr, key); got != value {
|
||||||
|
t.Fatalf("transient storage mismatch: have %x, want %x", got, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// revert the transient state being set and then check that the
|
||||||
|
// value is now the empty hash
|
||||||
|
state.journal.revert(state, 0)
|
||||||
|
if got, exp := state.GetTransientState(addr, key), (common.Hash{}); exp != got {
|
||||||
|
t.Fatalf("transient storage mismatch: have %x, want %x", got, exp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// set transient state and then copy the statedb and ensure that
|
||||||
|
// the transient state is copied
|
||||||
|
state.SetTransientState(addr, key, value)
|
||||||
|
cpy := state.Copy()
|
||||||
|
if got := cpy.GetTransientState(addr, key); got != value {
|
||||||
|
t.Fatalf("transient storage mismatch: have %x, want %x", got, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
55
core/state/transient_storage.go
Normal file
55
core/state/transient_storage.go
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
// Copyright 2022 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 (
|
||||||
|
"github.com/ethereum/go-ethereum/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
// transientStorage is a representation of EIP-1153 "Transient Storage".
|
||||||
|
type transientStorage map[common.Address]Storage
|
||||||
|
|
||||||
|
// newTransientStorage creates a new instance of a transientStorage.
|
||||||
|
func newTransientStorage() transientStorage {
|
||||||
|
return make(transientStorage)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set sets the transient-storage `value` for `key` at the given `addr`.
|
||||||
|
func (t transientStorage) Set(addr common.Address, key, value common.Hash) {
|
||||||
|
if _, ok := t[addr]; !ok {
|
||||||
|
t[addr] = make(Storage)
|
||||||
|
}
|
||||||
|
t[addr][key] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get gets the transient storage for `key` at the given `addr`.
|
||||||
|
func (t transientStorage) Get(addr common.Address, key common.Hash) common.Hash {
|
||||||
|
val, ok := t[addr]
|
||||||
|
if !ok {
|
||||||
|
return common.Hash{}
|
||||||
|
}
|
||||||
|
return val[key]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copy does a deep copy of the transientStorage
|
||||||
|
func (t transientStorage) Copy() transientStorage {
|
||||||
|
storage := make(transientStorage)
|
||||||
|
for key, value := range t {
|
||||||
|
storage[key] = value.Copy()
|
||||||
|
}
|
||||||
|
return storage
|
||||||
|
}
|
@ -67,7 +67,7 @@ func (p *statePrefetcher) Prefetch(block *types.Block, statedb *state.StateDB, c
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return // Also invalid block, bail out
|
return // Also invalid block, bail out
|
||||||
}
|
}
|
||||||
statedb.Prepare(tx.Hash(), i)
|
statedb.SetTxContext(tx.Hash(), i)
|
||||||
if err := precacheTransaction(msg, p.config, gaspool, statedb, header, evm); err != nil {
|
if err := precacheTransaction(msg, p.config, gaspool, statedb, header, evm); err != nil {
|
||||||
return // Ugh, something went horribly wrong, bail out
|
return // Ugh, something went horribly wrong, bail out
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
|
return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
|
||||||
}
|
}
|
||||||
statedb.Prepare(tx.Hash(), i)
|
statedb.SetTxContext(tx.Hash(), i)
|
||||||
receipt, err := applyTransaction(msg, p.config, nil, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
|
receipt, err := applyTransaction(msg, p.config, nil, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
|
return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
|
||||||
|
@ -319,10 +319,11 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
|
|||||||
return nil, fmt.Errorf("%w: address %v", ErrInsufficientFundsForTransfer, msg.From().Hex())
|
return nil, fmt.Errorf("%w: address %v", ErrInsufficientFundsForTransfer, msg.From().Hex())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up the initial access list.
|
// Execute the preparatory steps for state transition which includes:
|
||||||
if rules.IsBerlin {
|
// - prepare accessList(post-berlin)
|
||||||
st.state.PrepareAccessList(msg.From(), msg.To(), vm.ActivePrecompiles(rules), msg.AccessList())
|
// - reset transient storage(eip 1153)
|
||||||
}
|
st.state.Prepare(rules, msg.From(), msg.To(), vm.ActivePrecompiles(rules), msg.AccessList())
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ret []byte
|
ret []byte
|
||||||
vmerr error // vm errors do not effect consensus and are therefore not assigned to err
|
vmerr error // vm errors do not effect consensus and are therefore not assigned to err
|
||||||
|
@ -20,6 +20,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
|
"github.com/ethereum/go-ethereum/common"
|
||||||
"github.com/ethereum/go-ethereum/params"
|
"github.com/ethereum/go-ethereum/params"
|
||||||
"github.com/holiman/uint256"
|
"github.com/holiman/uint256"
|
||||||
)
|
)
|
||||||
@ -32,6 +33,7 @@ var activators = map[int]func(*JumpTable){
|
|||||||
2200: enable2200,
|
2200: enable2200,
|
||||||
1884: enable1884,
|
1884: enable1884,
|
||||||
1344: enable1344,
|
1344: enable1344,
|
||||||
|
1153: enable1153,
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnableEIP enables the given EIP on the config.
|
// EnableEIP enables the given EIP on the config.
|
||||||
@ -169,6 +171,45 @@ func enable3198(jt *JumpTable) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// enable1153 applies EIP-1153 "Transient Storage"
|
||||||
|
// - Adds TLOAD that reads from transient storage
|
||||||
|
// - Adds TSTORE that writes to transient storage
|
||||||
|
func enable1153(jt *JumpTable) {
|
||||||
|
jt[TLOAD] = &operation{
|
||||||
|
execute: opTload,
|
||||||
|
constantGas: params.WarmStorageReadCostEIP2929,
|
||||||
|
minStack: minStack(1, 1),
|
||||||
|
maxStack: maxStack(1, 1),
|
||||||
|
}
|
||||||
|
|
||||||
|
jt[TSTORE] = &operation{
|
||||||
|
execute: opTstore,
|
||||||
|
constantGas: params.WarmStorageReadCostEIP2929,
|
||||||
|
minStack: minStack(2, 0),
|
||||||
|
maxStack: maxStack(2, 0),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// opTload implements TLOAD opcode
|
||||||
|
func opTload(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
|
||||||
|
loc := scope.Stack.peek()
|
||||||
|
hash := common.Hash(loc.Bytes32())
|
||||||
|
val := interpreter.evm.StateDB.GetTransientState(scope.Contract.Address(), hash)
|
||||||
|
loc.SetBytes(val.Bytes())
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// opTstore implements TSTORE opcode
|
||||||
|
func opTstore(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
|
||||||
|
if interpreter.readOnly {
|
||||||
|
return nil, ErrWriteProtection
|
||||||
|
}
|
||||||
|
loc := scope.Stack.pop()
|
||||||
|
val := scope.Stack.pop()
|
||||||
|
interpreter.evm.StateDB.SetTransientState(scope.Contract.Address(), loc.Bytes32(), val.Bytes32())
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// opBaseFee implements BASEFEE opcode
|
// opBaseFee implements BASEFEE opcode
|
||||||
func opBaseFee(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
|
func opBaseFee(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
|
||||||
baseFee, _ := uint256.FromBig(interpreter.evm.Context.BaseFee)
|
baseFee, _ := uint256.FromBig(interpreter.evm.Context.BaseFee)
|
||||||
|
@ -527,8 +527,7 @@ func opSstore(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]b
|
|||||||
}
|
}
|
||||||
loc := scope.Stack.pop()
|
loc := scope.Stack.pop()
|
||||||
val := scope.Stack.pop()
|
val := scope.Stack.pop()
|
||||||
interpreter.evm.StateDB.SetState(scope.Contract.Address(),
|
interpreter.evm.StateDB.SetState(scope.Contract.Address(), loc.Bytes32(), val.Bytes32())
|
||||||
loc.Bytes32(), val.Bytes32())
|
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
||||||
|
"github.com/ethereum/go-ethereum/core/state"
|
||||||
"github.com/ethereum/go-ethereum/crypto"
|
"github.com/ethereum/go-ethereum/crypto"
|
||||||
"github.com/ethereum/go-ethereum/params"
|
"github.com/ethereum/go-ethereum/params"
|
||||||
"github.com/holiman/uint256"
|
"github.com/holiman/uint256"
|
||||||
@ -45,6 +47,14 @@ var alphabetSoup = "ABCDEF090807060504030201ffffffffffffffffffffffffffffffffffff
|
|||||||
var commonParams []*twoOperandParams
|
var commonParams []*twoOperandParams
|
||||||
var twoOpMethods map[string]executionFunc
|
var twoOpMethods map[string]executionFunc
|
||||||
|
|
||||||
|
type contractRef struct {
|
||||||
|
addr common.Address
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c contractRef) Address() common.Address {
|
||||||
|
return c.addr
|
||||||
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
// Params is a list of common edgecases that should be used for some common tests
|
// Params is a list of common edgecases that should be used for some common tests
|
||||||
params := []string{
|
params := []string{
|
||||||
@ -567,6 +577,49 @@ func BenchmarkOpMstore(bench *testing.B) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestOpTstore(t *testing.T) {
|
||||||
|
var (
|
||||||
|
statedb, _ = state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
|
||||||
|
env = NewEVM(BlockContext{}, TxContext{}, statedb, params.TestChainConfig, Config{})
|
||||||
|
stack = newstack()
|
||||||
|
mem = NewMemory()
|
||||||
|
evmInterpreter = NewEVMInterpreter(env, env.Config)
|
||||||
|
caller = common.Address{}
|
||||||
|
to = common.Address{1}
|
||||||
|
contractRef = contractRef{caller}
|
||||||
|
contract = NewContract(contractRef, AccountRef(to), new(big.Int), 0)
|
||||||
|
scopeContext = ScopeContext{mem, stack, contract}
|
||||||
|
value = common.Hex2Bytes("abcdef00000000000000abba000000000deaf000000c0de00100000000133700")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Add a stateObject for the caller and the contract being called
|
||||||
|
statedb.CreateAccount(caller)
|
||||||
|
statedb.CreateAccount(to)
|
||||||
|
|
||||||
|
env.interpreter = evmInterpreter
|
||||||
|
pc := uint64(0)
|
||||||
|
// push the value to the stack
|
||||||
|
stack.push(new(uint256.Int).SetBytes(value))
|
||||||
|
// push the location to the stack
|
||||||
|
stack.push(new(uint256.Int))
|
||||||
|
opTstore(&pc, evmInterpreter, &scopeContext)
|
||||||
|
// there should be no elements on the stack after TSTORE
|
||||||
|
if stack.len() != 0 {
|
||||||
|
t.Fatal("stack wrong size")
|
||||||
|
}
|
||||||
|
// push the location to the stack
|
||||||
|
stack.push(new(uint256.Int))
|
||||||
|
opTload(&pc, evmInterpreter, &scopeContext)
|
||||||
|
// there should be one element on the stack after TLOAD
|
||||||
|
if stack.len() != 1 {
|
||||||
|
t.Fatal("stack wrong size")
|
||||||
|
}
|
||||||
|
val := stack.peek()
|
||||||
|
if !bytes.Equal(val.Bytes(), value) {
|
||||||
|
t.Fatal("incorrect element read from transient storage")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func BenchmarkOpKeccak256(bench *testing.B) {
|
func BenchmarkOpKeccak256(bench *testing.B) {
|
||||||
var (
|
var (
|
||||||
env = NewEVM(BlockContext{}, TxContext{}, nil, params.TestChainConfig, Config{})
|
env = NewEVM(BlockContext{}, TxContext{}, nil, params.TestChainConfig, Config{})
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
"github.com/ethereum/go-ethereum/core/types"
|
"github.com/ethereum/go-ethereum/core/types"
|
||||||
|
"github.com/ethereum/go-ethereum/params"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StateDB is an EVM database for full state querying.
|
// StateDB is an EVM database for full state querying.
|
||||||
@ -47,6 +48,9 @@ type StateDB interface {
|
|||||||
GetState(common.Address, common.Hash) common.Hash
|
GetState(common.Address, common.Hash) common.Hash
|
||||||
SetState(common.Address, common.Hash, common.Hash)
|
SetState(common.Address, common.Hash, common.Hash)
|
||||||
|
|
||||||
|
GetTransientState(addr common.Address, key common.Hash) common.Hash
|
||||||
|
SetTransientState(addr common.Address, key, value common.Hash)
|
||||||
|
|
||||||
Suicide(common.Address) bool
|
Suicide(common.Address) bool
|
||||||
HasSuicided(common.Address) bool
|
HasSuicided(common.Address) bool
|
||||||
|
|
||||||
@ -57,7 +61,6 @@ type StateDB interface {
|
|||||||
// is defined according to EIP161 (balance = nonce = code = 0).
|
// is defined according to EIP161 (balance = nonce = code = 0).
|
||||||
Empty(common.Address) bool
|
Empty(common.Address) bool
|
||||||
|
|
||||||
PrepareAccessList(sender common.Address, dest *common.Address, precompiles []common.Address, txAccesses types.AccessList)
|
|
||||||
AddressInAccessList(addr common.Address) bool
|
AddressInAccessList(addr common.Address) bool
|
||||||
SlotInAccessList(addr common.Address, slot common.Hash) (addressOk bool, slotOk bool)
|
SlotInAccessList(addr common.Address, slot common.Hash) (addressOk bool, slotOk bool)
|
||||||
// AddAddressToAccessList adds the given address to the access list. This operation is safe to perform
|
// AddAddressToAccessList adds the given address to the access list. This operation is safe to perform
|
||||||
@ -66,6 +69,7 @@ type StateDB interface {
|
|||||||
// AddSlotToAccessList adds the given (address,slot) to the access list. This operation is safe to perform
|
// AddSlotToAccessList adds the given (address,slot) to the access list. This operation is safe to perform
|
||||||
// even if the feature/fork is not active yet
|
// even if the feature/fork is not active yet
|
||||||
AddSlotToAccessList(addr common.Address, slot common.Hash)
|
AddSlotToAccessList(addr common.Address, slot common.Hash)
|
||||||
|
Prepare(rules params.Rules, sender common.Address, dest *common.Address, precompiles []common.Address, txAccesses types.AccessList)
|
||||||
|
|
||||||
RevertToSnapshot(int)
|
RevertToSnapshot(int)
|
||||||
Snapshot() int
|
Snapshot() int
|
||||||
|
@ -219,6 +219,12 @@ const (
|
|||||||
SELFDESTRUCT OpCode = 0xff
|
SELFDESTRUCT OpCode = 0xff
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// 0xb0 range.
|
||||||
|
const (
|
||||||
|
TLOAD OpCode = 0xb3
|
||||||
|
TSTORE OpCode = 0xb4
|
||||||
|
)
|
||||||
|
|
||||||
// Since the opcodes aren't all in order we can't use a regular slice.
|
// Since the opcodes aren't all in order we can't use a regular slice.
|
||||||
var opCodeToString = map[OpCode]string{
|
var opCodeToString = map[OpCode]string{
|
||||||
// 0x0 range - arithmetic ops.
|
// 0x0 range - arithmetic ops.
|
||||||
@ -373,6 +379,10 @@ var opCodeToString = map[OpCode]string{
|
|||||||
LOG3: "LOG3",
|
LOG3: "LOG3",
|
||||||
LOG4: "LOG4",
|
LOG4: "LOG4",
|
||||||
|
|
||||||
|
// 0xb0 range.
|
||||||
|
TLOAD: "TLOAD",
|
||||||
|
TSTORE: "TSTORE",
|
||||||
|
|
||||||
// 0xf0 range.
|
// 0xf0 range.
|
||||||
CREATE: "CREATE",
|
CREATE: "CREATE",
|
||||||
CALL: "CALL",
|
CALL: "CALL",
|
||||||
@ -463,6 +473,8 @@ var stringToOp = map[string]OpCode{
|
|||||||
"GAS": GAS,
|
"GAS": GAS,
|
||||||
"JUMPDEST": JUMPDEST,
|
"JUMPDEST": JUMPDEST,
|
||||||
"PUSH0": PUSH0,
|
"PUSH0": PUSH0,
|
||||||
|
"TLOAD": TLOAD,
|
||||||
|
"TSTORE": TSTORE,
|
||||||
"PUSH1": PUSH1,
|
"PUSH1": PUSH1,
|
||||||
"PUSH2": PUSH2,
|
"PUSH2": PUSH2,
|
||||||
"PUSH3": PUSH3,
|
"PUSH3": PUSH3,
|
||||||
|
@ -117,10 +117,13 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) {
|
|||||||
address = common.BytesToAddress([]byte("contract"))
|
address = common.BytesToAddress([]byte("contract"))
|
||||||
vmenv = NewEnv(cfg)
|
vmenv = NewEnv(cfg)
|
||||||
sender = vm.AccountRef(cfg.Origin)
|
sender = vm.AccountRef(cfg.Origin)
|
||||||
|
rules = cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil)
|
||||||
)
|
)
|
||||||
if rules := cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil); rules.IsBerlin {
|
// Execute the preparatory steps for state transition which includes:
|
||||||
cfg.State.PrepareAccessList(cfg.Origin, &address, vm.ActivePrecompiles(rules), nil)
|
// - prepare accessList(post-berlin)
|
||||||
}
|
// - reset transient storage(eip 1153)
|
||||||
|
cfg.State.Prepare(rules, cfg.Origin, &address, vm.ActivePrecompiles(rules), nil)
|
||||||
|
|
||||||
cfg.State.CreateAccount(address)
|
cfg.State.CreateAccount(address)
|
||||||
// set the receiver's (the executing contract) code for execution.
|
// set the receiver's (the executing contract) code for execution.
|
||||||
cfg.State.SetCode(address, code)
|
cfg.State.SetCode(address, code)
|
||||||
@ -132,7 +135,6 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) {
|
|||||||
cfg.GasLimit,
|
cfg.GasLimit,
|
||||||
cfg.Value,
|
cfg.Value,
|
||||||
)
|
)
|
||||||
|
|
||||||
return ret, cfg.State, err
|
return ret, cfg.State, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,10 +151,13 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) {
|
|||||||
var (
|
var (
|
||||||
vmenv = NewEnv(cfg)
|
vmenv = NewEnv(cfg)
|
||||||
sender = vm.AccountRef(cfg.Origin)
|
sender = vm.AccountRef(cfg.Origin)
|
||||||
|
rules = cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil)
|
||||||
)
|
)
|
||||||
if rules := cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil); rules.IsBerlin {
|
// Execute the preparatory steps for state transition which includes:
|
||||||
cfg.State.PrepareAccessList(cfg.Origin, nil, vm.ActivePrecompiles(rules), nil)
|
// - prepare accessList(post-berlin)
|
||||||
}
|
// - reset transient storage(eip 1153)
|
||||||
|
cfg.State.Prepare(rules, cfg.Origin, nil, vm.ActivePrecompiles(rules), nil)
|
||||||
|
|
||||||
// Call the code with the given configuration.
|
// Call the code with the given configuration.
|
||||||
code, address, leftOverGas, err := vmenv.Create(
|
code, address, leftOverGas, err := vmenv.Create(
|
||||||
sender,
|
sender,
|
||||||
@ -171,14 +176,17 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) {
|
|||||||
func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, error) {
|
func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, error) {
|
||||||
setDefaults(cfg)
|
setDefaults(cfg)
|
||||||
|
|
||||||
vmenv := NewEnv(cfg)
|
var (
|
||||||
|
vmenv = NewEnv(cfg)
|
||||||
|
sender = cfg.State.GetOrNewStateObject(cfg.Origin)
|
||||||
|
statedb = cfg.State
|
||||||
|
rules = cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil)
|
||||||
|
)
|
||||||
|
// Execute the preparatory steps for state transition which includes:
|
||||||
|
// - prepare accessList(post-berlin)
|
||||||
|
// - reset transient storage(eip 1153)
|
||||||
|
statedb.Prepare(rules, cfg.Origin, &address, vm.ActivePrecompiles(rules), nil)
|
||||||
|
|
||||||
sender := cfg.State.GetOrNewStateObject(cfg.Origin)
|
|
||||||
statedb := cfg.State
|
|
||||||
|
|
||||||
if rules := cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil); rules.IsBerlin {
|
|
||||||
statedb.PrepareAccessList(cfg.Origin, &address, vm.ActivePrecompiles(rules), nil)
|
|
||||||
}
|
|
||||||
// Call the code with the given configuration.
|
// Call the code with the given configuration.
|
||||||
ret, leftOverGas, err := vmenv.Call(
|
ret, leftOverGas, err := vmenv.Call(
|
||||||
sender,
|
sender,
|
||||||
|
@ -213,7 +213,7 @@ func (eth *Ethereum) stateAtTransaction(block *types.Block, txIndex int, reexec
|
|||||||
}
|
}
|
||||||
// Not yet the searched for transaction, execute on top of the current state
|
// Not yet the searched for transaction, execute on top of the current state
|
||||||
vmenv := vm.NewEVM(context, txContext, statedb, eth.blockchain.Config(), vm.Config{})
|
vmenv := vm.NewEVM(context, txContext, statedb, eth.blockchain.Config(), vm.Config{})
|
||||||
statedb.Prepare(tx.Hash(), idx)
|
statedb.SetTxContext(tx.Hash(), idx)
|
||||||
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())); err != nil {
|
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())); err != nil {
|
||||||
return nil, vm.BlockContext{}, nil, nil, fmt.Errorf("transaction %#x failed: %v", tx.Hash(), err)
|
return nil, vm.BlockContext{}, nil, nil, fmt.Errorf("transaction %#x failed: %v", tx.Hash(), err)
|
||||||
}
|
}
|
||||||
|
@ -552,7 +552,7 @@ func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config
|
|||||||
txContext = core.NewEVMTxContext(msg)
|
txContext = core.NewEVMTxContext(msg)
|
||||||
vmenv = vm.NewEVM(vmctx, txContext, statedb, chainConfig, vm.Config{})
|
vmenv = vm.NewEVM(vmctx, txContext, statedb, chainConfig, vm.Config{})
|
||||||
)
|
)
|
||||||
statedb.Prepare(tx.Hash(), i)
|
statedb.SetTxContext(tx.Hash(), i)
|
||||||
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas())); err != nil {
|
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas())); err != nil {
|
||||||
log.Warn("Tracing intermediate roots did not complete", "txindex", i, "txhash", tx.Hash(), "err", err)
|
log.Warn("Tracing intermediate roots did not complete", "txindex", i, "txhash", tx.Hash(), "err", err)
|
||||||
// We intentionally don't return the error here: if we do, then the RPC server will not
|
// We intentionally don't return the error here: if we do, then the RPC server will not
|
||||||
@ -647,7 +647,7 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
|
|||||||
|
|
||||||
// Generate the next state snapshot fast without tracing
|
// Generate the next state snapshot fast without tracing
|
||||||
msg, _ := tx.AsMessage(signer, block.BaseFee())
|
msg, _ := tx.AsMessage(signer, block.BaseFee())
|
||||||
statedb.Prepare(tx.Hash(), i)
|
statedb.SetTxContext(tx.Hash(), i)
|
||||||
vmenv := vm.NewEVM(blockCtx, core.NewEVMTxContext(msg), statedb, api.backend.ChainConfig(), vm.Config{})
|
vmenv := vm.NewEVM(blockCtx, core.NewEVMTxContext(msg), statedb, api.backend.ChainConfig(), vm.Config{})
|
||||||
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas())); err != nil {
|
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas())); err != nil {
|
||||||
failed = err
|
failed = err
|
||||||
@ -763,7 +763,7 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
|
|||||||
}
|
}
|
||||||
// Execute the transaction and flush any traces to disk
|
// Execute the transaction and flush any traces to disk
|
||||||
vmenv := vm.NewEVM(vmctx, txContext, statedb, chainConfig, vmConf)
|
vmenv := vm.NewEVM(vmctx, txContext, statedb, chainConfig, vmConf)
|
||||||
statedb.Prepare(tx.Hash(), i)
|
statedb.SetTxContext(tx.Hash(), i)
|
||||||
_, err = core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()))
|
_, err = core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()))
|
||||||
if writer != nil {
|
if writer != nil {
|
||||||
writer.Flush()
|
writer.Flush()
|
||||||
@ -931,7 +931,7 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Contex
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Call Prepare to clear out the statedb access list
|
// Call Prepare to clear out the statedb access list
|
||||||
statedb.Prepare(txctx.TxHash, txctx.TxIndex)
|
statedb.SetTxContext(txctx.TxHash, txctx.TxIndex)
|
||||||
if _, err = core.ApplyMessage(vmenv, message, new(core.GasPool).AddGas(message.Gas())); err != nil {
|
if _, err = core.ApplyMessage(vmenv, message, new(core.GasPool).AddGas(message.Gas())); err != nil {
|
||||||
return nil, fmt.Errorf("tracing failed: %w", err)
|
return nil, fmt.Errorf("tracing failed: %w", err)
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ func (leth *LightEthereum) stateAtTransaction(ctx context.Context, block *types.
|
|||||||
msg, _ := tx.AsMessage(signer, block.BaseFee())
|
msg, _ := tx.AsMessage(signer, block.BaseFee())
|
||||||
txContext := core.NewEVMTxContext(msg)
|
txContext := core.NewEVMTxContext(msg)
|
||||||
context := core.NewEVMBlockContext(block.Header(), leth.blockchain, nil)
|
context := core.NewEVMBlockContext(block.Header(), leth.blockchain, nil)
|
||||||
statedb.Prepare(tx.Hash(), idx)
|
statedb.SetTxContext(tx.Hash(), idx)
|
||||||
if idx == txIndex {
|
if idx == txIndex {
|
||||||
return msg, context, statedb, release, nil
|
return msg, context, statedb, release, nil
|
||||||
}
|
}
|
||||||
|
@ -902,7 +902,7 @@ func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByP
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Start executing the transaction
|
// Start executing the transaction
|
||||||
env.state.Prepare(tx.Hash(), env.tcount)
|
env.state.SetTxContext(tx.Hash(), env.tcount)
|
||||||
|
|
||||||
logs, err := w.commitTransaction(env, tx)
|
logs, err := w.commitTransaction(env, tx)
|
||||||
switch {
|
switch {
|
||||||
|
@ -241,9 +241,7 @@ func runBenchmark(b *testing.B, t *StateTest) {
|
|||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
for n := 0; n < b.N; n++ {
|
for n := 0; n < b.N; n++ {
|
||||||
snapshot := statedb.Snapshot()
|
snapshot := statedb.Snapshot()
|
||||||
if rules.IsBerlin {
|
statedb.Prepare(rules, msg.From(), msg.To(), vm.ActivePrecompiles(rules), msg.AccessList())
|
||||||
statedb.PrepareAccessList(msg.From(), msg.To(), vm.ActivePrecompiles(rules), msg.AccessList())
|
|
||||||
}
|
|
||||||
b.StartTimer()
|
b.StartTimer()
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user