1 files changed, 42 insertions, 39 deletions

diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index 3b07c81d4..506e3c159 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -1,7 +1,6 @@
 package ethchain
 
 import (
-	"bytes"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/obscuren/secp256k1-go"
 	"math/big"
@@ -18,31 +17,19 @@ type Transaction struct {
 	Data      []string
 	v         byte
 	r, s      []byte
-}
-
-func NewTransaction(to []byte, value *big.Int, data []string) *Transaction {
-	tx := Transaction{Recipient: to, Value: value, Nonce: 0, Data: data}
 
-	return &tx
+	// Indicates whether this tx is a contract creation transaction
+	contractCreation bool
 }
 
 func NewContractCreationTx(value, gasprice *big.Int, data []string) *Transaction {
-	return &Transaction{Value: value, Gasprice: gasprice, Data: data}
+	return &Transaction{Value: value, Gasprice: gasprice, Data: data, contractCreation: true}
 }
 
-func NewContractMessageTx(to []byte, value, gasprice, gas *big.Int, data []string) *Transaction {
+func NewTransactionMessage(to []byte, value, gasprice, gas *big.Int, data []string) *Transaction {
 	return &Transaction{Recipient: to, Value: value, Gasprice: gasprice, Gas: gas, Data: data}
 }
 
-func NewTx(to []byte, value *big.Int, data []string) *Transaction {
-	return &Transaction{Recipient: to, Value: value, Gasprice: big.NewInt(0), Gas: big.NewInt(0), Nonce: 0, Data: data}
-}
-
-// XXX Deprecated
-func NewTransactionFromData(data []byte) *Transaction {
-	return NewTransactionFromBytes(data)
-}
-
 func NewTransactionFromBytes(data []byte) *Transaction {
 	tx := &Transaction{}
 	tx.RlpDecode(data)
@@ -74,7 +61,7 @@ func (tx *Transaction) Hash() []byte {
 }
 
 func (tx *Transaction) IsContract() bool {
-	return bytes.Compare(tx.Recipient, ContractAddr) == 0
+	return tx.contractCreation
 }
 
 func (tx *Transaction) Signature(key []byte) []byte {
@@ -124,16 +111,14 @@ func (tx *Transaction) Sign(privk []byte) error {
 }
 
 func (tx *Transaction) RlpData() interface{} {
-	// Prepare the transaction for serialization
-	return []interface{}{
-		tx.Nonce,
-		tx.Recipient,
-		tx.Value,
-		ethutil.NewSliceValue(tx.Data).Slice(),
-		tx.v,
-		tx.r,
-		tx.s,
+	data := []interface{}{tx.Nonce, tx.Value, tx.Gasprice}
+
+	if !tx.contractCreation {
+		data = append(data, tx.Recipient, tx.Gas)
 	}
+	d := ethutil.NewSliceValue(tx.Data).Slice()
+
+	return append(data, d, tx.v, tx.r, tx.s)
 }
 
 func (tx *Transaction) RlpValue() *ethutil.Value {
@@ -150,17 +135,35 @@ func (tx *Transaction) RlpDecode(data []byte) {
 
 func (tx *Transaction) RlpValueDecode(decoder *ethutil.Value) {
 	tx.Nonce = decoder.Get(0).Uint()
-	tx.Recipient = decoder.Get(1).Bytes()
-	tx.Value = decoder.Get(2).BigInt()
-
-	d := decoder.Get(3)
-	tx.Data = make([]string, d.Len())
-	for i := 0; i < d.Len(); i++ {
-		tx.Data[i] = d.Get(i).Str()
+	tx.Value = decoder.Get(1).BigInt()
+	tx.Gasprice = decoder.Get(2).BigInt()
+
+	// If the 4th item is a list(slice) this tx
+	// is a contract creation tx
+	if decoder.Get(3).IsList() {
+		d := decoder.Get(3)
+		tx.Data = make([]string, d.Len())
+		for i := 0; i < d.Len(); i++ {
+			tx.Data[i] = d.Get(i).Str()
+		}
+
+		tx.v = byte(decoder.Get(4).Uint())
+		tx.r = decoder.Get(5).Bytes()
+		tx.s = decoder.Get(6).Bytes()
+
+		tx.contractCreation = true
+	} else {
+		tx.Recipient = decoder.Get(3).Bytes()
+		tx.Gas = decoder.Get(4).BigInt()
+
+		d := decoder.Get(5)
+		tx.Data = make([]string, d.Len())
+		for i := 0; i < d.Len(); i++ {
+			tx.Data[i] = d.Get(i).Str()
+		}
+
+		tx.v = byte(decoder.Get(6).Uint())
+		tx.r = decoder.Get(7).Bytes()
+		tx.s = decoder.Get(8).Bytes()
 	}
-
-	// TODO something going wrong here
-	tx.v = byte(decoder.Get(4).Uint())
-	tx.r = decoder.Get(5).Bytes()
-	tx.s = decoder.Get(6).Bytes()
 }