Implemented first few methods via public api

5 files changed, 37 insertions, 28 deletions

diff --git a/ethereum.go b/ethereum.go
index 4181f9cd8..6cb1a916f 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -4,7 +4,6 @@ import (
 	"container/list"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethdb"
-	"github.com/ethereum/eth-go/etherpc"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/eth-go/ethwire"
 	"io/ioutil"
@@ -64,7 +63,7 @@ type Ethereum struct {
 
 	reactor *ethutil.ReactorEngine
 
-	RpcServer *etherpc.JsonRpcServer
+	// TODO: This no worky: RpcServer *etherpc.JsonRpcServer
 }
 
 func New(caps Caps, usePnp bool) (*Ethereum, error) {
@@ -341,7 +340,7 @@ func (s *Ethereum) Stop() {
 
 	s.txPool.Stop()
 	s.stateManager.Stop()
-	s.RpcServer.Stop()
+	// TODO: THIS NO WORKY: s.RpcServer.Stop()
 
 	close(s.shutdownChan)
 }
diff --git a/etherpc/packages.go b/etherpc/packages.go
index 8bc78498f..271a59879 100644
--- a/etherpc/packages.go
+++ b/etherpc/packages.go
@@ -3,18 +3,20 @@ package etherpc
 import (
 	"encoding/json"
 	"errors"
-	"math/big"
+	"github.com/ethereum/eth-go/ethpub"
+	_ "log"
 )
 
-type MainPackage struct{}
+type MainPackage struct {
+	ethp *ethpub.PEthereum
+}
 
 type JsonArgs interface {
 	requirements() error
 }
 
 type BlockResponse struct {
-	Name string
-	Id   int
+	JsonResponse
 }
 type GetBlockArgs struct {
 	BlockNumber int
@@ -63,22 +65,23 @@ func (b *GetBlockArgs) requirements() error {
 	return nil
 }
 
-func (p *MainPackage) GetBlock(args *GetBlockArgs, reply *BlockResponse) error {
+func (p *MainPackage) GetBlock(args *GetBlockArgs, reply *string) error {
 	err := args.requirements()
 	if err != nil {
 		return err
 	}
 	// Do something
-
+	block := p.ethp.GetBlock(args.Hash)
+	*reply = NewSuccessRes(block)
 	return nil
 }
 
 type NewTxArgs struct {
 	Sec       string
 	Recipient string
-	Value     *big.Int
-	Gas       *big.Int
-	GasPrice  *big.Int
+	Value     string
+	Gas       string
+	GasPrice  string
 	Init      string
 	Body      string
 }
@@ -90,26 +93,26 @@ func (a *NewTxArgs) requirements() error {
 	if a.Recipient == "" {
 		return NewErrorResponse("Transact requires a 'recipient' address as argument")
 	}
-	if a.Value == nil {
+	if a.Value == "" {
 		return NewErrorResponse("Transact requires a 'value' as argument")
 	}
-	if a.Gas == nil {
+	if a.Gas == "" {
 		return NewErrorResponse("Transact requires a 'gas' value as argument")
 	}
-	if a.GasPrice == nil {
+	if a.GasPrice == "" {
 		return NewErrorResponse("Transact requires a 'gasprice' value as argument")
 	}
 	return nil
 }
 
 func (a *NewTxArgs) requirementsContract() error {
-	if a.Value == nil {
+	if a.Value == "" {
 		return NewErrorResponse("Create requires a 'value' as argument")
 	}
-	if a.Gas == nil {
+	if a.Gas == "" {
 		return NewErrorResponse("Create requires a 'gas' value as argument")
 	}
-	if a.GasPrice == nil {
+	if a.GasPrice == "" {
 		return NewErrorResponse("Create requires a 'gasprice' value as argument")
 	}
 	if a.Init == "" {
@@ -121,11 +124,13 @@ func (a *NewTxArgs) requirementsContract() error {
 	return nil
 }
 
-func (p *MainPackage) Transact(args *NewTxArgs, reply *TxResponse) error {
+func (p *MainPackage) Transact(args *NewTxArgs, reply *string) error {
 	err := args.requirements()
 	if err != nil {
 		return err
 	}
+	result, _ := p.ethp.Transact(p.ethp.GetKey().PrivateKey, args.Recipient, args.Value, args.Gas, args.GasPrice, args.Body)
+	*reply = NewSuccessRes(result)
 	return nil
 }
 
@@ -134,6 +139,8 @@ func (p *MainPackage) Create(args *NewTxArgs, reply *string) error {
 	if err != nil {
 		return err
 	}
+	result, _ := p.ethp.Create(p.ethp.GetKey().PrivateKey, args.Value, args.Gas, args.GasPrice, args.Init, args.Body)
+	*reply = NewSuccessRes(result)
 	return nil
 }
 
diff --git a/etherpc/server.go b/etherpc/server.go
index ba0c51006..7929563cb 100644
--- a/etherpc/server.go
+++ b/etherpc/server.go
@@ -1,6 +1,7 @@
 package etherpc
 
 import (
+	"github.com/ethereum/eth-go/ethpub"
 	"github.com/ethereum/eth-go/ethutil"
 	"net"
 	"net/rpc"
@@ -10,6 +11,7 @@ import (
 type JsonRpcServer struct {
 	quit     chan bool
 	listener net.Listener
+	ethp     *ethpub.PEthereum
 }
 
 func (s *JsonRpcServer) exitHandler() {
@@ -32,7 +34,7 @@ func (s *JsonRpcServer) Stop() {
 func (s *JsonRpcServer) Start() {
 	ethutil.Config.Log.Infoln("[JSON] Starting JSON-RPC server")
 	go s.exitHandler()
-	rpc.Register(new(MainPackage))
+	rpc.Register(&MainPackage{ethp: s.ethp})
 	rpc.HandleHTTP()
 
 	for {
@@ -46,7 +48,7 @@ func (s *JsonRpcServer) Start() {
 	}
 }
 
-func NewJsonRpcServer() *JsonRpcServer {
+func NewJsonRpcServer(ethp *ethpub.PEthereum) *JsonRpcServer {
 	l, err := net.Listen("tcp", ":30304")
 	if err != nil {
 		ethutil.Config.Log.Infoln("Error starting JSON-RPC")
@@ -55,5 +57,6 @@ func NewJsonRpcServer() *JsonRpcServer {
 	return &JsonRpcServer{
 		listener: l,
 		quit:     make(chan bool),
+		ethp:     ethp,
 	}
 }
diff --git a/ethpub/pub.go b/ethpub/pub.go
index c6f177124..3c579001e 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -87,7 +87,7 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
 		tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript)
 	} else {
 		// Just in case it was submitted as a 0x prefixed string
-		if initStr[0:2] == "0x" {
+		if len(initStr) > 0 && initStr[0:2] == "0x" {
 			initStr = initStr[2:len(initStr)]
 		}
 		tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, ethutil.FromHex(initStr))
diff --git a/ethpub/types.go b/ethpub/types.go
index bf06ce2f6..4d9f9ad85 100644
--- a/ethpub/types.go
+++ b/ethpub/types.go
@@ -8,8 +8,8 @@ import (
 
 // Block interface exposed to QML
 type PBlock struct {
-	Number int
-	Hash   string
+	Number int    `json:"number"`
+	Hash   string `json:"hash"`
 }
 
 // Creates a new QML Block from a chain block
@@ -44,10 +44,10 @@ func NewPKey(key *ethchain.KeyPair) *PKey {
 }
 
 type PReceipt struct {
-	CreatedContract bool
-	Address         string
-	Hash            string
-	Sender          string
+	CreatedContract bool   `json:"createdContract"`
+	Address         string `json:"address"`
+	Hash            string `json:"hash"`
+	Sender          string `json:"sender"`
 }
 
 func NewPReciept(contractCreation bool, creationAddress, hash, address []byte) *PReceipt {