From 81ef40010f6f31bc94f654048b41fa3a9f9e07eb Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 25 May 2014 14:13:54 +0100
Subject: The body of contracts are now returned instead

---
 ethpub/pub.go | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

(limited to 'ethpub/pub.go')

diff --git a/ethpub/pub.go b/ethpub/pub.go
index e726c66f3..b75d3abc8 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -87,14 +87,14 @@ func (lib *PEthereum) SecretToAddress(key string) string {
 }
 
 func (lib *PEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (*PReceipt, error) {
-	return lib.createTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr, "")
+	return lib.createTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
 }
 
-func (lib *PEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) (*PReceipt, error) {
-	return lib.createTx(key, "", valueStr, gasStr, gasPriceStr, initStr, bodyStr)
+func (lib *PEthereum) Create(key, valueStr, gasStr, gasPriceStr, script string) (*PReceipt, error) {
+	return lib.createTx(key, "", valueStr, gasStr, gasPriceStr, script)
 }
 
-func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, initStr, scriptStr string) (*PReceipt, error) {
+func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, scriptStr string) (*PReceipt, error) {
 	var hash []byte
 	var contractCreation bool
 	if len(recipient) == 0 {
@@ -121,35 +121,47 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
 	var tx *ethchain.Transaction
 	// Compile and assemble the given data
 	if contractCreation {
-		var initScript, mainScript []byte
-		var err error
-		if ethutil.IsHex(initStr) {
-			initScript = ethutil.FromHex(initStr[2:])
-		} else {
-			initScript, err = ethutil.Compile(initStr)
-			if err != nil {
-				return nil, err
+		/*
+			var initScript, mainScript []byte
+			var err error
+			if ethutil.IsHex(initStr) {
+				initScript = ethutil.FromHex(initStr[2:])
+			} else {
+				initScript, err = ethutil.Compile(initStr)
+				if err != nil {
+					return nil, err
+				}
 			}
-		}
 
+			if ethutil.IsHex(scriptStr) {
+				mainScript = ethutil.FromHex(scriptStr[2:])
+			} else {
+				mainScript, err = ethutil.Compile(scriptStr)
+				if err != nil {
+					return nil, err
+				}
+			}
+
+			script := ethchain.AppendScript(initScript, mainScript)
+		*/
+		var script []byte
+		var err error
 		if ethutil.IsHex(scriptStr) {
-			mainScript = ethutil.FromHex(scriptStr[2:])
+			script = ethutil.FromHex(scriptStr)
 		} else {
-			mainScript, err = ethutil.Compile(scriptStr)
+			script, err = ethutil.Compile(scriptStr)
 			if err != nil {
 				return nil, err
 			}
 		}
 
-		script := ethchain.AppendScript(initScript, mainScript)
-
 		tx = ethchain.NewContractCreationTx(value, gas, gasPrice, script)
 	} else {
 		// Just in case it was submitted as a 0x prefixed string
-		if len(initStr) > 0 && initStr[0:2] == "0x" {
-			initStr = initStr[2:len(initStr)]
+		if len(scriptStr) > 0 && scriptStr[0:2] == "0x" {
+			scriptStr = scriptStr[2:len(scriptStr)]
 		}
-		tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, ethutil.FromHex(initStr))
+		tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, ethutil.FromHex(scriptStr))
 	}
 
 	acc := lib.stateManager.TransState().GetStateObject(keyPair.Address())
-- 
cgit