Merge branch 'develop' of github.com:ethereum/go-ethereum into develop

ethereum · Jul 2, 2015 · 9f6016e · 9f6016e
2 parents 744af9f + 75f41de
commit 9f6016e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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 {