Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
bba4dcb7
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,体验更适合开发者的 AI 搜索 >>
提交
bba4dcb7
编写于
10月 08, 2015
作者:
J
Jeffrey Wilcke
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1880 from Gustav-Simonsson/core_transfer
core, core/vm, cmd/evm: remove redundant balance check
上级
37abbcb5
e1616f77
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
19 deletion
+10
-19
cmd/evm/main.go
cmd/evm/main.go
+2
-2
core/execution.go
core/execution.go
+1
-8
core/vm/environment.go
core/vm/environment.go
+1
-1
core/vm/jit_test.go
core/vm/jit_test.go
+1
-3
core/vm_env.go
core/vm_env.go
+2
-2
tests/util.go
tests/util.go
+3
-3
未找到文件。
cmd/evm/main.go
浏览文件 @
bba4dcb7
...
...
@@ -217,8 +217,8 @@ func (self *VMEnv) AddLog(log *vm.Log) {
func
(
self
*
VMEnv
)
CanTransfer
(
from
common
.
Address
,
balance
*
big
.
Int
)
bool
{
return
self
.
state
.
GetBalance
(
from
)
.
Cmp
(
balance
)
>=
0
}
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
return
core
.
Transfer
(
from
,
to
,
amount
)
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
{
core
.
Transfer
(
from
,
to
,
amount
)
}
func
(
self
*
VMEnv
)
Call
(
caller
vm
.
ContractRef
,
addr
common
.
Address
,
data
[]
byte
,
gas
,
price
,
value
*
big
.
Int
)
([]
byte
,
error
)
{
...
...
core/execution.go
浏览文件 @
bba4dcb7
...
...
@@ -17,7 +17,6 @@
package
core
import
(
"errors"
"math/big"
"github.com/ethereum/go-ethereum/common"
...
...
@@ -108,13 +107,7 @@ func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.A
}
// generic transfer method
func
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
if
from
.
Balance
()
.
Cmp
(
amount
)
<
0
{
return
errors
.
New
(
"Insufficient balance in account"
)
}
func
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
{
from
.
SubBalance
(
amount
)
to
.
AddBalance
(
amount
)
return
nil
}
core/vm/environment.go
浏览文件 @
bba4dcb7
...
...
@@ -51,7 +51,7 @@ type Environment interface {
// Determines whether it's possible to transact
CanTransfer
(
from
common
.
Address
,
balance
*
big
.
Int
)
bool
// Transfers amount from one account to the other
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
error
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
// Adds a LOG to the state
AddLog
(
*
Log
)
// Adds a structured log to the env
...
...
core/vm/jit_test.go
浏览文件 @
bba4dcb7
...
...
@@ -152,9 +152,7 @@ func (self *Env) SetDepth(i int) { self.depth = i }
func
(
self
*
Env
)
CanTransfer
(
from
common
.
Address
,
balance
*
big
.
Int
)
bool
{
return
true
}
func
(
self
*
Env
)
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
error
{
return
nil
}
func
(
self
*
Env
)
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
{}
func
(
self
*
Env
)
Call
(
caller
ContractRef
,
addr
common
.
Address
,
data
[]
byte
,
gas
,
price
,
value
*
big
.
Int
)
([]
byte
,
error
)
{
return
nil
,
nil
}
...
...
core/vm_env.go
浏览文件 @
bba4dcb7
...
...
@@ -81,8 +81,8 @@ func (self *VMEnv) SetSnapshot(copy vm.Database) {
self
.
state
.
Set
(
copy
.
(
*
state
.
StateDB
))
}
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
return
Transfer
(
from
,
to
,
amount
)
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
{
Transfer
(
from
,
to
,
amount
)
}
func
(
self
*
VMEnv
)
Call
(
me
vm
.
ContractRef
,
addr
common
.
Address
,
data
[]
byte
,
gas
,
price
,
value
*
big
.
Int
)
([]
byte
,
error
)
{
...
...
tests/util.go
浏览文件 @
bba4dcb7
...
...
@@ -209,11 +209,11 @@ func (self *Env) SetSnapshot(copy vm.Database) {
self
.
state
.
Set
(
copy
.
(
*
state
.
StateDB
))
}
func
(
self
*
Env
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
func
(
self
*
Env
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
{
if
self
.
skipTransfer
{
return
nil
return
}
return
core
.
Transfer
(
from
,
to
,
amount
)
core
.
Transfer
(
from
,
to
,
amount
)
}
func
(
self
*
Env
)
Call
(
caller
vm
.
ContractRef
,
addr
common
.
Address
,
data
[]
byte
,
gas
,
price
,
value
*
big
.
Int
)
([]
byte
,
error
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录