Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

fix: align empty account result for old blocks as ethereum #1484

Merged
merged 12 commits into from
Nov 25, 2022
Merged

fix: align empty account result for old blocks as ethereum #1484

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a0469d
align result account as ethereum
mmsqe Nov 22, 2022
6846276
add test_get_transaction_count
mmsqe Nov 23, 2022
161b956
Merge branch 'main' into align_acc
mmsqe Nov 23, 2022
523070c
add change doc
mmsqe Nov 23, 2022
c5a920f
sync gomod2nix
mmsqe Nov 23, 2022
d3acf51
Merge branch 'main' into align_acc
mmsqe Nov 23, 2022
1386c54
Apply suggestions from code review
mmsqe Nov 23, 2022
7def9c5
Merge branch 'main' into align_acc
mmsqe Nov 24, 2022
61ebba8
crosscheck with ws & geth
mmsqe Nov 23, 2022
58f4404
sync gomod2nix
mmsqe Nov 24, 2022
5f009ae
Update rpc/backend/utils.go
fedekunze Nov 24, 2022
e433734
use session provider
mmsqe Nov 24, 2022
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
11 changes: 10 additions & 1 deletion rpc/backend/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down Expand Up @@ -46,8 +48,15 @@ func (s sortGasAndReward) Less(i, j int) bool {
// Todo: include the ability to specify a blockNumber
func (b *Backend) getAccountNonce(accAddr common.Address, pending bool, height int64, logger log.Logger) (uint64, error) {
queryClient := authtypes.NewQueryClient(b.clientCtx)
res, err := queryClient.Account(types.ContextWithHeight(height), &authtypes.QueryAccountRequest{Address: sdk.AccAddress(accAddr.Bytes()).String()})
adr := sdk.AccAddress(accAddr.Bytes()).String()
ctx := types.ContextWithHeight(height)
res, err := queryClient.Account(ctx, &authtypes.QueryAccountRequest{Address: adr})
fedekunze marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
st, ok := status.FromError(err)
// treat as account doesn't exist yet
if ok && st.Code() == codes.NotFound {
err = nil
fedekunze marked this conversation as resolved.
Show resolved Hide resolved
}
return 0, err
}
var acc authtypes.AccountI
Expand Down