checks at FullNode side

client/diagnostic.go

@@ -86,10 +86,11 @@ func (c *Client) GetNFTTokenData(token string, latest bool) (*model.NFTDataReply
 
 }
 
-func (c *Client) RemoveTokenChainBlock(token string, latest bool) (*model.TCRemoveReply, error) {
+func (c *Client) RemoveTokenChainBlock(token string, latest bool, blockID string) (*model.TCRemoveReply, error) {
 	removeReq := &model.TCRemoveRequest{
-		Token:  token,
-		Latest: latest,
+		Token:   token,
+		Latest:  latest,
+		BlockID: blockID,
 	}
 	var removeReply model.TCRemoveReply
 	err := c.sendJSONRequest("POST", setup.APIRemoveTokenChainBlock, nil, removeReq, &removeReply)

command/command.go

@@ -330,6 +330,7 @@ type Command struct {
 	rawCodePath                  string
 	smartContractToken           string
 	newContractBlock             string
+	BlockID                      string
 	publishType                  int
 	smartContractData            string
 	executorAddr                 string
@@ -628,11 +629,6 @@ func (cmd *Command) runApp() {
 		c.SubscribeTCDetails()
 	}
 
-	// Start background job: retry failed-to-sync tokens every 1 hour
-	if cmd.fullNode {
-		c.RetryFailedTokenSync()
-	}
-
 	ch := make(chan os.Signal, 1)
 	signal.Notify(ch, syscall.SIGTERM)
 	signal.Notify(ch, syscall.SIGINT)

command/diagnostic.go

@@ -148,10 +148,13 @@ func (cmd *Command) dumpTokenChain() {
 		}
 	}
 
-	elems := strings.Split(cmd.token, "_")
-	if len(elems) < 2 {
-		cmd.log.Error(fmt.Sprintf("Invalid token: %v", cmd.token))
-		return
+	if cmd.assetType == "rbt"  {
+		elems := strings.Split(cmd.token, "_")
+		if len(elems) < 2 {
+			cmd.log.Error(fmt.Sprintf("Invalid token: %v", cmd.token))
+			return
+		}
+
 	}
 
 	blocks := make([]map[string]interface{}, 0)
@@ -414,7 +417,7 @@ func (cmd *Command) getSmartContractData() {
 }
 
 func (cmd *Command) removeTokenChainBlock() {
-	response, err := cmd.c.RemoveTokenChainBlock(cmd.token, cmd.latest)
+	response, err := cmd.c.RemoveTokenChainBlock(cmd.token, cmd.latest, cmd.BlockID)
 	if err != nil {
 		cmd.log.Error("Failed to remove token chain", "err", err)
 		return

core/core.go

@@ -986,25 +986,25 @@ func (c *Core) tokenSyncCleanupRoutine() {
 	}
 }
 
-func (c *Core) RetryFailedTokenSync() {
-	go func() {
-		c.RetryTokenSyncTicker = time.NewTicker(1 * time.Hour)
-		defer c.RetryTokenSyncTicker.Stop()
-
-		for range c.RetryTokenSyncTicker.C {
-			retryErrChan := make(chan error, 1)
-			go func() {
-				retryErrChan <- c.RetryFailedTOSyncTokens()
-			}()
-
-			err := <-retryErrChan
-			if err != nil {
-				c.log.Error("RetryFailedTOSyncTokens execution failed", "err", err)
-			} else {
-				c.log.Info("RetryFailedTOSyncTokens executed successfully")
-			}
-
-		}
-
-	}()
-}
+// func (c *Core) RetryFailedTokenSync() {
+// 	go func() {
+// 		c.RetryTokenSyncTicker = time.NewTicker(1 * time.Hour)
+// 		defer c.RetryTokenSyncTicker.Stop()
+
+// 		for range c.RetryTokenSyncTicker.C {
+// 			retryErrChan := make(chan error, 1)
+// 			go func() {
+// 				retryErrChan <- c.RetryFailedTOSyncTokens()
+// 			}()
+
+// 			err := <-retryErrChan
+// 			if err != nil {
+// 				c.log.Error("RetryFailedTOSyncTokens execution failed", "err", err)
+// 			} else {
+// 				c.log.Info("RetryFailedTOSyncTokens executed successfully")
+// 			}
+
+// 		}
+
+// 	}()
+// }

core/diagnostic.go

@@ -504,6 +504,27 @@ func (c *Core) RemoveTokenChainBlock(removeReq *model.TCRemoveRequest) *model.TC
 	if c.testNet {
 		tt = token.TestTokenType
 	}
+	if removeReq.BlockID != "" {
+		err := c.w.RemoveTokenChainBlock(removeReq.Token, tt, removeReq.BlockID)
+		if err != nil {
+			tt = token.PartTokenType
+			if c.testNet {
+				tt = token.TestPartTokenType
+			}
+			err = c.w.RemoveTokenChainBlock(removeReq.Token, tt, removeReq.BlockID)
+			if err != nil {
+				removeReply.Message = "Failed to remove parts token chain block"
+				return removeReply
+			} else {
+				removeReply.Message = "Failed to remove whole token chain block"
+				return removeReply
+			}
+
+		}
+		removeReply.Status = true
+		removeReply.Message = "Successfully removed token chain block " + removeReq.Token
+		return removeReply
+	}
 	err := c.w.RemoveTokenChainBlocklatest(removeReq.Token, tt)
 	if err != nil {
 		tt = token.PartTokenType

core/did.go

@@ -436,7 +436,7 @@ func (c *Core) GetPeerDIDInfo(didStr string) (*wallet.DIDPeerMap, error) {
 		didType, _ = c.w.GetPeerDIDType(didStr)
 
 		if peerID != "" && didType != -1 {
-			//c.log.Debug("Found peer info in local storage", "peerID", peerID, "didType", didType)
+			c.log.Debug("Found peer info in local storage", "peerID", peerID, "didType", didType)
 			return &wallet.DIDPeerMap{
 				DID:     didStr,
 				PeerID:  peerID,