fixed state object changes for eth api

1 files changed, 53 insertions, 9 deletions

diff --git a/ethereal/ui/ext_app.go b/ethereal/ui/ext_app.go
index b90a2192c..c02ffb7b2 100644
--- a/ethereal/ui/ext_app.go
+++ b/ethereal/ui/ext_app.go
@@ -5,8 +5,10 @@ import (
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
 	"math/big"
+	"strings"
 )
 
 type AppContainer interface {
@@ -116,10 +118,10 @@ out:
 func (app *ExtApplication) Watch(addr, storageAddr string) {
 	var event string
 	if len(storageAddr) == 0 {
-		event = "storage:" + string(ethutil.FromHex(addr)) + ":" + string(ethutil.FromHex(storageAddr))
+		event = "object:" + string(ethutil.FromHex(addr))
 		app.lib.eth.Reactor().Subscribe(event, app.changeChan)
 	} else {
-		event = "object:" + string(ethutil.FromHex(addr))
+		event = "storage:" + string(ethutil.FromHex(addr)) + ":" + string(ethutil.FromHex(storageAddr))
 		app.lib.eth.Reactor().Subscribe(event, app.changeChan)
 	}
 
@@ -152,24 +154,66 @@ func (lib *QEthereum) GetKey() string {
 	return ethutil.Hex(ethutil.Config.Db.GetKeys()[0].Address())
 }
 
-func (lib *QEthereum) GetStateObject(address string) *Contract {
+func (lib *QEthereum) GetStateObject(address string) *QStateObject {
 	stateObject := lib.stateManager.ProcState().GetContract(ethutil.FromHex(address))
 	if stateObject != nil {
-		return NewContract(stateObject)
+		return NewQStateObject(stateObject)
 	}
 
 	// See GetStorage for explanation on "nil"
-	return NewContract(nil)
+	return NewQStateObject(nil)
 }
 
 func (lib *QEthereum) Watch(addr, storageAddr string) {
 	//	lib.stateManager.Watch(ethutil.FromHex(addr), ethutil.FromHex(storageAddr))
 }
 
-func (lib *QEthereum) CreateTx(recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
-	return lib.Transact(recipient, valueStr, gasStr, gasPriceStr, dataStr)
+func (lib *QEthereum) CreateTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
+	return lib.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
 }
 
-func (lib *QEthereum) Transact(recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
-	return "", nil
+func (lib *QEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
+	var hash []byte
+	var contractCreation bool
+	if len(recipient) == 0 {
+		contractCreation = true
+	} else {
+		hash = ethutil.FromHex(recipient)
+	}
+
+	keyPair := ethutil.Config.Db.GetKeys()[0]
+	value := ethutil.Big(valueStr)
+	gas := ethutil.Big(gasStr)
+	gasPrice := ethutil.Big(gasPriceStr)
+	var tx *ethchain.Transaction
+	// Compile and assemble the given data
+	if contractCreation {
+		// Compile script
+		mainScript, initScript, err := utils.CompileScript(dataStr)
+		if err != nil {
+			return "", err
+		}
+
+		tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript)
+	} else {
+		lines := strings.Split(dataStr, "\n")
+		var data []byte
+		for _, line := range lines {
+			data = append(data, ethutil.BigToBytes(ethutil.Big(line), 256)...)
+		}
+
+		tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, data)
+	}
+	acc := lib.stateManager.GetAddrState(keyPair.Address())
+	tx.Nonce = acc.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()), nil
 }