Skip to content

Geth 1.10.3 fix - incorrect type for /accounts/balance response graphQLBalance:Data.Block.Number #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Geth 1.10.3 fix - incorrect type for /accounts/balance response graphQLBalance:Data.Block.Number #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
256de2b
Upgrade go-ethereum to v.1.10.3
akramhussein Jun 11, 2021
7b30f90
Update graphqlBalance struct - number should be integer
akramhussein Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
# Compile geth
FROM golang-builder as geth-builder

# VERSION: go-ethereum v.1.9.24
# VERSION: go-ethereum v.1.10.3
RUN git clone https://github.com/ethereum/go-ethereum \
&& cd go-ethereum \
&& git checkout cc05b050df5f88e80bb26aaf6d2f339c49c2d702
&& git checkout 991384a7f6719e1125ca0be7fb27d0c4d1c5d2d3

RUN cd go-ethereum \
&& make geth
Expand Down
8 changes: 2 additions & 6 deletions ethereum/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ type graphqlBalance struct {
Data struct {
Block struct {
Hash string `json:"hash"`
Number string `json:"number"`
Number int64 `json:"number"`
Account struct {
Balance string `json:"balance"`
Nonce string `json:"transactionCount"`
Expand Down Expand Up @@ -1127,10 +1127,6 @@ func (ec *Client) Balance(
return nil, errors.New(RosettaTypes.PrintStruct(bal.Errors))
}

blockIndex, ok := new(big.Int).SetString(bal.Data.Block.Number[2:], 16)
if !ok {
return nil, fmt.Errorf("could not extract block index from %s", bal.Data.Block.Number)
}
balance, ok := new(big.Int).SetString(bal.Data.Block.Account.Balance[2:], 16)
if !ok {
return nil, fmt.Errorf(
Expand All @@ -1155,7 +1151,7 @@ func (ec *Client) Balance(
},
BlockIdentifier: &RosettaTypes.BlockIdentifier{
Hash: bal.Data.Block.Hash,
Index: blockIndex.Int64(),
Index: bal.Data.Block.Number,
},
Metadata: map[string]interface{}{
"nonce": nonce.Int64(),
Expand Down
2 changes: 1 addition & 1 deletion ethereum/testdata/account_balance_0x4cfc400fed52f9681b42454c2db4b18ab98f8de1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"data": {
"block": {
"hash": "0x9999286598edf07606228ba0233736e544a086a8822c61f9db3706887fc25dda",
"number": "0x1fe5",
"number": 8165,
"account": {
"balance": "0x2324c0d180077fe7000",
"transactionCount": "0x0",
Expand Down
2 changes: 1 addition & 1 deletion ethereum/testdata/account_balance_invalid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"data": {
"block": {
"hash": "0x9b3483b52f88228eae8500cafdd61f129ed6803b7d4b37082af5ca1d299e8e04",
"number": "0x880fc5"
"number": 8916933
}
}
}