aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-02 17:27:20 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-02 17:27:20 +0800
commit75f41dedcab63e23ab9c58dcda3da02e3dbb29cb (patch)
treed3900442c98526fdb05c36ee7e3a226cffc5104e
parent5caff3bc247cdd71f2342093d276041afe898ab3 (diff)
parent529fb7a7d76e4c98f825bfcb9f3c1fb40b1d0d1e (diff)
downloaddexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar.gz
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar.bz2
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar.lz
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar.xz
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.tar.zst
dexon-75f41dedcab63e23ab9c58dcda3da02e3dbb29cb.zip
Merge pull request #1378 from obscuren/issue1367
core, xeth: core.AddressFromMessage removed => crypto.CreateAddress
-rw-r--r--core/state_transition.go6
-rw-r--r--xeth/types.go3
-rw-r--r--xeth/xeth.go9
3 files changed, 9 insertions, 9 deletions
diff --git a/core/state_transition.go b/core/state_transition.go
index e2212dfef..5611ffd0f 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -7,7 +7,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/vm"
- "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/params"
@@ -56,11 +55,6 @@ type Message interface {
Data() []byte
}
-func AddressFromMessage(msg Message) common.Address {
- from, _ := msg.From()
- return crypto.CreateAddress(from, msg.Nonce())
-}
-
func MessageCreatesContract(msg Message) bool {
return msg.To() == nil
}
diff --git a/xeth/types.go b/xeth/types.go
index 1d6a0c5ca..cc06a8dcd 100644
--- a/xeth/types.go
+++ b/xeth/types.go
@@ -149,7 +149,8 @@ func NewTx(tx *types.Transaction) *Transaction {
if to := tx.To(); to != nil {
receiver = to.Hex()
} else {
- receiver = core.AddressFromMessage(tx).Hex()
+ from, _ := tx.From()
+ receiver = crypto.CreateAddress(from, tx.Nonce()).Hex()
}
createsContract := core.MessageCreatesContract(tx)
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 0dbedff43..2a1366fe1 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -802,7 +802,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
}
if tx.To() == nil {
- addr := core.AddressFromMessage(tx)
+ from, err := tx.From()
+ if err != nil {
+ return "", err
+ }
+
+ addr := crypto.CreateAddress(from, tx.Nonce())
glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
return addr.Hex(), nil
} else {
@@ -969,7 +974,7 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
}
if contractCreation {
- addr := core.AddressFromMessage(tx)
+ addr := crypto.CreateAddress(from, nonce)
glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
return addr.Hex(), nil
} else {