diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-19 21:41:57 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-19 21:41:57 +0800 |
| commit | f8d98f7fcd08bd2eff36d5366ac2a14b52255d57 (patch) | |
| tree | 99111d4f80ee4c436c99813ef8ffe7a7b16ee8ce /eth | |
| parent | c305005d831eccf9d65c7b55f817390d2334e666 (diff) | |
| parent | 5b283663b40dbc06c56cc481ef90f4365ab85724 (diff) | |
| download | dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.gz dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.bz2 dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.lz dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.xz dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.zst dexon-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.zip | |
Merge pull request #2116 from obscuren/homestead
core, core/vm: consensus changes necessary for the homestead release
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/api.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eth/api.go b/eth/api.go index 37b033dc6..b4815caae 100644 --- a/eth/api.go +++ b/eth/api.go @@ -610,13 +610,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 CallArgs struct { From common.Address `json:"from"` |