Parachain Relayer V2

relayer/relays/parachain/scanner.go

@@ -82,13 +82,16 @@ func (s *Scanner) findTasks(
 	var pendingOrders []PendingOrder
 	for _, key := range keys {
 		var pendingOrder PendingOrder
-		ok, err := s.paraConn.API().RPC.State.GetStorage(key, &pendingOrder, paraHash)
+		value, err := s.paraConn.API().RPC.State.GetStorageRaw(key, paraHash)
 		if err != nil {
 			return nil, fmt.Errorf("fetch value of pendingOrder with key '%v' and hash '%v': %w", key, paraHash, err)
 		}
-		if ok {
-			pendingOrders = append(pendingOrders, pendingOrder)
+		decoder := scale.NewDecoder(bytes.NewReader(*value))
+		err = decoder.Decode(&pendingOrder)
+		if err != nil {
+			return nil, fmt.Errorf("decode order error: %w", err)
 		}
+		pendingOrders = append(pendingOrders, pendingOrder)
 	}
 
 	tasks, err := s.findTasksImpl(

relayer/relays/parachain/types_v2.go

@@ -3,6 +3,7 @@ package parachain
 import (
 	"math/big"
 
+	"github.com/snowfork/go-substrate-rpc-client/v4/scale"
 	"github.com/snowfork/go-substrate-rpc-client/v4/types"
 	"github.com/snowfork/snowbridge/relayer/contracts"
 )
@@ -58,7 +59,28 @@ type MessageProofV2 struct {
 }
 
 type PendingOrder struct {
-	Nonce       types.U64
-	BlockNumber types.U32
-	Fee         types.U128
+	Nonce       uint64
+	BlockNumber uint32
+	Fee         big.Int
+}
+
+func (p *PendingOrder) Decode(decoder scale.Decoder) error {
+	var nonce types.U64
+	err := decoder.Decode(&nonce)
+	if err != nil {
+		return err
+	}
+	p.Nonce = uint64(nonce)
+	var blockNumber types.U32
+	err = decoder.Decode(&blockNumber)
+	if err != nil {
+		return err
+	}
+	p.BlockNumber = uint32(blockNumber)
+	decoded, err := decoder.DecodeUintCompact()
+	if err != nil {
+		return err
+	}
+	p.Fee = *types.U128{Int: decoded}.Int
+	return nil
 }