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 /common | |
| 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 'common')
| -rw-r--r-- | common/registrar/ethreg/api.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/registrar/ethreg/api.go b/common/registrar/ethreg/api.go index 92e885b10..1ba422c4d 100644 --- a/common/registrar/ethreg/api.go +++ b/common/registrar/ethreg/api.go @@ -23,6 +23,7 @@ import ( "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/compiler" + "github.com/ethereum/go-ethereum/common/registrar" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" @@ -30,7 +31,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/common/registrar" ) // registryAPIBackend is a backend for an Ethereum Registry. @@ -112,6 +112,9 @@ type callmsg struct { 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() } |