diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-19 07:33:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-19 07:33:05 +0800 |
| commit | 207b6c50fb6dcc698bac832e98b2d633f79532e4 (patch) | |
| tree | 8b5e31c3b8c89565b1a6f9f4fce3da991d0f71e3 /xeth | |
| parent | 6e24b1587de95b45fe0d7623528bb2f5a48e9823 (diff) | |
| parent | 7c24cd790d39b67ee16ad7f1b1a805fcb131dc8a (diff) | |
| download | go-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.tar.gz go-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.tar.zst go-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.zip | |
Merge branch 'badsig' of https://github.com/ebuchman/go-ethereum into ebuchman-badsig
Conflicts:
core/transaction_pool.go
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/js_types.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xeth/js_types.go b/xeth/js_types.go index 987edce37..04018f6a5 100644 --- a/xeth/js_types.go +++ b/xeth/js_types.go @@ -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 |