[statequery] query with real trie key bytes instead of variable string names

chain/chainservice.go

@@ -23,7 +23,6 @@ import (
 	"github.com/aergoio/aergo/contract/name"
 	"github.com/aergoio/aergo/contract/system"
 	"github.com/aergoio/aergo/fee"
-	"github.com/aergoio/aergo/internal/common"
 	"github.com/aergoio/aergo/internal/enc"
 	"github.com/aergoio/aergo/message"
 	"github.com/aergoio/aergo/pkg/component"
@@ -781,8 +780,7 @@ func (cw *ChainWorker) Receive(context actor.Context) {
 		} else if contractProof.Inclusion {
 			contractTrieRoot := contractProof.State.StorageRoot
 			for _, storageKey := range msg.StorageKeys {
-				trieKey := common.Hasher([]byte(storageKey))
-				varProof, err := cw.sdb.GetStateDB().GetVarAndProof(trieKey, contractTrieRoot, msg.Compressed)
+				varProof, err := cw.sdb.GetStateDB().GetVarAndProof(storageKey, contractTrieRoot, msg.Compressed)
 				varProof.Key = storageKey
 				varProofs = append(varProofs, varProof)
 				if err != nil {

cmd/aergocli/cmd/contract.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/aergoio/aergo/cmd/aergocli/util"
 	luacEncoding "github.com/aergoio/aergo/cmd/aergoluac/encoding"
+	"github.com/aergoio/aergo/internal/common"
 	"github.com/aergoio/aergo/types"
 	"github.com/mr-tron/base58/base58"
 	"github.com/spf13/cobra"
@@ -33,10 +34,10 @@ func init() {
 	}
 
 	deployCmd := &cobra.Command{
-		Use:   "deploy [flags] --payload 'payload string' creator\n  aergocli contract deploy [flags] creator bcfile abifile",
-		Short: "Deploy a compiled contract to the server",
-		Args:  cobra.MinimumNArgs(1),
-		Run:   runDeployCmd,
+		Use:                   "deploy [flags] --payload 'payload string' creator\n  aergocli contract deploy [flags] creator bcfile abifile",
+		Short:                 "Deploy a compiled contract to the server",
+		Args:                  cobra.MinimumNArgs(1),
+		Run:                   runDeployCmd,
 		DisableFlagsInUseLine: true,
 	}
 	deployCmd.PersistentFlags().StringVar(&data, "payload", "", "result of compiling a contract")
@@ -328,15 +329,16 @@ func runQueryStateCmd(cmd *cobra.Command, args []string) {
 			return
 		}
 	}
-	storageKey := bytes.NewBufferString("_sv_")
-	storageKey.WriteString(args[1])
+	storageKeyPlain := bytes.NewBufferString("_sv_")
+	storageKeyPlain.WriteString(args[1])
 	if len(args) > 2 {
-		storageKey.WriteString("-")
-		storageKey.WriteString(args[2])
+		storageKeyPlain.WriteString("-")
+		storageKeyPlain.WriteString(args[2])
 	}
+	storageKey := common.Hasher([]byte(storageKeyPlain.Bytes()))
 	stateQuery := &types.StateQuery{
 		ContractAddress: contract,
-		StorageKeys:     []string{storageKey.String()},
+		StorageKeys:     [][]byte{storageKey},
 		Root:            root,
 		Compressed:      compressed,
 	}

message/blockchainmsg.go

@@ -96,7 +96,7 @@ type GetQueryRsp struct {
 }
 type GetStateQuery struct {
 	ContractAddress []byte
-	StorageKeys     []string
+	StorageKeys     [][]byte
 	Root            []byte
 	Compressed      bool
 }