aboutsummaryrefslogtreecommitdiffstats
path: root/internal/ethapi
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-12-20 21:31:10 +0800
committerFelix Lange <fjl@twurst.com>2016-12-20 21:46:22 +0800
commit12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4 (patch)
tree73d6780057bb56dc8061d020510140203c93dc7a /internal/ethapi
parentcf71f5cd604f4d5c94d9e9b12b121a614d662dc7 (diff)
downloaddexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar.gz
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar.bz2
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar.lz
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar.xz
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.tar.zst
dexon-12c964b2b7c70949ae5a8c54cf73be7bbd8c97b4.zip
internal/ethapi: fix hex handling for eth_call input and eth_sendRawTransaction
Diffstat (limited to 'internal/ethapi')
-rw-r--r--internal/ethapi/api.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index cd6beedd9..b84bba516 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -485,7 +485,7 @@ type CallArgs struct {
Gas hexutil.Big `json:"gas"`
GasPrice hexutil.Big `json:"gasPrice"`
Value hexutil.Big `json:"value"`
- Data string `json:"data"`
+ Data hexutil.Bytes `json:"data"`
}
func (s *PublicBlockChainAPI) doCall(ctx context.Context, args CallArgs, blockNr rpc.BlockNumber) (string, *big.Int, error) {
@@ -517,7 +517,7 @@ func (s *PublicBlockChainAPI) doCall(ctx context.Context, args CallArgs, blockNr
if gasPrice.Cmp(common.Big0) == 0 {
gasPrice = new(big.Int).Mul(big.NewInt(50), common.Shannon)
}
- msg := types.NewMessage(addr, args.To, 0, args.Value.ToInt(), gas, gasPrice, common.FromHex(args.Data), false)
+ msg := types.NewMessage(addr, args.To, 0, args.Value.ToInt(), gas, gasPrice, args.Data, false)
// Execute the call and return
vmenv, vmError, err := s.b.GetVMEnv(ctx, msg, state, header)
@@ -1056,9 +1056,9 @@ func (s *PublicTransactionPoolAPI) SendTransaction(ctx context.Context, args Sen
// SendRawTransaction will add the signed transaction to the transaction pool.
// The sender is responsible for signing the transaction and using the correct nonce.
-func (s *PublicTransactionPoolAPI) SendRawTransaction(ctx context.Context, encodedTx string) (string, error) {
+func (s *PublicTransactionPoolAPI) SendRawTransaction(ctx context.Context, encodedTx hexutil.Bytes) (string, error) {
tx := new(types.Transaction)
- if err := rlp.DecodeBytes(common.FromHex(encodedTx), tx); err != nil {
+ if err := rlp.DecodeBytes(encodedTx, tx); err != nil {
return "", err
}