Contract creation address are empty again

ethchain/transaction.go

@@ -13,7 +13,8 @@ import (
 var ContractAddr = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 func IsContractAddr(addr []byte) bool {
-	return bytes.Compare(addr, ContractAddr) == 0
+	return len(addr) == 0
+	//return bytes.Compare(addr, ContractAddr) == 0
 }
 
 type Transaction struct {
@@ -31,7 +32,7 @@ type Transaction struct {
 }
 
 func NewContractCreationTx(value, gas, gasPrice *big.Int, script []byte) *Transaction {
-	return &Transaction{Recipient: ContractAddr, Value: value, Gas: gas, GasPrice: gasPrice, Data: script, contractCreation: true}
+	return &Transaction{Recipient: nil, Value: value, Gas: gas, GasPrice: gasPrice, Data: script, contractCreation: true}
 }
 
 func NewTransactionMessage(to []byte, value, gas, gasPrice *big.Int, data []byte) *Transaction {

ethchain/transaction_pool.go

@@ -72,8 +72,6 @@ type TxPool struct {
 
 func NewTxPool(ethereum EthManager) *TxPool {
 	return &TxPool{
-		//server:    s,
-		mutex:     sync.Mutex{},
 		pool:      list.New(),
 		queueChan: make(chan *Transaction, txPoolQueueSize),
 		quit:      make(chan bool),