calculate tree index correctly for SLOAD access event (#79)

jwasinger · web-flow · commit 1a98ca7ec5a9 · 2022-02-11T09:30:40.000+01:00
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -605,13 +605,13 @@ func opSload(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]by
 	loc := scope.Stack.peek()
 	hash := common.Hash(loc.Bytes32())
 	val := interpreter.evm.StateDB.GetState(scope.Contract.Address(), hash)
-	loc.SetBytes(val.Bytes())
 
 	if interpreter.evm.chainConfig.IsCancun(interpreter.evm.Context.BlockNumber) {
 		index := trieUtils.GetTreeKeyStorageSlot(scope.Contract.Address().Bytes(), loc)
 		// TODO SSTORE write events
 		interpreter.evm.Accesses.SetLeafValue(index, val.Bytes())
 	}
+	loc.SetBytes(val.Bytes())
 	return nil, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -605,13 +605,13 @@ func opSload(pc uint64, interpreter EVMInterpreter, scope *ScopeContext) ([]by`
`605`	`605`	`loc := scope.Stack.peek()`
`606`	`606`	`hash := common.Hash(loc.Bytes32())`
`607`	`607`	`val := interpreter.evm.StateDB.GetState(scope.Contract.Address(), hash)`
`608`		`- loc.SetBytes(val.Bytes())`
`609`	`608`
`610`	`609`	`if interpreter.evm.chainConfig.IsCancun(interpreter.evm.Context.BlockNumber) {`
`611`	`610`	`index := trieUtils.GetTreeKeyStorageSlot(scope.Contract.Address().Bytes(), loc)`
`612`	`611`	`// TODO SSTORE write events`
`613`	`612`	`interpreter.evm.Accesses.SetLeafValue(index, val.Bytes())`
`614`	`613`	`}`
	`614`	`+ loc.SetBytes(val.Bytes())`
`615`	`615`	`return nil, nil`
`616`	`616`	`}`
`617`	`617`