forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert unnecessary changes

Browse source
This commit is contained in:
Mason Fischer 2020-01-24 10:23:24 -05:00
parent 681f566af3
commit ffa4817399
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/state/statedb.go
View file

@ -286,8 +286,6 @@ func (s *StateDB) GetState(addr common.Address, hash common.Hash) common.Hash {
stateObject := s.getStateObject(addr) stateObject := s.getStateObject(addr)
if stateObject != nil { if stateObject != nil {
return stateObject.GetState(s.db, hash) return stateObject.GetState(s.db, hash)
} else {
log.Info("No state object")
} }
return common.Hash{} return common.Hash{}
} }

5
core/vm/instructions.go
View file

@ -392,8 +392,8 @@ func hashSha3(data []byte) []byte {
hasher.Write(data) hasher.Write(data)
hasher.Read(hasherBuf[:]) hasher.Read(hasherBuf[:])
return hasherBuf return hasherBuf
} }
func opSha3(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { func opSha3(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
offset, size := stack.pop(), stack.pop() offset, size := stack.pop(), stack.pop()
data := memory.GetPtr(offset.Int64(), size.Int64()) data := memory.GetPtr(offset.Int64(), size.Int64())
@ -640,14 +640,12 @@ func opSload(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory
loc := stack.peek() loc := stack.peek()
val := interpreter.evm.StateDB.GetState(contract.Address(), common.BigToHash(loc)) val := interpreter.evm.StateDB.GetState(contract.Address(), common.BigToHash(loc))
loc.SetBytes(val.Bytes()) loc.SetBytes(val.Bytes())
return nil, nil return nil, nil
} }
func opSstore(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { func opSstore(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
loc := common.BigToHash(stack.pop()) loc := common.BigToHash(stack.pop())
val := stack.pop() val := stack.pop()
interpreter.evm.StateDB.SetState(contract.Address(), loc, common.BigToHash(val)) interpreter.evm.StateDB.SetState(contract.Address(), loc, common.BigToHash(val))
interpreter.intPool.put(val) interpreter.intPool.put(val)
@ -768,7 +766,6 @@ func opCall(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory
addr, value, inOffset, inSize, retOffset, retSize := stack.pop(), stack.pop(), stack.pop(), stack.pop(), stack.pop(), stack.pop() addr, value, inOffset, inSize, retOffset, retSize := stack.pop(), stack.pop(), stack.pop(), stack.pop(), stack.pop(), stack.pop()
toAddr := common.BigToAddress(addr) toAddr := common.BigToAddress(addr)
value = math.U256(value) value = math.U256(value)
// Get the arguments from the memory. // Get the arguments from the memory.
args := memory.GetPtr(inOffset.Int64(), inSize.Int64()) args := memory.GetPtr(inOffset.Int64(), inSize.Int64())
methodId := args[0:4] methodId := args[0:4]

1
core/vm/jump_table.go
View file

@ -1126,7 +1126,6 @@ func newFrontierInstructionSet() JumpTable {
memorySize: memoryCall, memorySize: memoryCall,
valid: true, valid: true,
returns: true, returns: true,
writes: true,
}, },
CALLCODE: { CALLCODE: {
execute: opCallCode, execute: opCallCode,