Skip to content

Commit acdf923

Browse files
MariusVanDerWijdenfxfactorialfjl
authored
ethclient/gethclient: RPC client wrapper for geth-specific API (ethereum#22977)
This commit adds the package gethclient which is similar to the ethclient and implements some geth specific functionality. Co-authored-by: Edgar Aroutiounian <edgar.factorial@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com>
1 parent 4fcc93d commit acdf923

File tree

3 files changed

+551
-13
lines changed

3 files changed

+551
-13
lines changed

ethclient/ethclient.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -284,17 +284,6 @@ func (ec *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*
284284
return r, err
285285
}
286286

287-
func toBlockNumArg(number *big.Int) string {
288-
if number == nil {
289-
return "latest"
290-
}
291-
pending := big.NewInt(-1)
292-
if number.Cmp(pending) == 0 {
293-
return "pending"
294-
}
295-
return hexutil.EncodeBig(number)
296-
}
297-
298287
type rpcProgress struct {
299288
StartingBlock hexutil.Uint64
300289
CurrentBlock hexutil.Uint64
@@ -462,8 +451,6 @@ func (ec *Client) PendingTransactionCount(ctx context.Context) (uint, error) {
462451
return uint(num), err
463452
}
464453

465-
// TODO: SubscribePendingTransactions (needs server side)
466-
467454
// Contract Calling
468455

469456
// CallContract executes a message call transaction, which is directly executed in the VM
@@ -537,6 +524,17 @@ func (ec *Client) SendTransaction(ctx context.Context, tx *types.Transaction) er
537524
return ec.c.CallContext(ctx, nil, "eth_sendRawTransaction", hexutil.Encode(data))
538525
}
539526

527+
func toBlockNumArg(number *big.Int) string {
528+
if number == nil {
529+
return "latest"
530+
}
531+
pending := big.NewInt(-1)
532+
if number.Cmp(pending) == 0 {
533+
return "pending"
534+
}
535+
return hexutil.EncodeBig(number)
536+
}
537+
540538
func toCallArg(msg ethereum.CallMsg) interface{} {
541539
arg := map[string]interface{}{
542540
"from": msg.From,

ethclient/gethclient/gethclient.go

Lines changed: 235 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
1+
// Copyright 2021 The go-ethereum Authors
2+
// This file is part of the go-ethereum library.
3+
//
4+
// The go-ethereum library is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Lesser General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// The go-ethereum library is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Lesser General Public License
15+
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
16+
17+
// Package gethclient provides an RPC client for geth-specific APIs.
18+
package gethclient
19+
20+
import (
21+
"context"
22+
"math/big"
23+
"runtime"
24+
"runtime/debug"
25+
26+
"github.com/ethereum/go-ethereum"
27+
"github.com/ethereum/go-ethereum/common"
28+
"github.com/ethereum/go-ethereum/common/hexutil"
29+
"github.com/ethereum/go-ethereum/core/types"
30+
"github.com/ethereum/go-ethereum/p2p"
31+
"github.com/ethereum/go-ethereum/rpc"
32+
)
33+
34+
// Client is a wrapper around rpc.Client that implements geth-specific functionality.
35+
//
36+
// If you want to use the standardized Ethereum RPC functionality, use ethclient.Client instead.
37+
type Client struct {
38+
c *rpc.Client
39+
}
40+
41+
// New creates a client that uses the given RPC client.
42+
func New(c *rpc.Client) *Client {
43+
return &Client{c}
44+
}
45+
46+
// CreateAccessList tries to create an access list for a specific transaction based on the
47+
// current pending state of the blockchain.
48+
func (ec *Client) CreateAccessList(ctx context.Context, msg ethereum.CallMsg) (*types.AccessList, uint64, string, error) {
49+
type accessListResult struct {
50+
Accesslist *types.AccessList `json:"accessList"`
51+
Error string `json:"error,omitempty"`
52+
GasUsed hexutil.Uint64 `json:"gasUsed"`
53+
}
54+
var result accessListResult
55+
if err := ec.c.CallContext(ctx, &result, "eth_createAccessList", toCallArg(msg)); err != nil {
56+
return nil, 0, "", err
57+
}
58+
return result.Accesslist, uint64(result.GasUsed), result.Error, nil
59+
}
60+
61+
// AccountResult is the result of a GetProof operation.
62+
type AccountResult struct {
63+
Address common.Address `json:"address"`
64+
AccountProof []string `json:"accountProof"`
65+
Balance *big.Int `json:"balance"`
66+
CodeHash common.Hash `json:"codeHash"`
67+
Nonce uint64 `json:"nonce"`
68+
StorageHash common.Hash `json:"storageHash"`
69+
StorageProof []StorageResult `json:"storageProof"`
70+
}
71+
72+
// StorageResult provides a proof for a key-value pair.
73+
type StorageResult struct {
74+
Key string `json:"key"`
75+
Value *big.Int `json:"value"`
76+
Proof []string `json:"proof"`
77+
}
78+
79+
// GetProof returns the account and storage values of the specified account including the Merkle-proof.
80+
// The block number can be nil, in which case the value is taken from the latest known block.
81+
func (ec *Client) GetProof(ctx context.Context, account common.Address, keys []string, blockNumber *big.Int) (*AccountResult, error) {
82+
83+
type storageResult struct {
84+
Key string `json:"key"`
85+
Value *hexutil.Big `json:"value"`
86+
Proof []string `json:"proof"`
87+
}
88+
89+
type accountResult struct {
90+
Address common.Address `json:"address"`
91+
AccountProof []string `json:"accountProof"`
92+
Balance *hexutil.Big `json:"balance"`
93+
CodeHash common.Hash `json:"codeHash"`
94+
Nonce hexutil.Uint64 `json:"nonce"`
95+
StorageHash common.Hash `json:"storageHash"`
96+
StorageProof []storageResult `json:"storageProof"`
97+
}
98+
99+
var res accountResult
100+
err := ec.c.CallContext(ctx, &res, "eth_getProof", account, keys, toBlockNumArg(blockNumber))
101+
// Turn hexutils back to normal datatypes
102+
storageResults := make([]StorageResult, 0, len(res.StorageProof))
103+
for _, st := range res.StorageProof {
104+
storageResults = append(storageResults, StorageResult{
105+
Key: st.Key,
106+
Value: st.Value.ToInt(),
107+
Proof: st.Proof,
108+
})
109+
}
110+
result := AccountResult{
111+
Address: res.Address,
112+
AccountProof: res.AccountProof,
113+
Balance: res.Balance.ToInt(),
114+
Nonce: uint64(res.Nonce),
115+
CodeHash: res.CodeHash,
116+
StorageHash: res.StorageHash,
117+
}
118+
return &result, err
119+
}
120+
121+
// OverrideAccount specifies the state of an account to be overridden.
122+
type OverrideAccount struct {
123+
Nonce uint64 `json:"nonce"`
124+
Code []byte `json:"code"`
125+
Balance *big.Int `json:"balance"`
126+
State map[common.Hash]common.Hash `json:"state"`
127+
StateDiff map[common.Hash]common.Hash `json:"stateDiff"`
128+
}
129+
130+
// CallContract executes a message call transaction, which is directly executed in the VM
131+
// of the node, but never mined into the blockchain.
132+
//
133+
// blockNumber selects the block height at which the call runs. It can be nil, in which
134+
// case the code is taken from the latest known block. Note that state from very old
135+
// blocks might not be available.
136+
//
137+
// overrides specifies a map of contract states that should be overwritten before executing
138+
// the message call.
139+
// Please use ethclient.CallContract instead if you don't need the override functionality.
140+
func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int, overrides *map[common.Address]OverrideAccount) ([]byte, error) {
141+
var hex hexutil.Bytes
142+
err := ec.c.CallContext(
143+
ctx, &hex, "eth_call", toCallArg(msg),
144+
toBlockNumArg(blockNumber), toOverrideMap(overrides),
145+
)
146+
return hex, err
147+
}
148+
149+
// GCStats retrieves the current garbage collection stats from a geth node.
150+
func (ec *Client) GCStats(ctx context.Context) (*debug.GCStats, error) {
151+
var result debug.GCStats
152+
err := ec.c.CallContext(ctx, &result, "debug_gcStats")
153+
return &result, err
154+
}
155+
156+
// MemStats retrieves the current memory stats from a geth node.
157+
func (ec *Client) MemStats(ctx context.Context) (*runtime.MemStats, error) {
158+
var result runtime.MemStats
159+
err := ec.c.CallContext(ctx, &result, "debug_memStats")
160+
return &result, err
161+
}
162+
163+
// SetHead sets the current head of the local chain by block number.
164+
// Note, this is a destructive action and may severely damage your chain.
165+
// Use with extreme caution.
166+
func (ec *Client) SetHead(ctx context.Context, number *big.Int) error {
167+
return ec.c.CallContext(ctx, nil, "debug_setHead", toBlockNumArg(number))
168+
}
169+
170+
// GetNodeInfo retrieves the node info of a geth node.
171+
func (ec *Client) GetNodeInfo(ctx context.Context) (*p2p.NodeInfo, error) {
172+
var result p2p.NodeInfo
173+
err := ec.c.CallContext(ctx, &result, "admin_nodeInfo")
174+
return &result, err
175+
}
176+
177+
// SubscribePendingTransactions subscribes to new pending transactions.
178+
func (ec *Client) SubscribePendingTransactions(ctx context.Context, ch chan<- common.Hash) (*rpc.ClientSubscription, error) {
179+
return ec.c.EthSubscribe(ctx, ch, "newPendingTransactions")
180+
}
181+
182+
func toBlockNumArg(number *big.Int) string {
183+
if number == nil {
184+
return "latest"
185+
}
186+
pending := big.NewInt(-1)
187+
if number.Cmp(pending) == 0 {
188+
return "pending"
189+
}
190+
return hexutil.EncodeBig(number)
191+
}
192+
193+
func toCallArg(msg ethereum.CallMsg) interface{} {
194+
arg := map[string]interface{}{
195+
"from": msg.From,
196+
"to": msg.To,
197+
}
198+
if len(msg.Data) > 0 {
199+
arg["data"] = hexutil.Bytes(msg.Data)
200+
}
201+
if msg.Value != nil {
202+
arg["value"] = (*hexutil.Big)(msg.Value)
203+
}
204+
if msg.Gas != 0 {
205+
arg["gas"] = hexutil.Uint64(msg.Gas)
206+
}
207+
if msg.GasPrice != nil {
208+
arg["gasPrice"] = (*hexutil.Big)(msg.GasPrice)
209+
}
210+
return arg
211+
}
212+
213+
func toOverrideMap(overrides *map[common.Address]OverrideAccount) interface{} {
214+
if overrides == nil {
215+
return nil
216+
}
217+
type overrideAccount struct {
218+
Nonce hexutil.Uint64 `json:"nonce"`
219+
Code hexutil.Bytes `json:"code"`
220+
Balance *hexutil.Big `json:"balance"`
221+
State map[common.Hash]common.Hash `json:"state"`
222+
StateDiff map[common.Hash]common.Hash `json:"stateDiff"`
223+
}
224+
result := make(map[common.Address]overrideAccount)
225+
for addr, override := range *overrides {
226+
result[addr] = overrideAccount{
227+
Nonce: hexutil.Uint64(override.Nonce),
228+
Code: override.Code,
229+
Balance: (*hexutil.Big)(override.Balance),
230+
State: override.State,
231+
StateDiff: override.StateDiff,
232+
}
233+
}
234+
return &result
235+
}

0 commit comments

Comments
 (0)