fix: comments

Author: devchenyan

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

@@ -916,9 +916,12 @@ export default class ApiController {
       }
     )
 
-    handle('generate-recycle-udt-cell-tx', async (_, params) => {
-      return this.#assetAccountController.generateRecycleUDTCellTx(params)
-    })
+    handle(
+      'generate-recycle-udt-cell-tx',
+      async (_, params: { walletId: string; holder: string; tokenID: string; receiver: string; udtType: UDTType }) => {
+        return this.#assetAccountController.generateRecycleUDTCellTx(params)
+      }
+    )
 
     handle('generate-destroy-asset-account-tx', async (_, params: { walletID: string; id: number }) => {
       return this.#assetAccountController.destroyAssetAccount(params)

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

@@ -2,7 +2,7 @@ import LiveCellService from '../services/live-cell-service'
 import AssetAccountInfo from '../models/asset-account-info'
 import Script, { ScriptHashType } from '../models/chain/script'
 import parseSUDTTokenInfo from '../utils/parse_sudt_token_info'
-import { ResponseCode, UDTType, MIN_SUDT_CAPACITY } from '../utils/const'
+import { ResponseCode, UDTType } from '../utils/const'
 import { SudtTokenInfo } from '../models/chain/transaction'
 import SudtTokenInfoService from '../services/sudt-token-info'
 import AssetAccountService from '../services/asset-account-service'
@@ -49,9 +49,11 @@ export default class SUDTController {
       }
     }
     const balance = await AssetAccountService.calculateUDTAccountBalance(holder, tokenID, udtType)
-    const ckbBalance = await AssetAccountService.calculateAvailableCKBBalance(holder)
+    const cells = await AssetAccountService.getACPCells(holder, tokenID, udtType)
 
-    const capacity = BigInt(MIN_SUDT_CAPACITY) + BigInt(ckbBalance)
+    let capacity = cells.reduce((a, b) => {
+      return a + BigInt(b.capacity as string)
+    }, BigInt(0))
 
     return {
       status: ResponseCode.Success,

packages/neuron-wallet/src/models/system-script-info.ts

@@ -10,7 +10,6 @@ export default class SystemScriptInfo {
   static SECP_CODE_HASH = process.env.SECP256K1_CODE_HASH!
   static DAO_CODE_HASH = process.env.DAO_CODE_HASH!
   static MULTI_SIGN_CODE_HASH = process.env.MULTISIG_CODE_HASH!
-  static SUDT_SCRIPT_CODEHASH = process.env.MAINNET_SUDT_SCRIPT_CODEHASH!
 
   static SECP_HASH_TYPE = ScriptHashType.Type
   static DAO_HASH_TYPE = ScriptHashType.Type

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

@@ -19,7 +19,7 @@ import { MIN_CELL_CAPACITY, UDTType } from '../utils/const'
 import SudtTokenInfoService from './sudt-token-info'
 
 export default class AssetAccountService {
-  private static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes', udtType?: UDTType) {
+  public static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes', udtType?: UDTType) {
     const assetAccountInfo = new AssetAccountInfo()
     const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
     const outputs = await getConnection()
@@ -36,7 +36,7 @@ export default class AssetAccountService {
     return outputs
   }
 
-  public static async calculateAvailableCKBBalance(publicKeyHash: string) {
+  private static async calculateAvailableCKBBalance(publicKeyHash: string) {
     const outputs = await this.getACPCells(publicKeyHash)
 
     const totalBalance = outputs

packages/neuron-wallet/src/services/tx/transaction-generator.ts

@@ -836,14 +836,14 @@ export class TransactionGenerator {
     assetAccountInputs: Input[],
     changeBlake160: string,
     isCKBAccount: boolean,
-    forceDestroy?: boolean
+    isForceDestroy?: boolean
   ) {
     const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
     const assetAccountInfo = new AssetAccountInfo()
 
     const cellDeps = [secpCellDep, assetAccountInfo.anyoneCanPayCellDep]
     if (assetAccountInputs.some(v => v.type && v.data !== '0x' && BigInt(v.data || 0) !== BigInt(0))) {
-      if (!forceDestroy) {
+      if (!isForceDestroy) {
         throw new SudtAcpHaveDataError()
       }
     }