forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rpc fixes continued

Browse source
This commit is contained in:
Christopher Franko 2016-05-18 22:26:25 -04:00
parent 02cc702d0f
commit 8d53a2d73e
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
accounts/abi/bind/backends/remote.go
View file

@ -127,7 +127,7 @@ func (b *rpcBackend) ContractCall(contract common.Address, data []byte, pending
if pending { if pending {
block = "pending" block = "pending"
} }
res, err := b.request("eth_call", []interface{}{args, block}) res, err := b.request("exp_call", []interface{}{args, block})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -142,7 +142,7 @@ func (b *rpcBackend) ContractCall(contract common.Address, data []byte, pending
// PendingAccountNonce implements ContractTransactor.PendingAccountNonce, delegating // PendingAccountNonce implements ContractTransactor.PendingAccountNonce, delegating
// the current account nonce retrieval to the remote node. // the current account nonce retrieval to the remote node.
func (b *rpcBackend) PendingAccountNonce(account common.Address) (uint64, error) { func (b *rpcBackend) PendingAccountNonce(account common.Address) (uint64, error) {
res, err := b.request("eth_getTransactionCount", []interface{}{account.Hex(), "pending"}) res, err := b.request("exp_getTransactionCount", []interface{}{account.Hex(), "pending"})
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -160,7 +160,7 @@ func (b *rpcBackend) PendingAccountNonce(account common.Address) (uint64, error)
// SuggestGasPrice implements ContractTransactor.SuggestGasPrice, delegating the // SuggestGasPrice implements ContractTransactor.SuggestGasPrice, delegating the
// gas price oracle request to the remote node. // gas price oracle request to the remote node.
func (b *rpcBackend) SuggestGasPrice() (*big.Int, error) { func (b *rpcBackend) SuggestGasPrice() (*big.Int, error) {
res, err := b.request("eth_gasPrice", nil) res, err := b.request("exp_gasPrice", nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -191,7 +191,7 @@ func (b *rpcBackend) EstimateGasLimit(sender common.Address, contract *common.Ad
Value: rpc.NewHexNumber(value), Value: rpc.NewHexNumber(value),
} }
// Execute the RPC call and retrieve the response // Execute the RPC call and retrieve the response
res, err := b.request("eth_estimateGas", []interface{}{args}) res, err := b.request("exp_estimateGas", []interface{}{args})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -213,7 +213,7 @@ func (b *rpcBackend) SendTransaction(tx *types.Transaction) error {
if err != nil { if err != nil {
return err return err
} }
res, err := b.request("eth_sendRawTransaction", []interface{}{common.ToHex(data)}) res, err := b.request("exp_sendRawTransaction", []interface{}{common.ToHex(data)})
if err != nil { if err != nil {
return err return err
} }

4
core/types/transaction.go
View file

@ -168,7 +168,7 @@ func (tx *Transaction) Size() common.StorageSize {
// Frontier / Homestead. however, the first time called it runs // Frontier / Homestead. however, the first time called it runs
// signature validations, so we need two versions. This makes it // signature validations, so we need two versions. This makes it
// easier to ensure backwards compatibility of things like package rpc // easier to ensure backwards compatibility of things like package rpc
// where eth_getblockbynumber uses tx.From() and needs to work for // where exp_getblockbynumber uses tx.From() and needs to work for
// both txs before and after the first homestead block. Signatures // both txs before and after the first homestead block. Signatures
// valid in homestead are a subset of valid ones in Frontier) // valid in homestead are a subset of valid ones in Frontier)
func (tx *Transaction) From() (common.Address, error) { func (tx *Transaction) From() (common.Address, error) {
@ -186,7 +186,7 @@ func (tx *Transaction) From() (common.Address, error) {
// Frontier / Homestead. however, the first time called it runs // Frontier / Homestead. however, the first time called it runs
// signature validations, so we need two versions. This makes it // signature validations, so we need two versions. This makes it
// easier to ensure backwards compatibility of things like package rpc // easier to ensure backwards compatibility of things like package rpc
// where eth_getblockbynumber uses tx.From() and needs to work for // where exp_getblockbynumber uses tx.From() and needs to work for
// both txs before and after the first homestead block. Signatures // both txs before and after the first homestead block. Signatures
// valid in homestead are a subset of valid ones in Frontier) // valid in homestead are a subset of valid ones in Frontier)
func (tx *Transaction) FromFrontier() (common.Address, error) { func (tx *Transaction) FromFrontier() (common.Address, error) {

2
logger/types.go
View file

@ -44,7 +44,7 @@ type LogEvent struct {
type LogStarting struct { type LogStarting struct {
ClientString string `json:"client_impl"` ClientString string `json:"client_impl"`
ProtocolVersion int `json:"eth_version"` ProtocolVersion int `json:"exp_version"`
LogEvent LogEvent
} }

6
rpc/json.go
View file

@ -32,9 +32,9 @@ import (
const ( const (
jsonRPCVersion = "2.0" jsonRPCVersion = "2.0"
serviceMethodSeparator = "_" serviceMethodSeparator = "_"
subscribeMethod = "eth_subscribe" subscribeMethod = "exp_subscribe"
unsubscribeMethod = "eth_unsubscribe" unsubscribeMethod = "exp_unsubscribe"
notificationMethod = "eth_subscription" notificationMethod = "exp_subscription"
) )
// JSON-RPC request // JSON-RPC request