diff options
author | obscuren <geffobscura@gmail.com> | 2014-09-14 06:13:32 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-09-14 06:13:32 +0800 |
commit | 4b4830692a0e17b26338da75c6ab96f6bb4e14b1 (patch) | |
tree | 8607609f2c42a6469a12701b9e7c67cfb43a5469 /ethpipe/js_pipe.go | |
parent | 2fb57b2ea7b7f697ddc4811c471d87116eae07cc (diff) | |
parent | 369e8c41509baef341e61e4c5243899d5ffba1fc (diff) | |
download | go-tangerine-4b4830692a0e17b26338da75c6ab96f6bb4e14b1.tar.gz go-tangerine-4b4830692a0e17b26338da75c6ab96f6bb4e14b1.tar.zst go-tangerine-4b4830692a0e17b26338da75c6ab96f6bb4e14b1.zip |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethpipe/js_pipe.go')
-rw-r--r-- | ethpipe/js_pipe.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ethpipe/js_pipe.go b/ethpipe/js_pipe.go index 7ee183c84..32212b26a 100644 --- 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 { |