aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain/transaction.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-23 00:24:04 +0800
committerobscuren <geffobscura@gmail.com>2014-05-23 00:24:04 +0800
commit281559d42712c2b2ae903cb893b2ddc82318307d (patch)
treeffc5c980bc283d7ec92bad6643e95d4b41cb6333 /ethchain/transaction.go
parentcc8464ce805279735f637ac710b25e2fb264f9aa (diff)
downloaddexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar.gz
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar.bz2
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar.lz
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar.xz
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.tar.zst
dexon-281559d42712c2b2ae903cb893b2ddc82318307d.zip
Canonical contract creation
Diffstat (limited to 'ethchain/transaction.go')
-rw-r--r--ethchain/transaction.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index 6ae7e77e1..25d63879b 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -16,7 +16,6 @@ type Transaction struct {
Gas *big.Int
GasPrice *big.Int
Data []byte
- Init []byte
v byte
r, s []byte
@@ -24,8 +23,8 @@ type Transaction struct {
contractCreation bool
}
-func NewContractCreationTx(value, gas, gasPrice *big.Int, script []byte, init []byte) *Transaction {
- return &Transaction{Value: value, Gas: gas, GasPrice: gasPrice, Data: script, Init: init, contractCreation: true}
+func NewContractCreationTx(value, gas, gasPrice *big.Int, script []byte) *Transaction {
+ return &Transaction{Value: value, Gas: gas, GasPrice: gasPrice, Data: script, contractCreation: true}
}
func NewTransactionMessage(to []byte, value, gas, gasPrice *big.Int, data []byte) *Transaction {
@@ -115,10 +114,6 @@ func (tx *Transaction) Sign(privk []byte) error {
func (tx *Transaction) RlpData() interface{} {
data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}
- if tx.contractCreation {
- data = append(data, tx.Init)
- }
-
return append(data, tx.v, tx.r, tx.s)
}