aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-21 00:08:14 +0800
committerobscuren <geffobscura@gmail.com>2015-04-21 00:08:14 +0800
commit36ec42e50c9367e86621ff58b8e3d835abbbad79 (patch)
tree94c9d0a98b625ca5a8be59f5b780fd3bd54254c7 /rpc
parent76025cc4245f0abc0749f4d1e433be865107bf24 (diff)
parent093a9106b093310acf4c3911baa61916cff52ab8 (diff)
downloadgo-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar.gz
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar.bz2
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar.lz
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar.xz
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.tar.zst
go-tangerine-36ec42e50c9367e86621ff58b8e3d835abbbad79.zip
Merge branch 'frontier/natspec' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/natspec
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/rpc/api.go b/rpc/api.go
index bf5066f9a..66283752b 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -2,7 +2,7 @@ package rpc
import (
"encoding/json"
- // "fmt"
+ "fmt"
"math/big"
"sync"
@@ -167,6 +167,12 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return err
}
+ // call ConfirmTransaction first
+ tx, _ := json.Marshal(req)
+ if !api.xeth().ConfirmTransaction(string(tx)) {
+ return fmt.Errorf("Transaction not confirmed")
+ }
+
v, err := api.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
if err != nil {
return err