From b855e5f7df194c84651d7cc7ee32d307a2fa0a2e Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 12 Jun 2014 11:19:32 +0200
Subject: Changed opcode numbers and added missing opcodes

---
 ethchain/transaction.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ethchain/transaction.go')

diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index 2cb946b3b..32dbd8388 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -1,6 +1,7 @@
 package ethchain
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/obscuren/secp256k1-go"
@@ -144,7 +145,8 @@ func (tx *Transaction) RlpValueDecode(decoder *ethutil.Value) {
 	tx.v = byte(decoder.Get(6).Uint())
 	tx.r = decoder.Get(7).Bytes()
 	tx.s = decoder.Get(8).Bytes()
-	if len(tx.Recipient) == 0 {
+
+	if bytes.Compare(tx.Recipient, ContractAddr) == 0 {
 		tx.contractCreation = true
 	}
 }
-- 
cgit v1.2.3


From d078e9b8c92fb3bd5789a8e39c169b19864e0a04 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 13 Jun 2014 12:45:11 +0200
Subject: Refactoring state transitioning

---
 ethchain/transaction.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'ethchain/transaction.go')

diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index 32dbd8388..7aaab2fd1 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -46,15 +46,18 @@ func NewTransactionFromValue(val *ethutil.Value) *Transaction {
 	return tx
 }
 
+func (self *Transaction) GasValue() *big.Int {
+	return new(big.Int).Mul(self.Gas, self.GasPrice)
+}
+
+func (self *Transaction) TotalValue() *big.Int {
+	v := self.GasValue()
+	return v.Add(v, self.Value)
+}
+
 func (tx *Transaction) Hash() []byte {
 	data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}
 
-	/*
-		if tx.contractCreation {
-			data = append(data, tx.Init)
-		}
-	*/
-
 	return ethutil.Sha3Bin(ethutil.NewValue(data).Encode())
 }
 
@@ -185,6 +188,7 @@ type Receipt struct {
 	PostState         []byte
 	CumulativeGasUsed *big.Int
 }
+type Receipts []*Receipt
 
 func NewRecieptFromValue(val *ethutil.Value) *Receipt {
 	r := &Receipt{}
-- 
cgit v1.2.3


From 5871dbaf5a832a4fd34bdb22cf479d6b0b4da9fb Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 15 Jun 2014 00:10:42 +0200
Subject: Set contract addr for new transactions

---
 ethchain/transaction.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ethchain/transaction.go')

diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index 7aaab2fd1..3d52e4f73 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -25,7 +25,7 @@ type Transaction struct {
 }
 
 func NewContractCreationTx(value, gas, gasPrice *big.Int, script []byte) *Transaction {
-	return &Transaction{Value: value, Gas: gas, GasPrice: gasPrice, Data: script, contractCreation: true}
+	return &Transaction{Recipient: ContractAddr, Value: value, Gas: gas, GasPrice: gasPrice, Data: script, contractCreation: true}
 }
 
 func NewTransactionMessage(to []byte, value, gas, gasPrice *big.Int, data []byte) *Transaction {
-- 
cgit v1.2.3