diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-08 06:48:59 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-08 06:48:59 +0800 |
| commit | 0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56 (patch) | |
| tree | 99a92651cee13d2e706bc87565b464dba8cd6551 | |
| parent | 250d40bca01ae92ef5db6258b519e5903929f764 (diff) | |
| download | dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar.gz dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar.bz2 dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar.lz dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar.xz dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.tar.zst dexon-0b6b6b52fe1518efef4bcfe9e224cf9209dd8e56.zip | |
Contract creation address are empty again
| -rw-r--r-- | ethchain/transaction.go | 5 | ||||
| -rw-r--r-- | ethchain/transaction_pool.go | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go index e1b48a3d3..e7e8f3a9f 100644 --- a/ethchain/transaction.go +++ b/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 { diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go index b0d62fd91..bd8b27a6d 100644 --- a/ethchain/transaction_pool.go +++ b/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), |