This change removes extraneous/unnecessary checks for equality when comparing 2 accessList values A and B. Given that we validate that their lengths of A and B are equal, if so and if every element in A is in B, reflexively every element in B is already in A. If that weren't the case and an element g existed in A but not in B, that would mean that there is an extra element and hence a mathematical contradiction. Fixes #24658
		
			
				
	
	
		
			185 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			185 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2021 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 logger
 | |
| 
 | |
| import (
 | |
| 	"math/big"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/ethereum/go-ethereum/common"
 | |
| 	"github.com/ethereum/go-ethereum/core/types"
 | |
| 	"github.com/ethereum/go-ethereum/core/vm"
 | |
| )
 | |
| 
 | |
| // accessList is an accumulator for the set of accounts and storage slots an EVM
 | |
| // contract execution touches.
 | |
| type accessList map[common.Address]accessListSlots
 | |
| 
 | |
| // accessListSlots is an accumulator for the set of storage slots within a single
 | |
| // contract that an EVM contract execution touches.
 | |
| type accessListSlots map[common.Hash]struct{}
 | |
| 
 | |
| // newAccessList creates a new accessList.
 | |
| func newAccessList() accessList {
 | |
| 	return make(map[common.Address]accessListSlots)
 | |
| }
 | |
| 
 | |
| // addAddress adds an address to the accesslist.
 | |
| func (al accessList) addAddress(address common.Address) {
 | |
| 	// Set address if not previously present
 | |
| 	if _, present := al[address]; !present {
 | |
| 		al[address] = make(map[common.Hash]struct{})
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // addSlot adds a storage slot to the accesslist.
 | |
| func (al accessList) addSlot(address common.Address, slot common.Hash) {
 | |
| 	// Set address if not previously present
 | |
| 	al.addAddress(address)
 | |
| 
 | |
| 	// Set the slot on the surely existent storage set
 | |
| 	al[address][slot] = struct{}{}
 | |
| }
 | |
| 
 | |
| // equal checks if the content of the current access list is the same as the
 | |
| // content of the other one.
 | |
| func (al accessList) equal(other accessList) bool {
 | |
| 	// Cross reference the accounts first
 | |
| 	if len(al) != len(other) {
 | |
| 		return false
 | |
| 	}
 | |
| 	// Given that len(al) == len(other), we only need to check that
 | |
| 	// all the items from al are in other.
 | |
| 	for addr := range al {
 | |
| 		if _, ok := other[addr]; !ok {
 | |
| 			return false
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	// Accounts match, cross reference the storage slots too
 | |
| 	for addr, slots := range al {
 | |
| 		otherslots := other[addr]
 | |
| 
 | |
| 		if len(slots) != len(otherslots) {
 | |
| 			return false
 | |
| 		}
 | |
| 		// Given that len(slots) == len(otherslots), we only need to check that
 | |
| 		// all the items from slots are in otherslots.
 | |
| 		for hash := range slots {
 | |
| 			if _, ok := otherslots[hash]; !ok {
 | |
| 				return false
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| 	return true
 | |
| }
 | |
| 
 | |
| // accesslist converts the accesslist to a types.AccessList.
 | |
| func (al accessList) accessList() types.AccessList {
 | |
| 	acl := make(types.AccessList, 0, len(al))
 | |
| 	for addr, slots := range al {
 | |
| 		tuple := types.AccessTuple{Address: addr, StorageKeys: []common.Hash{}}
 | |
| 		for slot := range slots {
 | |
| 			tuple.StorageKeys = append(tuple.StorageKeys, slot)
 | |
| 		}
 | |
| 		acl = append(acl, tuple)
 | |
| 	}
 | |
| 	return acl
 | |
| }
 | |
| 
 | |
| // AccessListTracer is a tracer that accumulates touched accounts and storage
 | |
| // slots into an internal set.
 | |
| type AccessListTracer struct {
 | |
| 	excl map[common.Address]struct{} // Set of account to exclude from the list
 | |
| 	list accessList                  // Set of accounts and storage slots touched
 | |
| }
 | |
| 
 | |
| // NewAccessListTracer creates a new tracer that can generate AccessLists.
 | |
| // An optional AccessList can be specified to occupy slots and addresses in
 | |
| // the resulting accesslist.
 | |
| func NewAccessListTracer(acl types.AccessList, from, to common.Address, precompiles []common.Address) *AccessListTracer {
 | |
| 	excl := map[common.Address]struct{}{
 | |
| 		from: {}, to: {},
 | |
| 	}
 | |
| 	for _, addr := range precompiles {
 | |
| 		excl[addr] = struct{}{}
 | |
| 	}
 | |
| 	list := newAccessList()
 | |
| 	for _, al := range acl {
 | |
| 		if _, ok := excl[al.Address]; !ok {
 | |
| 			list.addAddress(al.Address)
 | |
| 		}
 | |
| 		for _, slot := range al.StorageKeys {
 | |
| 			list.addSlot(al.Address, slot)
 | |
| 		}
 | |
| 	}
 | |
| 	return &AccessListTracer{
 | |
| 		excl: excl,
 | |
| 		list: list,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (a *AccessListTracer) CaptureStart(env *vm.EVM, from common.Address, to common.Address, create bool, input []byte, gas uint64, value *big.Int) {
 | |
| }
 | |
| 
 | |
| // CaptureState captures all opcodes that touch storage or addresses and adds them to the accesslist.
 | |
| func (a *AccessListTracer) CaptureState(pc uint64, op vm.OpCode, gas, cost uint64, scope *vm.ScopeContext, rData []byte, depth int, err error) {
 | |
| 	stack := scope.Stack
 | |
| 	stackData := stack.Data()
 | |
| 	stackLen := len(stackData)
 | |
| 	if (op == vm.SLOAD || op == vm.SSTORE) && stackLen >= 1 {
 | |
| 		slot := common.Hash(stackData[stackLen-1].Bytes32())
 | |
| 		a.list.addSlot(scope.Contract.Address(), slot)
 | |
| 	}
 | |
| 	if (op == vm.EXTCODECOPY || op == vm.EXTCODEHASH || op == vm.EXTCODESIZE || op == vm.BALANCE || op == vm.SELFDESTRUCT) && stackLen >= 1 {
 | |
| 		addr := common.Address(stackData[stackLen-1].Bytes20())
 | |
| 		if _, ok := a.excl[addr]; !ok {
 | |
| 			a.list.addAddress(addr)
 | |
| 		}
 | |
| 	}
 | |
| 	if (op == vm.DELEGATECALL || op == vm.CALL || op == vm.STATICCALL || op == vm.CALLCODE) && stackLen >= 5 {
 | |
| 		addr := common.Address(stackData[stackLen-2].Bytes20())
 | |
| 		if _, ok := a.excl[addr]; !ok {
 | |
| 			a.list.addAddress(addr)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (*AccessListTracer) CaptureFault(pc uint64, op vm.OpCode, gas, cost uint64, scope *vm.ScopeContext, depth int, err error) {
 | |
| }
 | |
| 
 | |
| func (*AccessListTracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) {}
 | |
| 
 | |
| func (*AccessListTracer) CaptureEnter(typ vm.OpCode, from common.Address, to common.Address, input []byte, gas uint64, value *big.Int) {
 | |
| }
 | |
| 
 | |
| func (*AccessListTracer) CaptureExit(output []byte, gasUsed uint64, err error) {}
 | |
| 
 | |
| func (*AccessListTracer) CaptureTxStart(gasLimit uint64) {}
 | |
| 
 | |
| func (*AccessListTracer) CaptureTxEnd(restGas uint64) {}
 | |
| 
 | |
| // AccessList returns the current accesslist maintained by the tracer.
 | |
| func (a *AccessListTracer) AccessList() types.AccessList {
 | |
| 	return a.list.accessList()
 | |
| }
 | |
| 
 | |
| // Equal returns if the content of two access list traces are equal.
 | |
| func (a *AccessListTracer) Equal(other *AccessListTracer) bool {
 | |
| 	return a.list.equal(other.list)
 | |
| }
 |