Merge pull request #15 from bianjieai/dreamer/fix-class-id

fix: solve the problem of "/" parsing error in classID

keeper/relay.go

@@ -167,8 +167,10 @@ func (k Keeper) refundPacketToken(ctx sdk.Context, packet channeltypes.Packet, d
 		return err
 	}
 
-	classTrace := types.ParseClassTrace(data.ClassId)
-	voucherClassID := classTrace.IBCClassID()
+	voucherClassID, err := k.GetVoucherClassID(ctx, data.ClassId)
+	if err != nil {
+		return err
+	}
 	if types.IsAwayFromOrigin(packet.GetSourcePort(), packet.GetSourceChannel(), data.ClassId) {
 		for _, tokenID := range data.TokenIds {
 			if err := k.nftKeeper.Transfer(ctx, voucherClassID, tokenID, "", sender); err != nil {
@@ -339,7 +341,11 @@ func (k Keeper) processReceivedPacket(ctx sdk.Context, packet channeltypes.Packe
 	if err != nil {
 		return err
 	}
-	voucherClassID := types.ParseClassTrace(unprefixedClassID).IBCClassID()
+
+	voucherClassID, err := k.GetVoucherClassID(ctx, unprefixedClassID)
+	if err != nil {
+		return err
+	}
 
 	escrowAddress := types.GetEscrowAddress(packet.GetDestPort(), packet.GetDestChannel())
 	for i, tokenID := range data.TokenIds {
@@ -357,3 +363,24 @@ func (k Keeper) processReceivedPacket(ctx sdk.Context, packet channeltypes.Packe
 	}
 	return nil
 }
+
+func (k Keeper) GetVoucherClassID(ctx sdk.Context, classID string) (string, error) {
+
+	// If "/" is not included after removing the prefix,
+	// it means that nft has returned to the initial chain, and the classID after removing the prefix is the real classID
+	if !strings.Contains(classID, "/") {
+		return classID, nil
+	}
+
+	// If "/" is included after removing the prefix, there are two situations:
+	//	1. The original classID itself contains "/",
+	//	2. The current nft returns to the relay chain, not the original chain
+
+	// First deal with case 1, if the classID can be found, return the result
+	if k.nftKeeper.HasClass(ctx, classID) {
+		return classID, nil
+	}
+
+	// If not found, generate classID according to classTrace
+	return types.ParseClassTrace(classID).IBCClassID(), nil
+}