diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 01:13:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 02:58:43 +0800 |
| commit | ac695387075fdd9214ef8de71ac6897136a50ce8 (patch) | |
| tree | 5a4bce7c79eebe56b3573892e30e96b1ed0936fd /rpc/packages.go | |
| parent | 9d2166a964d83c09481dea6ef30889f260249295 (diff) | |
| parent | db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff) | |
| download | go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.gz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.bz2 go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.lz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.xz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.zst go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'rpc/packages.go')
| -rw-r--r-- | rpc/packages.go | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/rpc/packages.go b/rpc/packages.go index a98d99d6c..047bbda9a 100644 --- a/rpc/packages.go +++ b/rpc/packages.go @@ -40,6 +40,11 @@ import ( "github.com/ethereum/go-ethereum/xeth" ) +const ( + defaultGasPrice = "10000000000000" + defaultGas = "10000" +) + type EthereumApi struct { xeth *xeth.XEth filterManager *filter.FilterManager @@ -116,10 +121,14 @@ func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error { } func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error { - err := args.requirements() - if err != nil { - return err + if len(args.Gas) == 0 { + args.Gas = defaultGas + } + + if len(args.GasPrice) == 0 { + args.GasPrice = defaultGasPrice } + result, _ := p.xeth.Transact( /* TODO specify account */ args.To, args.Value, args.Gas, args.GasPrice, args.Data) *reply = result return nil @@ -387,7 +396,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error } return p.FilterChanged(args, reply) case "eth_gasPrice": - *reply = "10000000000000" + *reply = defaultGasPrice return nil case "web3_sha3": args, err := req.ToSha3Args() |