Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop

2014-09-14 00:13:32 +02:00
parent 2fb57b2ea7 369e8c4150
commit 4b4830692a
3 changed files with 36 additions and 0 deletions
--- a/ethpipe/js_pipe.go
+++ b/ethpipe/js_pipe.go
@ -223,6 +223,12 @@ func (self *JSPipe) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr
 	return NewJSReciept(contractCreation, tx.CreationAddress(), tx.Hash(), keyPair.Address()), nil
 }

+func (self *JSPipe) PushTx(txStr string) (*JSReceipt, error) {
+    tx := ethchain.NewTransactionFromBytes(ethutil.Hex2Bytes(txStr))
+    self.obj.TxPool().QueueTransaction(tx)
+    return NewJSReciept(tx.CreatesContract(), tx.CreationAddress(), tx.Hash(), tx.Sender()), nil
+}
+
 func (self *JSPipe) CompileMutan(code string) string {
 	data, err := self.Pipe.CompileMutan(code)
 	if err != nil {