From c5215fd4fb9de7594fdb812f8f9e4c471ee8d003 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 27 Mar 2014 19:41:42 +0100
Subject: Added gas and gas price.

* library's `createTx` method changed so it accepts a gas price
* dev console accepts code as well as the library
---
 ethereal/ui/library.go | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

(limited to 'ethereal/ui/library.go')

diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index 05fffd579..bd67f3c20 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/obscuren/mutan"
 	"strings"
 )
 
@@ -14,6 +15,50 @@ type EthLib struct {
 	txPool       *ethchain.TxPool
 }
 
+func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data string) string {
+	var hash []byte
+	var contractCreation bool
+	if len(recipient) == 0 {
+		contractCreation = true
+	} else {
+		var err error
+		hash, err = hex.DecodeString(recipient)
+		if err != nil {
+			return err.Error()
+		}
+	}
+
+	keyPair := ethutil.Config.Db.GetKeys()[0]
+	value := ethutil.Big(valueStr)
+	gas := ethutil.Big(valueStr)
+	gasPrice := ethutil.Big(gasPriceStr)
+	var tx *ethchain.Transaction
+	// Compile and assemble the given data
+	if contractCreation {
+		asm, err := mutan.NewCompiler().Compile(strings.NewReader(data))
+		if err != nil {
+			return err.Error()
+		}
+
+		code := ethutil.Assemble(asm)
+		tx = ethchain.NewContractCreationTx(value, gasPrice, code)
+	} else {
+		tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{})
+	}
+	tx.Nonce = lib.stateManager.GetAddrState(keyPair.Address()).Nonce
+	tx.Sign(keyPair.PrivateKey)
+	lib.txPool.QueueTransaction(tx)
+
+	if contractCreation {
+		ethutil.Config.Log.Infof("Contract addr %x", tx.Hash()[12:])
+	} else {
+		ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
+	}
+
+	return ethutil.Hex(tx.Hash())
+}
+
+/*
 func (lib *EthLib) CreateTx(receiver, a, data string) string {
 	var hash []byte
 	if len(receiver) == 0 {
@@ -31,7 +76,7 @@ func (lib *EthLib) CreateTx(receiver, a, data string) string {
 
 	amount := ethutil.Big(a)
 	code := ethchain.Compile(strings.Split(data, "\n"))
-	tx := ethchain.NewTransaction(hash, amount, code)
+	tx := ethchain.NewTx(hash, amount, code)
 	tx.Nonce = lib.stateManager.GetAddrState(keyPair.Address()).Nonce
 
 	tx.Sign(keyPair.PrivateKey)
@@ -46,6 +91,7 @@ func (lib *EthLib) CreateTx(receiver, a, data string) string {
 
 	return ethutil.Hex(tx.Hash())
 }
+*/
 
 func (lib *EthLib) GetBlock(hexHash string) *Block {
 	hash, err := hex.DecodeString(hexHash)
-- 
cgit v1.2.3


From ebbc5e7cb8b3886c8557f9f8623113f52f7f5e4a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 30 Mar 2014 22:03:29 +0200
Subject: Updated to new mutan api

---
 ethereal/ui/library.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ethereal/ui/library.go')

diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index bd67f3c20..692ec454c 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -35,7 +35,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
 	var tx *ethchain.Transaction
 	// Compile and assemble the given data
 	if contractCreation {
-		asm, err := mutan.NewCompiler().Compile(strings.NewReader(data))
+		asm, err := mutan.Compile(strings.NewReader(data), false)
 		if err != nil {
 			return err.Error()
 		}
-- 
cgit v1.2.3


From 97b98b1250890977ea622af378fe864e4620e313 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 31 Mar 2014 00:22:50 +0200
Subject: Fixed an issue with sending gas to a contract

---
 ethereal/ui/library.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ethereal/ui/library.go')

diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index 692ec454c..6f8cb6f65 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -30,7 +30,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
 
 	keyPair := ethutil.Config.Db.GetKeys()[0]
 	value := ethutil.Big(valueStr)
-	gas := ethutil.Big(valueStr)
+	gas := ethutil.Big(gasStr)
 	gasPrice := ethutil.Big(gasPriceStr)
 	var tx *ethchain.Transaction
 	// Compile and assemble the given data
@@ -40,7 +40,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
 			return err.Error()
 		}
 
-		code := ethutil.Assemble(asm)
+		code := ethutil.Assemble(asm...)
 		tx = ethchain.NewContractCreationTx(value, gasPrice, code)
 	} else {
 		tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{})
-- 
cgit v1.2.3