diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
| commit | 4044a8cea44cd4cee3a8ddaf51a76b71c9d22042 (patch) | |
| tree | 1aa3776381e8e117b66e4a8ed1bf83e29d966ff1 /xeth | |
| parent | c541b38fb36587d23c60f5e2f2b9b3c8700ec489 (diff) | |
| parent | 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 (diff) | |
| download | go-tangerine-1.3.4.tar go-tangerine-1.3.4.tar.gz go-tangerine-1.3.4.tar.bz2 go-tangerine-1.3.4.tar.lz go-tangerine-1.3.4.tar.xz go-tangerine-1.3.4.tar.zst go-tangerine-1.3.4.zip | |
Merge pull request #2258 from obscuren/release/1.3.4v1.3.4
Homestead Release Candidate
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/xeth.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 19c42a9a3..e5513d7ee 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -1050,13 +1050,14 @@ type callmsg struct { } // accessor boilerplate to implement core.Message -func (m callmsg) From() (common.Address, error) { return m.from.Address(), nil } -func (m callmsg) Nonce() uint64 { return m.from.Nonce() } -func (m callmsg) To() *common.Address { return m.to } -func (m callmsg) GasPrice() *big.Int { return m.gasPrice } -func (m callmsg) Gas() *big.Int { return m.gas } -func (m callmsg) Value() *big.Int { return m.value } -func (m callmsg) Data() []byte { return m.data } +func (m callmsg) From() (common.Address, error) { return m.from.Address(), nil } +func (m callmsg) FromFrontier() (common.Address, error) { return m.from.Address(), nil } +func (m callmsg) Nonce() uint64 { return m.from.Nonce() } +func (m callmsg) To() *common.Address { return m.to } +func (m callmsg) GasPrice() *big.Int { return m.gasPrice } +func (m callmsg) Gas() *big.Int { return m.gas } +func (m callmsg) Value() *big.Int { return m.value } +func (m callmsg) Data() []byte { return m.data } type logQueue struct { mu sync.Mutex |