aboutsummaryrefslogtreecommitdiffstats
path: root/eth/bind.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-02-13 23:13:40 +0800
committerGitHub <noreply@github.com>2017-02-13 23:13:40 +0800
commit0850f68fd17586370b102aa516739476db4913c2 (patch)
tree5d2f140139f3763a7da3c20a88acff96b58ec8ad /eth/bind.go
parentf8f428cc18c5f70814d7b3937128781bac14bffd (diff)
parent57f4e9025757254536a738bb4771712038f1e763 (diff)
downloaddexon-0850f68fd17586370b102aa516739476db4913c2.tar
dexon-0850f68fd17586370b102aa516739476db4913c2.tar.gz
dexon-0850f68fd17586370b102aa516739476db4913c2.tar.bz2
dexon-0850f68fd17586370b102aa516739476db4913c2.tar.lz
dexon-0850f68fd17586370b102aa516739476db4913c2.tar.xz
dexon-0850f68fd17586370b102aa516739476db4913c2.tar.zst
dexon-0850f68fd17586370b102aa516739476db4913c2.zip
Merge pull request #3668 from obscuren/revert-gas64
Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"
Diffstat (limited to 'eth/bind.go')
-rw-r--r--eth/bind.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/bind.go b/eth/bind.go
index 2ee9f2bf7..a9864b367 100644
--- a/eth/bind.go
+++ b/eth/bind.go
@@ -69,7 +69,7 @@ func (b *ContractBackend) PendingCodeAt(ctx context.Context, contract common.Add
// against the pending block, not the stable head of the chain.
func (b *ContractBackend) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNum *big.Int) ([]byte, error) {
out, err := b.bcapi.Call(ctx, toCallArgs(msg), toBlockNumber(blockNum))
- return out, err
+ return common.FromHex(out), err
}
// ContractCall implements bind.ContractCaller executing an Ethereum contract
@@ -77,7 +77,7 @@ func (b *ContractBackend) CallContract(ctx context.Context, msg ethereum.CallMsg
// against the pending block, not the stable head of the chain.
func (b *ContractBackend) PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error) {
out, err := b.bcapi.Call(ctx, toCallArgs(msg), rpc.PendingBlockNumber)
- return out, err
+ return common.FromHex(out), err
}
func toCallArgs(msg ethereum.CallMsg) ethapi.CallArgs {