Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
207b6c50
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,发现更多精彩内容 >>
提交
207b6c50
编写于
12月 19, 2014
作者:
O
obscuren
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'badsig' of
https://github.com/ebuchman/go-ethereum
into ebuchman-badsig
Conflicts: core/transaction_pool.go
上级
6e24b158
7c24cd79
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
10 deletion
+14
-10
cmd/mist/gui.go
cmd/mist/gui.go
+3
-3
core/transaction_pool.go
core/transaction_pool.go
+6
-2
core/types/transaction.go
core/types/transaction.go
+4
-4
xeth/js_types.go
xeth/js_types.go
+1
-1
未找到文件。
cmd/mist/gui.go
浏览文件 @
207b6c50
...
...
@@ -301,7 +301,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
addr
:=
gui
.
address
()
var
inout
string
if
bytes
.
Compare
(
tx
.
Sender
(),
addr
)
==
0
{
if
bytes
.
Compare
(
tx
.
From
(),
addr
)
==
0
{
inout
=
"send"
}
else
{
inout
=
"recv"
...
...
@@ -321,7 +321,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
if
send
.
Len
()
!=
0
{
s
=
strings
.
Trim
(
send
.
Str
(),
"
\x00
"
)
}
else
{
s
=
ethutil
.
Bytes2Hex
(
tx
.
Sender
())
s
=
ethutil
.
Bytes2Hex
(
tx
.
From
())
}
if
rec
.
Len
()
!=
0
{
r
=
strings
.
Trim
(
rec
.
Str
(),
"
\x00
"
)
...
...
@@ -453,7 +453,7 @@ func (gui *Gui) update() {
tx
:=
ev
.
Tx
object
:=
state
.
GetAccount
(
gui
.
address
())
if
bytes
.
Compare
(
tx
.
Sender
(),
gui
.
address
())
==
0
{
if
bytes
.
Compare
(
tx
.
From
(),
gui
.
address
())
==
0
{
object
.
SubAmount
(
tx
.
Value
())
gui
.
txDb
.
Put
(
tx
.
Hash
(),
tx
.
RlpEncode
())
...
...
core/transaction_pool.go
浏览文件 @
207b6c50
...
...
@@ -116,7 +116,11 @@ func (pool *TxPool) ValidateTransaction(tx *types.Transaction) error {
}
// Get the sender
sender
:=
pool
.
chainManager
.
State
()
.
GetAccount
(
tx
.
Sender
())
senderAddr
:=
tx
.
From
()
if
senderAddr
==
nil
{
return
fmt
.
Errorf
(
"invalid sender"
)
}
sender
:=
pool
.
chainManager
.
State
()
.
GetAccount
(
senderAddr
)
totAmount
:=
new
(
big
.
Int
)
.
Set
(
tx
.
Value
())
// Make sure there's enough in the sender's account. Having insufficient
...
...
@@ -193,7 +197,7 @@ func (pool *TxPool) RemoveInvalid(state *state.StateDB) {
for
e
:=
pool
.
pool
.
Front
();
e
!=
nil
;
e
=
e
.
Next
()
{
tx
:=
e
.
Value
.
(
*
types
.
Transaction
)
sender
:=
state
.
GetAccount
(
tx
.
Sender
())
sender
:=
state
.
GetAccount
(
tx
.
From
())
err
:=
pool
.
ValidateTransaction
(
tx
)
if
err
!=
nil
||
sender
.
Nonce
>=
tx
.
Nonce
()
{
pool
.
pool
.
Remove
(
e
)
...
...
core/types/transaction.go
浏览文件 @
207b6c50
...
...
@@ -77,7 +77,7 @@ func (self *Transaction) SetNonce(nonce uint64) {
}
func
(
self
*
Transaction
)
From
()
[]
byte
{
return
self
.
S
ender
()
return
self
.
s
ender
()
}
func
(
self
*
Transaction
)
To
()
[]
byte
{
...
...
@@ -114,12 +114,12 @@ func (tx *Transaction) PublicKey() []byte {
return
pubkey
}
func
(
tx
*
Transaction
)
S
ender
()
[]
byte
{
func
(
tx
*
Transaction
)
s
ender
()
[]
byte
{
pubkey
:=
tx
.
PublicKey
()
// Validate the returned key.
// Return nil if public key isn't in full format
if
len
(
pubkey
)
!=
0
&&
pubkey
[
0
]
!=
4
{
if
len
(
pubkey
)
==
0
||
pubkey
[
0
]
!=
4
{
return
nil
}
...
...
@@ -187,7 +187,7 @@ func (tx *Transaction) String() string {
`
,
tx
.
Hash
(),
len
(
tx
.
recipient
)
==
0
,
tx
.
Sender
(),
tx
.
From
(),
tx
.
recipient
,
tx
.
nonce
,
tx
.
gasPrice
,
...
...
xeth/js_types.go
浏览文件 @
207b6c50
...
...
@@ -100,7 +100,7 @@ func NewJSTx(tx *types.Transaction, state *state.StateDB) *JSTransaction {
if
receiver
==
"0000000000000000000000000000000000000000"
{
receiver
=
ethutil
.
Bytes2Hex
(
core
.
AddressFromMessage
(
tx
))
}
sender
:=
ethutil
.
Bytes2Hex
(
tx
.
Sender
())
sender
:=
ethutil
.
Bytes2Hex
(
tx
.
From
())
createsContract
:=
core
.
MessageCreatesContract
(
tx
)
var
data
string
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录