fix de-list and getTxFromTxHash

Author: nkitlabs

cylinder/client/client.go

@@ -97,10 +97,9 @@ func (c *Client) Subscribe(subscriber, query string, outCapacity ...int) (out <-
 
 // GetTxFromTxHash retrieves the transaction response for the given transaction hash.
 // It waits for the transaction to be committed and returns the transaction response or an error if it exceeds timeout.
-func (c *Client) GetTxFromTxHash(txHash string) (*sdk.TxResponse, error) {
-	var err error
+func (c *Client) GetTxFromTxHash(txHash string) (txRes *sdk.TxResponse, err error) {
 	for start := time.Now(); time.Since(start) < c.timeout; {
-		txRes, err := authtx.QueryTx(c.context, txHash)
+		txRes, err = authtx.QueryTx(c.context, txHash)
 		if err != nil {
 			time.Sleep(c.pollInterval)
 			continue

x/tss/keeper/grpc_query.go

@@ -123,8 +123,7 @@ func (q queryServer) DE(goCtx context.Context, req *types.QueryDERequest) (*type
 	var des []types.DE
 	deStore := prefix.NewStore(ctx.KVStore(q.k.storeKey), types.DEStoreKeyPerAddressPrefix(accAddress))
 	pageRes, err := query.Paginate(deStore, req.Pagination, func(key []byte, value []byte) error {
-		var de types.DE
-		q.k.cdc.MustUnmarshal(value, &de)
+		de := types.ExtractValueFromDEPaginationKey(key)
 		des = append(des, de)
 		return nil
 	})

x/tss/types/keys.go

@@ -206,6 +206,14 @@ func ExtractValueFromDEStoreKey(key []byte) (sdk.AccAddress, DE) {
 	return address, DE{PubD: pubD, PubE: pubE}
 }
 
+// ExtractValueFromDEPaginationKey returns DE information that is retrieved from the key
+func ExtractValueFromDEPaginationKey(key []byte) DE {
+	lenPubD := int(key[0])
+	pubD := key[1 : 1+lenPubD]
+	pubE := key[2+lenPubD:]
+	return DE{PubD: pubD, PubE: pubE}
+}
+
 // DEStoreKeyPerAddressPrefix returns the prefix of the key for user's DE.
 func DEStoreKeyPerAddressPrefix(address sdk.AccAddress) []byte {
 	return append(append(DEStoreKeyPrefix, byte(len(address))), address...)