Skip to content

accept account key on GetState RPC #358

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

accept account key on GetState RPC #358

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
0c329a4
accept account key (32 bytes) on GetState
kroggen May 31, 2024
7a1e97f
Merge branch 'develop' into topic/get-state-using-account-key
kroggen Jun 4, 2024
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
9 changes: 7 additions & 2 deletions chain/chainservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ func getAddressNameResolved(sdb *statedb.StateDB, account []byte) ([]byte, error
if len(account) == types.NameLength {
scs, err := statedb.GetNameAccountState(sdb)
if err != nil {
logger.Error().Str("hash", base58.Encode(account)).Err(err).Msg("failed to get state for account")
logger.Error().Str("hash", base58.Encode(account)).Err(err).Msg("failed to get state for name account")
return nil, err
}
return name.GetAddress(scs, account), nil
Expand Down Expand Up @@ -770,7 +770,12 @@ func (cw *ChainWorker) Receive(context actor.Context) {
})
return
}
id := types.ToAccountID(address)
var id types.AccountID
if len(address) == 32 {
id = types.AccountID(types.ToHashID(address))
} else {
id = types.ToAccountID(address)
}
accState, err := sdb.GetAccountState(id)
if err != nil {
logger.Error().Str("hash", base58.Encode(address)).Err(err).Msg("failed to get state for account")
Expand Down
13 changes: 11 additions & 2 deletions cmd/aergocli/cmd/getstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package cmd
import (
"context"

"github.com/aergoio/aergo/v2/internal/enc/hex"
"github.com/aergoio/aergo/v2/internal/enc/base58"
"github.com/aergoio/aergo/v2/types"
"github.com/aergoio/aergo/v2/types/jsonrpc"
Expand All @@ -21,7 +22,7 @@ var getstateCmd = &cobra.Command{
}

func init() {
getstateCmd.Flags().StringVar(&address, "address", "", "Get state from the address")
getstateCmd.Flags().StringVar(&address, "address", "", "Get state from the address or hex key")
getstateCmd.MarkFlagRequired("address")
getstateCmd.Flags().StringVar(&stateroot, "root", "", "Get the state at a specified state root")
getstateCmd.Flags().BoolVar(&proof, "proof", false, "Get the proof for the state")
Expand All @@ -33,19 +34,27 @@ func init() {

func execGetState(cmd *cobra.Command, args []string) {
var root []byte
var addr []byte
var err error

if len(stateroot) != 0 {
root, err = base58.Decode(stateroot)
if err != nil {
cmd.Printf("decode error: %s", err.Error())
return
}
}
addr, err := types.DecodeAddress(address)

if len(address) == 64 {
addr, err = hex.Decode(address)
} else {
addr, err = types.DecodeAddress(address)
}
if err != nil {
cmd.Printf("Failed: %s\n", err.Error())
return
}

if staking {
msg, err := client.GetStaking(context.Background(),
&types.AccountAddress{Value: addr})
Expand Down