Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
f9fb70d2
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
f9fb70d2
编写于
8月 16, 2017
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core/vm: rework reversion to work on a higher level
上级
b70a73cd
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
53 addition
and
45 deletion
+53
-45
core/vm/evm.go
core/vm/evm.go
+16
-16
core/vm/gas_table.go
core/vm/gas_table.go
+4
-0
core/vm/instructions.go
core/vm/instructions.go
+13
-6
core/vm/interpreter.go
core/vm/interpreter.go
+6
-8
core/vm/jump_table.go
core/vm/jump_table.go
+10
-15
core/vm/memory_table.go
core/vm/memory_table.go
+4
-0
未找到文件。
core/vm/evm.go
浏览文件 @
f9fb70d2
...
...
@@ -168,8 +168,10 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas
// above we revert to the snapshot and consume any gas remaining. Additionally
// when we're in homestead this also counts for code storage gas errors.
if
err
!=
nil
{
contract
.
UseGas
(
contract
.
Gas
)
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
if
err
!=
errExecutionReverted
{
contract
.
UseGas
(
contract
.
Gas
)
}
}
return
ret
,
contract
.
Gas
,
err
}
...
...
@@ -207,10 +209,11 @@ func (evm *EVM) CallCode(caller ContractRef, addr common.Address, input []byte,
ret
,
err
=
run
(
evm
,
snapshot
,
contract
,
input
)
if
err
!=
nil
{
contract
.
UseGas
(
contract
.
Gas
)
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
if
err
!=
errExecutionReverted
{
contract
.
UseGas
(
contract
.
Gas
)
}
}
return
ret
,
contract
.
Gas
,
err
}
...
...
@@ -239,10 +242,11 @@ func (evm *EVM) DelegateCall(caller ContractRef, addr common.Address, input []by
ret
,
err
=
run
(
evm
,
snapshot
,
contract
,
input
)
if
err
!=
nil
{
contract
.
UseGas
(
contract
.
Gas
)
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
if
err
!=
errExecutionReverted
{
contract
.
UseGas
(
contract
.
Gas
)
}
}
return
ret
,
contract
.
Gas
,
err
}
...
...
@@ -281,8 +285,10 @@ func (evm *EVM) StaticCall(caller ContractRef, addr common.Address, input []byte
// when we're in Homestead this also counts for code storage gas errors.
ret
,
err
=
run
(
evm
,
snapshot
,
contract
,
input
)
if
err
!=
nil
{
contract
.
UseGas
(
contract
.
Gas
)
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
if
err
!=
errExecutionReverted
{
contract
.
UseGas
(
contract
.
Gas
)
}
}
return
ret
,
contract
.
Gas
,
err
}
...
...
@@ -339,18 +345,12 @@ func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *big.I
// When an error was returned by the EVM or when setting the creation code
// above we revert to the snapshot and consume any gas remaining. Additionally
// when we're in homestead this also counts for code storage gas errors.
if
maxCodeSizeExceeded
||
(
err
!=
nil
&&
(
evm
.
ChainConfig
()
.
IsHomestead
(
evm
.
BlockNumber
)
||
err
!=
ErrCodeStoreOutOfGas
))
{
contract
.
UseGas
(
contract
.
Gas
)
if
maxCodeSizeExceeded
||
(
err
!=
nil
&&
(
evm
.
ChainConfig
()
.
IsHomestead
(
evm
.
BlockNumber
)
||
err
!=
ErrCodeStoreOutOfGas
))
{
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
if
err
!=
errExecutionReverted
{
contract
.
UseGas
(
contract
.
Gas
)
}
}
// If the vm returned with an error the return value should be set to nil.
// This isn't consensus critical but merely to for behaviour reasons such as
// tests, RPC calls, etc.
if
err
!=
nil
{
ret
=
nil
}
return
ret
,
contractAddr
,
contract
.
Gas
,
err
}
...
...
core/vm/gas_table.go
浏览文件 @
f9fb70d2
...
...
@@ -396,6 +396,10 @@ func gasReturn(gt params.GasTable, evm *EVM, contract *Contract, stack *Stack, m
return
memoryGasCost
(
mem
,
memorySize
)
}
func
gasRevert
(
gt
params
.
GasTable
,
evm
*
EVM
,
contract
*
Contract
,
stack
*
Stack
,
mem
*
Memory
,
memorySize
uint64
)
(
uint64
,
error
)
{
return
memoryGasCost
(
mem
,
memorySize
)
}
func
gasSuicide
(
gt
params
.
GasTable
,
evm
*
EVM
,
contract
*
Contract
,
stack
*
Stack
,
mem
*
Memory
,
memorySize
uint64
)
(
uint64
,
error
)
{
var
gas
uint64
// EIP150 homestead gas reprice fork:
...
...
core/vm/instructions.go
浏览文件 @
f9fb70d2
...
...
@@ -32,6 +32,7 @@ var (
bigZero
=
new
(
big
.
Int
)
errWriteProtection
=
errors
.
New
(
"evm: write protection"
)
errReturnDataOutOfBounds
=
errors
.
New
(
"evm: return data out of bounds"
)
errExecutionReverted
=
errors
.
New
(
"evm: execution reverted"
)
)
func
opAdd
(
pc
*
uint64
,
evm
*
EVM
,
contract
*
Contract
,
memory
*
Memory
,
stack
*
Stack
)
([]
byte
,
error
)
{
...
...
@@ -579,7 +580,7 @@ func opCreate(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *S
}
contract
.
UseGas
(
gas
)
_
,
addr
,
returnGas
,
suberr
:=
evm
.
Create
(
contract
,
input
,
gas
,
value
)
res
,
addr
,
returnGas
,
suberr
:=
evm
.
Create
(
contract
,
input
,
gas
,
value
)
// Push item on the stack based on the returned error. If the ruleset is
// homestead we must check for CodeStoreOutOfGasError (homestead only
// rule) and treat as an error, if the ruleset is frontier we must
...
...
@@ -592,9 +593,11 @@ func opCreate(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *S
stack
.
push
(
addr
.
Big
())
}
contract
.
Gas
+=
returnGas
evm
.
interpreter
.
intPool
.
put
(
value
,
offset
,
size
)
if
suberr
==
errExecutionReverted
{
return
res
,
nil
}
return
nil
,
nil
}
...
...
@@ -622,7 +625,8 @@ func opCall(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Sta
stack
.
push
(
new
(
big
.
Int
))
}
else
{
stack
.
push
(
big
.
NewInt
(
1
))
}
if
err
==
nil
||
err
==
errExecutionReverted
{
memory
.
Set
(
retOffset
.
Uint64
(),
retSize
.
Uint64
(),
ret
)
}
contract
.
Gas
+=
returnGas
...
...
@@ -653,10 +657,10 @@ func opCallCode(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack
ret
,
returnGas
,
err
:=
evm
.
CallCode
(
contract
,
address
,
args
,
gas
,
value
)
if
err
!=
nil
{
stack
.
push
(
new
(
big
.
Int
))
}
else
{
stack
.
push
(
big
.
NewInt
(
1
))
}
if
err
==
nil
||
err
==
errExecutionReverted
{
memory
.
Set
(
retOffset
.
Uint64
(),
retSize
.
Uint64
(),
ret
)
}
contract
.
Gas
+=
returnGas
...
...
@@ -676,6 +680,8 @@ func opDelegateCall(pc *uint64, evm *EVM, contract *Contract, memory *Memory, st
stack
.
push
(
new
(
big
.
Int
))
}
else
{
stack
.
push
(
big
.
NewInt
(
1
))
}
if
err
==
nil
||
err
==
errExecutionReverted
{
memory
.
Set
(
outOffset
.
Uint64
(),
outSize
.
Uint64
(),
ret
)
}
contract
.
Gas
+=
returnGas
...
...
@@ -704,7 +710,8 @@ func opStaticCall(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stac
stack
.
push
(
new
(
big
.
Int
))
}
else
{
stack
.
push
(
big
.
NewInt
(
1
))
}
if
err
==
nil
||
err
==
errExecutionReverted
{
memory
.
Set
(
retOffset
.
Uint64
(),
retSize
.
Uint64
(),
ret
)
}
contract
.
Gas
+=
returnGas
...
...
core/vm/interpreter.go
浏览文件 @
f9fb70d2
...
...
@@ -209,24 +209,22 @@ func (in *Interpreter) Run(snapshot int, contract *Contract, input []byte) (ret
if
verifyPool
{
verifyIntegerPool
(
in
.
intPool
)
}
// checks whether the operation should revert state.
if
operation
.
reverts
{
in
.
evm
.
StateDB
.
RevertToSnapshot
(
snapshot
)
// if the operation clears the return data (e.g. it has returning data)
// set the last return to the result of the operation.
if
operation
.
returns
{
in
.
returnData
=
res
}
switch
{
case
err
!=
nil
:
return
nil
,
err
case
operation
.
reverts
:
return
res
,
errExecutionReverted
case
operation
.
halts
:
return
res
,
nil
case
!
operation
.
jumps
:
pc
++
}
// if the operation clears the return data (e.g. it has returning data)
// set the last return to the result of the operation.
if
operation
.
returns
{
in
.
returnData
=
res
}
}
return
nil
,
nil
}
core/vm/jump_table.go
浏览文件 @
f9fb70d2
...
...
@@ -41,20 +41,13 @@ type operation struct {
validateStack
stackValidationFunc
// memorySize returns the memory size required for the operation
memorySize
memorySizeFunc
// halts indicates whether the operation shoult halt further execution
// and return
halts
bool
// jumps indicates whether operation made a jump. This prevents the program
// counter from further incrementing.
jumps
bool
// writes determines whether this a state modifying operation
writes
bool
// valid is used to check whether the retrieved operation is valid and known
valid
bool
// reverts determined whether the operation reverts state
reverts
bool
// returns determines whether the opertions sets the return data
returns
bool
halts
bool
// indicates whether the operation shoult halt further execution
jumps
bool
// indicates whether the program counter should not increment
writes
bool
// determines whether this a state modifying operation
valid
bool
// indication whether the retrieved operation is valid and known
reverts
bool
// determines whether the operation reverts state (implicitly halts)
returns
bool
// determines whether the opertions sets the return data content
}
var
(
...
...
@@ -91,10 +84,12 @@ func NewMetropolisInstructionSet() [256]operation {
}
instructionSet
[
REVERT
]
=
operation
{
execute
:
opRevert
,
gasCost
:
constGasFunc
(
GasFastestStep
)
,
gasCost
:
gasRevert
,
validateStack
:
makeStackFunc
(
2
,
0
),
memorySize
:
memoryRevert
,
valid
:
true
,
reverts
:
true
,
returns
:
true
,
}
return
instructionSet
}
...
...
core/vm/memory_table.go
浏览文件 @
f9fb70d2
...
...
@@ -89,6 +89,10 @@ func memoryReturn(stack *Stack) *big.Int {
return
calcMemSize
(
stack
.
Back
(
0
),
stack
.
Back
(
1
))
}
func
memoryRevert
(
stack
*
Stack
)
*
big
.
Int
{
return
calcMemSize
(
stack
.
Back
(
0
),
stack
.
Back
(
1
))
}
func
memoryLog
(
stack
*
Stack
)
*
big
.
Int
{
mSize
,
mStart
:=
stack
.
Back
(
1
),
stack
.
Back
(
0
)
return
calcMemSize
(
mStart
,
mSize
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录