Added receipts for tx creation

2 files changed, 24 insertions, 8 deletions

diff --git a/ethpub/pub.go b/ethpub/pub.go
index 4950f6eb5..c6f177124 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -47,15 +47,15 @@ func (lib *PEthereum) GetStateObject(address string) *PStateObject {
 	return NewPStateObject(nil)
 }
 
-func (lib *PEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
+func (lib *PEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (*PReceipt, error) {
 	return lib.createTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr, "")
 }
 
-func (lib *PEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) (string, error) {
+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) createTx(key, recipient, valueStr, gasStr, gasPriceStr, initStr, scriptStr string) (string, error) {
+func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, initStr, scriptStr string) (*PReceipt, error) {
 	var hash []byte
 	var contractCreation bool
 	if len(recipient) == 0 {
@@ -66,7 +66,7 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
 
 	keyPair, err := ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key)))
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	value := ethutil.Big(valueStr)
@@ -77,11 +77,11 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
 	if contractCreation {
 		initScript, err := ethutil.Compile(initStr)
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 		mainScript, err := ethutil.Compile(scriptStr)
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 
 		tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript)
@@ -99,10 +99,10 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
 	lib.txPool.QueueTransaction(tx)
 
 	if contractCreation {
-		ethutil.Config.Log.Infof("Contract addr %x", tx.Hash()[12:])
+		ethutil.Config.Log.Infof("Contract addr %x", tx.CreationAddress())
 	} else {
 		ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
 	}
 
-	return ethutil.Hex(tx.Hash()), nil
+	return NewPReciept(contractCreation, tx.CreationAddress(), tx.Hash(), keyPair.Address()), nil
 }
diff --git a/ethpub/types.go b/ethpub/types.go
index 5e7e4613d..bf06ce2f6 100644
--- a/ethpub/types.go
+++ b/ethpub/types.go
@@ -43,6 +43,22 @@ func NewPKey(key *ethchain.KeyPair) *PKey {
 	return &PKey{ethutil.Hex(key.Address()), ethutil.Hex(key.PrivateKey), ethutil.Hex(key.PublicKey)}
 }
 
+type PReceipt struct {
+	CreatedContract bool
+	Address         string
+	Hash            string
+	Sender          string
+}
+
+func NewPReciept(contractCreation bool, creationAddress, hash, address []byte) *PReceipt {
+	return &PReceipt{
+		contractCreation,
+		ethutil.Hex(creationAddress),
+		ethutil.Hex(hash),
+		ethutil.Hex(address),
+	}
+}
+
 /*
 type PKeyRing struct {
 	Keys []interface{}