aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api.go
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-04 22:22:59 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-04 22:22:59 +0800
commitc3deafabda6e97c0077609ab375be69936d512d4 (patch)
tree30e18fae7deedf50a6cbabeccf7c5020282b4968 /rpc/api.go
parentc92e48ce3f9de2196a713b24d5c27d6c664826d9 (diff)
downloadgo-tangerine-c3deafabda6e97c0077609ab375be69936d512d4.tar.gz
go-tangerine-c3deafabda6e97c0077609ab375be69936d512d4.tar.zst
go-tangerine-c3deafabda6e97c0077609ab375be69936d512d4.zip
Update NewTXArgs to accept hex
Diffstat (limited to 'rpc/api.go')
-rw-r--r--rpc/api.go15
1 files changed, 9 insertions, 6 deletions
diff --git a/rpc/api.go b/rpc/api.go
index f023709ca..406960fce 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -252,12 +252,12 @@ func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
}
func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
- if len(args.Gas) == 0 {
- args.Gas = defaultGas.String()
+ if args.Gas == ethutil.Big0 {
+ args.Gas = defaultGas
}
- if len(args.GasPrice) == 0 {
- args.GasPrice = defaultGasPrice.String()
+ if args.GasPrice == ethutil.Big0 {
+ args.GasPrice = defaultGasPrice
}
// TODO if no_private_key then
@@ -281,7 +281,10 @@ func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
p.register[ags.From] = append(p.register[args.From], args)
}
*/
- result, _ := p.xeth().Transact( /* TODO specify account */ args.To, args.Value, args.Gas, args.GasPrice, args.Data)
+ result, err := p.xeth().Transact( /* TODO specify account */ args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
+ if err != nil {
+ return err
+ }
*reply = result
//}
@@ -289,7 +292,7 @@ func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
}
func (p *EthereumApi) Call(args *NewTxArgs, reply *interface{}) error {
- result, err := p.xeth().Call( /* TODO specify account */ args.To, args.Value, args.Gas, args.GasPrice, args.Data)
+ result, err := p.xeth().Call( /* TODO specify account */ args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
if err != nil {
return err
}