fix indexing err on wasm-nft minting / pair collecting

go.work

@@ -4,6 +4,8 @@ use (
 	.
 	./submodules/block
 	./submodules/move-nft
-	./submodules/pair
+	./submodules/move-pair
+	./submodules/wasm-nft
+	./submodules/wasm-pair
 	./submodules/tx
 )

proto/indexer/pair/v1/query.proto

@@ -8,7 +8,7 @@ import "google/api/annotations.proto";
 import "cosmos_proto/cosmos.proto";
 import "indexer/pair/v1/types.proto";
 
-option go_package = "github.com/initia-labs/kvindexer/submodules/pair/types";
+option go_package = "github.com/initia-labs/kvindexer/pair/types";
 
 // Query provides the service definition for the Token Pairs
 service Query {

proto/indexer/pair/v1/types.proto

@@ -5,7 +5,7 @@ package indexer.pair.v1;
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/initia-labs/kvindexer/submodules/pair/types";
+option go_package = "github.com/initia-labs/kvindexer/pair/types";
 option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = true;
 

submodules/pair/collect.go → submodules/move-pair/collect.go

@@ -1,10 +1,9 @@
-package pair
+package move_pair
 
 import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 
 	"cosmossdk.io/collections"
 	cosmoserr "cosmossdk.io/errors"
@@ -18,11 +17,12 @@ import (
 	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
-	"github.com/initia-labs/kvindexer/submodules/pair/types"
+	"github.com/initia-labs/kvindexer/submodules/move-pair/types"
 )
 
 const (
-	ibcTransferPort = "transfer"
+	ibcTransferPort    = "transfer"
+	ibcNftTransferPort = "nft-transfer"
 )
 
 func (sm PairSubmodule) finalizeBlock(ctx context.Context, req abci.RequestFinalizeBlock, res abci.ResponseFinalizeBlock) error {
@@ -77,27 +77,19 @@ func (sm PairSubmodule) collectOPfungibleTokens(ctx context.Context, msg *opchil
 
 func (sm PairSubmodule) collectIBCNonfungibleTokens(ctx context.Context, txResult *abci.ExecTxResult) (err error) {
 	var packetData, classId string
-
 	for _, event := range txResult.Events {
-		switch event.Type {
-		case "recv_packet":
+		if event.Type == "recv_packet" {
+			if sm.pickAttribute(event.Attributes, "packet_src_port") != ibcNftTransferPort {
+				continue
+			}
 			packetData = sm.pickAttribute(event.Attributes, "packet_data")
-		case "class_trace":
+		} else if event.Type == "class_trace" {
 			classId = sm.pickAttribute(event.Attributes, "class_id")
-			if err != nil {
-				sm.Logger(ctx).Warn("failed to handle class_trace event", "error", err, "event", event)
-			}
-		}
-		if packetData != "" && classId != "" {
-			break
 		}
 	}
-	if packetData == "" || classId == "" {
-		return nil
-	}
-	err = sm.pricessPairEvent(ctx, packetData, classId)
+	err = sm.pricessIbcNftPairEvent(ctx, packetData, classId)
 	if err != nil {
-		sm.Logger(ctx).Warn("failed to handle recv_packet event", "error", err, "recv_packet.packet_data", packetData, "class_trace.class_id", classId)
+		sm.Logger(ctx).Warn("failed to handle recv_packet event", "error", err, "recv_packet.packet_data", packetData)
 	}
 
 	return nil
@@ -112,10 +104,17 @@ func (sm PairSubmodule) pickAttribute(attrs []abci.EventAttribute, key string) s
 	return ""
 }
 
-func (sm PairSubmodule) pricessPairEvent(ctx context.Context, packetDataStr, classId string) (err error) {
-	sm.Logger(ctx).Debug("processPairEvent", "packet_data", packetDataStr, "class_id", classId)
+func (sm PairSubmodule) generateCw721FromIcs721PortInfo(port, channel string) string {
+	return port + "/" + channel
+}
 
+func (sm PairSubmodule) pricessIbcNftPairEvent(ctx context.Context, packetDataStr, classId string) (err error) {
 	packetData := types.PacketData{}
+
+	if packetDataStr == "" || classId == "" {
+		return nil
+	}
+
 	if err = json.Unmarshal([]byte(packetDataStr), &packetData); err != nil {
 		// may be not target
 		return nil
@@ -130,73 +129,40 @@ func (sm PairSubmodule) pricessPairEvent(ctx context.Context, packetDataStr, cla
 		return cosmoserr.Wrap(err, "failed to unmarshal class data")
 	}
 
-	_, err = sm.GetPair(ctx, false, classId)
-	if err == nil {
-		return nil // already exists
-	}
-	if !cosmoserr.IsOf(err, collections.ErrNotFound) {
-		return cosmoserr.Wrap(err, "failed to check class existence")
-	}
+	// block this part overwrite to recent
+	// _, err = sm.GetPair(ctx, false, packetData.ClassId)
+	// if err == nil {
+	// 	return nil // already exists
+	// }
+	// if !cosmoserr.IsOf(err, collections.ErrNotFound) {
+	// 	return cosmoserr.Wrap(err, "failed to check class existence")
+	// }
 
 	err = sm.SetPair(ctx, false, false, classId, classData.Name)
 	if err != nil {
 		return cosmoserr.Wrap(err, "failed to set class")
 	}
 
-	sm.Logger(ctx).Info("nft class added", "classId", classId, "classData", classData)
+	sm.Logger(ctx).Info("nft class added", "pakcetData", packetData, "classData", classData)
 	return nil
 }
 
 func (sm PairSubmodule) collectIBCFungibleTokens(ctx context.Context) error {
 
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	chKeeper := sm.channelKeeper
 
-	// get all channels
-	channels := chKeeper.GetAllChannels(sdkCtx)
-
-	ibcChannels := []string{}
-	for _, channel := range channels {
-		if channel.PortId != ibcTransferPort {
+	traces := sm.transferKeeper.GetAllDenomTraces(sdkCtx)
+	for _, trace := range traces {
+		_, err := sm.fungiblePairsMap.Get(ctx, trace.IBCDenom())
+		if err != nil && !cosmoserr.IsOf(err, collections.ErrNotFound) {
 			continue
 		}
-
-		_ /*clientId*/, cs, err := chKeeper.GetChannelClientState(sdkCtx, channel.PortId, channel.ChannelId)
+		err = sm.fungiblePairsMap.Set(ctx, trace.IBCDenom(), trace.BaseDenom)
 		if err != nil {
-			sm.Logger(ctx).Warn("GetChannelClientState", "error", err)
-		}
-		counterpartyChainId := getChainIdFromClientState(cs)
-		if counterpartyChainId == "" {
-			sm.Logger(ctx).Warn("channel id is nil")
-			continue
-		}
-		if counterpartyChainId != sdk.UnwrapSDKContext(ctx).ChainID() {
-			continue
-		}
-		ibcChannels = append(ibcChannels, channel.ChannelId)
-	}
-
-	traces := sm.transferKeeper.GetAllDenomTraces(sdkCtx)
-	for _, ibcChannel := range ibcChannels {
-		for _, trace := range traces {
-			if trace.Path != fmt.Sprintf("%s/%s", ibcTransferPort, ibcChannel) {
-				continue
-			}
-
-			prevDenom, err := sm.fungiblePairsMap.Get(ctx, trace.IBCDenom())
-			if err != nil && !cosmoserr.IsOf(err, collections.ErrNotFound) {
-				continue
-			}
-			// prevDenom should be empty string if not found, or already set
-			if prevDenom == trace.BaseDenom {
-				continue
-			}
-
-			err = sm.fungiblePairsMap.Set(ctx, trace.IBCDenom(), trace.BaseDenom)
-			if err != nil {
-				return err
-			}
+			sm.Logger(ctx).Warn("failed to set fungible pair", "ibcDenom", trace.IBCDenom(), "baseDenom", trace.BaseDenom, "error", err)
+			return err
 		}
+		sm.Logger(ctx).Info("fungible pair added", "ibcDenom", trace.IBCDenom(), "baseDenom", trace.BaseDenom)
 	}
 
 	return nil

submodules/pair/go.mod → submodules/move-pair/go.mod

@@ -1,4 +1,4 @@
-module github.com/initia-labs/kvindexer/submodules/pair
+module github.com/initia-labs/kvindexer/submodules/move-pair
 
 go 1.22
 

submodules/pair/grpc_query.go → submodules/move-pair/grpc_query.go

@@ -1,11 +1,11 @@
-package pair
+package move_pair
 
 import (
 	"context"
 
 	"cosmossdk.io/collections"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	"github.com/initia-labs/kvindexer/submodules/pair/types"
+	"github.com/initia-labs/kvindexer/pair/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

submodules/pair/interface.go → submodules/move-pair/interface.go

@@ -1,4 +1,4 @@
-package pair
+package move_pair
 
 import (
 	"context"