fix: comments

Author: devchenyan

packages/neuron-ui/src/components/CellManagement/index.tsx

@@ -25,7 +25,6 @@ import {
   getLockTimestamp,
   isMainnet as isMainnetUtil,
   TypeScriptCategory,
-  UDTType,
 } from 'utils'
 import { HIDE_BALANCE } from 'utils/const'
 import Tooltip from 'widgets/Tooltip'
@@ -395,7 +394,7 @@ const CellManagement = () => {
           data={{
             tokenID: operateCells[0].type.args,
             address: operateCells[0].lock.args,
-            udtType: operateCells[0].typeScriptType === TypeScriptCategory.SUDT ? UDTType.SUDT : UDTType.XUDT,
+            outpoint: operateCells[0].outPoint,
           }}
           onClose={onActionCancel}
           onConfirm={fetchLiveCells}

packages/neuron-ui/src/components/RecycleUDTCellDialog/index.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useEffect, useState, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState } from 'states'
+import { type CKBComponents } from '@ckb-lumos/lumos/rpc'
 import { sudtValueToAmount, shannonToCKBFormatter } from 'utils/formatters'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
@@ -20,7 +21,6 @@ import {
   OfflineSignType,
 } from 'services/remote'
 import {
-  UDTType,
   addressToScript,
   isSuccessResponse,
   isMainnet as isMainnetUtil,
@@ -33,7 +33,7 @@ import styles from './recycleUDTCellDialog.module.scss'
 export interface DataProps {
   address: string
   tokenID: string
-  udtType: UDTType
+  outpoint?: CKBComponents.OutPoint
 }
 
 type DialogType = 'ready' | 'inProgress' | 'verify' | 'success'
@@ -73,7 +73,7 @@ const RecycleUDTCellDialog = ({
     t,
   })
 
-  const { address: holder, tokenID, udtType } = data
+  const { address: holder, tokenID, outpoint } = data
 
   const isMainnet = isMainnetUtil(networks, networkID)
 
@@ -95,7 +95,7 @@ const RecycleUDTCellDialog = ({
     getUDTTokenInfoAndBalance({
       tokenID,
       holder,
-      udtType,
+      outpoint,
     }).then(res => {
       if (isSuccessResponse(res)) {
         setInfo(res.result)
@@ -152,7 +152,7 @@ const RecycleUDTCellDialog = ({
         tokenID,
         holder,
         receiver: addressToScript(receiver, { isMainnet }).args,
-        udtType,
+        outpoint,
       })
       if (!isSuccessResponse(txRes)) {
         errFunc(errorFormatter(txRes.message, t))

packages/neuron-ui/src/components/SUDTAccountList/index.tsx

@@ -139,7 +139,6 @@ const SUDTAccountList = () => {
         setRecycleData({
           address: addressToScript(account.address, { isMainnet }).args,
           tokenID: account.tokenId,
-          udtType: account.udtType!,
         })
         break
       }

packages/neuron-ui/src/types/Controller/index.d.ts

@@ -359,7 +359,7 @@ declare namespace Controller {
     interface Params {
       tokenID: string
       holder: string
-      udtType: UDTType
+      outpoint?: CKBComponents.OutPoint
     }
     interface Response {
       tokenID: string
@@ -378,7 +378,7 @@ declare namespace Controller {
       holder: string
       tokenID: string
       receiver: string
-      udtType: UDTType
+      outpoint?: CKBComponents.OutPoint
     }
 
     type Response = Tx

packages/neuron-wallet/src/controllers/api.ts

@@ -919,14 +919,23 @@ export default class ApiController {
 
     handle(
       'get-sudt-token-info-and-balance',
-      async (_, params: { tokenID: string; holder: string; udtType: UDTType }) => {
+      async (_, params: { tokenID: string; holder: string; outpoint?: CKBComponents.OutPoint }) => {
         return this.#sudtController.getUDTTokenInfoAndBalance(params)
       }
     )
 
     handle(
       'generate-recycle-udt-cell-tx',
-      async (_, params: { walletId: string; holder: string; tokenID: string; receiver: string; udtType: UDTType }) => {
+      async (
+        _,
+        params: {
+          walletId: string
+          holder: string
+          tokenID: string
+          receiver: string
+          outpoint?: CKBComponents.OutPoint
+        }
+      ) => {
         return this.#assetAccountController.generateRecycleUDTCellTx(params)
       }
     )

packages/neuron-wallet/src/controllers/asset-account.ts

@@ -115,9 +115,18 @@ export default class AssetAccountController {
     holder: string
     tokenID: string
     receiver: string
-    udtType: UDTType
+    outpoint?: CKBComponents.OutPoint
   }) {
-    const tx = await AssetAccountService.generateRecycleUDTCellTx(params)
+    const tokens = await SudtTokenInfoService.findSudtTokenInfoByArgs([params.tokenID])
+    if (!tokens || !tokens.length) {
+      throw new ServiceHasNoResponse('UDT Cell')
+    }
+
+    const { udtType } = tokens[0]
+    const tx = await AssetAccountService.generateRecycleUDTCellTx({
+      ...params,
+      udtType,
+    })
     return {
       status: ResponseCode.Success,
       result: tx,

packages/neuron-wallet/src/controllers/sudt.ts

@@ -32,24 +32,26 @@ export default class SUDTController {
     const { decimal, name, symbol } = parseSUDTTokenInfo(liveCell.data)
     return {
       status: ResponseCode.Success,
-      result: { tokenID: params.tokenID, symbol: symbol, tokenName: name, decimal: decimal },
+      result: { tokenID: params.tokenID, symbol: symbol, tokenName: name, decimal: decimal, udtType: UDTType.SUDT },
     }
   }
 
+  // outpoint
   public async getUDTTokenInfoAndBalance(params: {
     tokenID: string
     holder: string
-    udtType: UDTType
+    outpoint?: CKBComponents.OutPoint
   }): Promise<Controller.Response<SudtTokenInfo & { balance: string; capacity: string }>> {
-    const { tokenID, holder, udtType } = params
+    const { tokenID, holder, outpoint } = params
     const info = await this.getSUDTTokenInfo({ tokenID })
     if (!info.result) {
       return {
         status: ResponseCode.Fail,
       }
     }
-    const balance = await AssetAccountService.calculateUDTAccountBalance(holder, tokenID, udtType)
-    const cells = await AssetAccountService.getACPCells(holder, tokenID, udtType)
+
+    const balance = await AssetAccountService.calculateUDTAccountBalance(holder, tokenID, info.result.udtType, outpoint)
+    const cells = await AssetAccountService.getACPCells(holder, tokenID, info.result.udtType, outpoint)
 
     let capacity = cells.reduce((a, b) => {
       return a + BigInt(b.capacity as string)

packages/neuron-wallet/src/models/chain/transaction.ts

@@ -9,6 +9,7 @@ import TypeCheckerUtils from '../../utils/type-checker'
 import OutPoint from './out-point'
 import { Signatures } from '../../models/offline-sign'
 import { ckbHash } from '@ckb-lumos/lumos/utils'
+import { UDTType } from '../../utils/const'
 
 export enum TransactionStatus {
   Pending = 'pending',
@@ -22,6 +23,7 @@ export interface SudtTokenInfo {
   tokenID: string
   tokenName: string
   decimal: string
+  udtType?: UDTType | undefined
 }
 
 export interface SudtInfo {

packages/neuron-wallet/src/services/asset-account-service.ts

@@ -19,9 +19,15 @@ import { MIN_CELL_CAPACITY, UDTType } from '../utils/const'
 import SudtTokenInfoService from './sudt-token-info'
 
 export default class AssetAccountService {
-  public static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes', udtType?: UDTType) {
+  public static async getACPCells(
+    publicKeyHash: string,
+    tokenId: string = 'CKBytes',
+    udtType?: UDTType,
+    outpoint?: OutPoint
+  ) {
     const assetAccountInfo = new AssetAccountInfo()
     const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
+
     const outputs = await getConnection()
       .getRepository(OutputEntity)
       .findBy({
@@ -31,6 +37,12 @@ export default class AssetAccountService {
           tokenId !== 'CKBytes'
             ? assetAccountInfo.generateUdtScript(tokenId, udtType ?? UDTType.SUDT)!.computeHash()
             : IsNull(),
+        ...(outpoint
+          ? {
+              outPointTxHash: outpoint.txHash,
+              outPointIndex: outpoint.index,
+            }
+          : {}),
       })
 
     return outputs
@@ -52,7 +64,12 @@ export default class AssetAccountService {
     return availableBalance >= 0 ? availableBalance.toString() : BigInt(0)
   }
 
-  public static async calculateUDTAccountBalance(publicKeyHash: string, tokenId: string, udtType?: UDTType) {
+  public static async calculateUDTAccountBalance(
+    publicKeyHash: string,
+    tokenId: string,
+    udtType?: UDTType,
+    outpoint?: OutPoint
+  ) {
     const assetAccountInfo = new AssetAccountInfo()
     const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
     const typeHash =
@@ -66,6 +83,12 @@ export default class AssetAccountService {
         status: In([OutputStatus.Live, OutputStatus.Sent]),
         lockHash: anyoneCanPayLockHash,
         typeHash,
+        ...(outpoint
+          ? {
+              outPointTxHash: outpoint.txHash,
+              outPointIndex: outpoint.index,
+            }
+          : {}),
       })
       .getMany()
 
@@ -117,10 +140,11 @@ export default class AssetAccountService {
     holder: string
     tokenID: string
     receiver: string
-    udtType: UDTType
+    udtType?: UDTType
+    outpoint?: CKBComponents.OutPoint
   }) {
-    const { walletId, holder, tokenID, udtType, receiver } = params
-    const cells = await AssetAccountService.getACPCells(holder, tokenID, udtType)
+    const { walletId, holder, tokenID, receiver, udtType, outpoint } = params
+    const cells = await AssetAccountService.getACPCells(holder, tokenID, udtType, outpoint)
 
     if (!cells.length) {
       throw new Error(`No cells found!`)