feat: Support XUDT

yanguoyu · Jul 9, 2024 · 523e0fd · 523e0fd
1 parent fe2082c
commit 523e0fd
Show file tree

Hide file tree

Showing 51 changed files with 882 additions and 440 deletions.
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -50,13 +50,13 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@ckb-lumos/bi": "0.21.1",
-    "@ckb-lumos/rpc": "0.21.1",
-    "@ckb-lumos/base": "0.21.1",
-    "@ckb-lumos/codec": "0.21.1",
-    "@ckb-lumos/helpers": "0.21.1",
-    "@ckb-lumos/config-manager": "0.21.1",
-    "@ckb-lumos/common-scripts": "0.21.1",
+    "@ckb-lumos/bi": "0.23.0",
+    "@ckb-lumos/rpc": "0.23.0",
+    "@ckb-lumos/base": "0.23.0",
+    "@ckb-lumos/codec": "0.23.0",
+    "@ckb-lumos/helpers": "0.23.0",
+    "@ckb-lumos/config-manager": "0.23.0",
+    "@ckb-lumos/common-scripts": "0.23.0",
     "canvg": "2.0.0",
     "i18next": "23.7.11",
     "immer": "9.0.21",

diff --git a/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss b/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
@@ -53,7 +53,7 @@
 .actions {
   display: flex;
   gap: 16px;
-  & > svg {
+  & svg {
     cursor: pointer;
     &[data-disabled='true'] {
       cursor: not-allowed;

diff --git a/packages/neuron-ui/src/components/CellManagement/hooks.ts b/packages/neuron-ui/src/components/CellManagement/hooks.ts
@@ -18,7 +18,8 @@ import { ErrorCode, LockScriptCategory, RoutePath, TypeScriptCategory, isSuccess
 import { SortType } from 'widgets/Table'
 
 const cellTypeOrder: Record<string, number> = {
-  [TypeScriptCategory.SUDT]: 1,
+  [TypeScriptCategory.SUDT]: 0,
+  [TypeScriptCategory.XUDT]: 1,
   [TypeScriptCategory.NFT]: 2,
   [TypeScriptCategory.Spore]: 3,
   [TypeScriptCategory.Unknown]: 4,
@@ -47,6 +48,9 @@ const getLockStatusAndReason = (item: State.LiveCellWithLocalInfo) => {
       case TypeScriptCategory.DAO:
         lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'Nervos DAO' } }
         break
+      case TypeScriptCategory.XUDT:
+        lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'XUDT' } }
+        break
       case TypeScriptCategory.Unknown:
         lockedReason = { key: 'cell-manage.locked-reason.Unknown' }
         break
@@ -82,6 +86,7 @@ const getCellType = (item: State.LiveCellWithLocalInfo) => {
     switch (item.typeScriptType) {
       case TypeScriptCategory.NFT:
       case TypeScriptCategory.SUDT:
+      case TypeScriptCategory.XUDT:
       case TypeScriptCategory.Spore:
       case TypeScriptCategory.Unknown:
         return item.typeScriptType

diff --git a/packages/neuron-ui/src/components/CellManagement/index.tsx b/packages/neuron-ui/src/components/CellManagement/index.tsx
@@ -193,7 +193,7 @@ const getColumns = ({
               <Tooltip tip={t('cell-manage.unlock')} showTriangle placement="top">
                 <UnLock
                   data-disabled={!!lockedReason}
-                  onClick={onAction}
+                  onClick={lockedReason ? undefined : onAction}
                   data-action={Actions.Unlock}
                   data-index={index}
                 />
@@ -202,7 +202,7 @@ const getColumns = ({
               <Tooltip tip={t('cell-manage.lock')} showTriangle placement="top">
                 <LockCell
                   data-disabled={!!lockedReason}
-                  onClick={onAction}
+                  onClick={lockedReason ? undefined : onAction}
                   data-action={Actions.Lock}
                   data-index={index}
                 />

diff --git a/packages/neuron-ui/src/components/NervosDAO/hooks.ts b/packages/neuron-ui/src/components/NervosDAO/hooks.ts
@@ -337,7 +337,7 @@ export const useUpdateDepositEpochList = ({
   useEffect(() => {
     if (connectionStatus === 'online') {
       getBlockHashes(records.map(v => v.depositOutPoint?.txHash).filter(v => !!v) as string[]).then(
-        (depositBlockHashes: { txHash: string; blockHash: string | null }[]) => {
+        (depositBlockHashes: { txHash: string; blockHash: string | undefined }[]) => {
           const recordKeyIdx: string[] = []
           const batchParams: ['getHeader', string][] = []
           records.forEach(record => {

diff --git a/packages/neuron-ui/src/components/SUDTAccountList/index.tsx b/packages/neuron-ui/src/components/SUDTAccountList/index.tsx
@@ -24,6 +24,7 @@ import {
   isSuccessResponse,
   useIsInsufficientToCreateSUDTAccount,
   useOnGenerateNewAccountTransaction,
+  UDTType,
 } from 'utils'
 
 import { getSUDTAccountList, updateSUDTAccount } from 'services/remote'
@@ -48,7 +49,11 @@ const SUDTAccountList = () => {
   const [keyword, setKeyword] = useState('')
   const [dialog, setDialog] = useState<{ id: string; action: 'create' | 'update' } | null>(null)
   const [isLoaded, setIsLoaded] = useState(false)
-  const [insufficient, setInsufficient] = useState({ [AccountType.CKB]: false, [AccountType.SUDT]: false })
+  const [insufficient, setInsufficient] = useState({
+    [AccountType.CKB]: false,
+    [AccountType.SUDT]: false,
+    [AccountType.XUDT]: false,
+  })
 
   const isMainnet = isMainnetUtil(networks, networkID)
   const [receiveData, setReceiveData] = useState<DataProps | null>(null)
@@ -178,6 +183,7 @@ const SUDTAccountList = () => {
         tokenName: accountToUpdate.tokenName || DEFAULT_SUDT_FIELDS.tokenName,
         symbol: accountToUpdate.symbol || DEFAULT_SUDT_FIELDS.symbol,
         isCKB: accountToUpdate.tokenId === DEFAULT_SUDT_FIELDS.CKBTokenId,
+        udtType: accountToUpdate.udtType,
         onSubmit: (info: Omit<TokenInfo, 'isCKB'>) => {
           const params: any = { id: accountToUpdate.accountId }
           Object.keys(info).forEach(key => {
@@ -208,7 +214,7 @@ const SUDTAccountList = () => {
     : undefined
 
   const handleCreateAccount = useCallback(
-    (info: TokenInfo) => {
+    (info: TokenInfo & { udtType?: UDTType }) => {
       createAccount(info, () => {
         setNotice(t('s-udt.create-account-success'))
       })

diff --git a/packages/neuron-ui/src/components/SUDTCreateDialog/index.tsx b/packages/neuron-ui/src/components/SUDTCreateDialog/index.tsx
@@ -10,13 +10,15 @@ import {
   isSuccessResponse,
   useSUDTAccountInfoErrors,
   useFetchTokenInfoList,
-  useOpenSUDTTokenUrl,
+  useOpenUDTTokenUrl,
+  UDTType,
 } from 'utils'
 import { DEFAULT_SUDT_FIELDS } from 'utils/const'
 import styles from './sUDTCreateDialog.module.scss'
 
 export enum AccountType {
   SUDT = 'sudt',
+  XUDT = 'xudt',
   CKB = 'ckb',
 }
 
@@ -33,10 +35,10 @@ export interface TokenInfo extends BasicInfo {
 
 export interface SUDTCreateDialogProps extends TokenInfo {
   isMainnet: boolean
-  onSubmit: (info: TokenInfo) => void
+  onSubmit: (info: TokenInfo & { udtType?: UDTType }) => void
   onCancel: () => void
   existingAccountNames?: string[]
-  insufficient?: { [AccountType.CKB]: boolean; [AccountType.SUDT]: boolean }
+  insufficient?: { [P in AccountType]: boolean }
 }
 
 enum DialogSection {
@@ -49,6 +51,10 @@ const accountTypes: { key: AccountType; label: string }[] = [
     key: AccountType.SUDT,
     label: 's-udt.create-dialog.sudt-account',
   },
+  {
+    key: AccountType.XUDT,
+    label: 's-udt.create-dialog.xudt-account',
+  },
   {
     key: AccountType.CKB,
     label: 's-udt.create-dialog.ckb-account',
@@ -121,21 +127,26 @@ const SUDTCreateDialog = ({
   onSubmit,
   onCancel,
   existingAccountNames = [],
-  insufficient = { [AccountType.CKB]: false, [AccountType.SUDT]: false },
+  insufficient = { [AccountType.CKB]: false, [AccountType.SUDT]: false, [AccountType.XUDT]: false },
   isMainnet,
 }: Partial<Omit<SUDTCreateDialogProps, 'onSubmit' | 'onCancel'>> &
   Pick<SUDTCreateDialogProps, 'onSubmit' | 'onCancel' | 'insufficient'>) => {
   const [t] = useTranslation()
   const [info, dispatch] = useReducer(reducer, { accountName, tokenId, tokenName, symbol, decimal })
-  const [accountType, setAccountType] = useState([AccountType.SUDT, AccountType.CKB].find(at => !insufficient[at]))
+  const [accountType, setAccountType] = useState(
+    [AccountType.SUDT, AccountType.CKB, AccountType.XUDT].find(at => !insufficient[at])
+  )
+  const isUDT = accountType === AccountType.SUDT || accountType === AccountType.XUDT
+  // eslint-disable-next-line no-nested-ternary
+  const udtType = isUDT ? (accountType === AccountType.SUDT ? UDTType.SUDT : UDTType.XUDT) : undefined
   const [step, setStep] = useState(DialogSection.Account)
   const tokenInfoList = useFetchTokenInfoList()
 
   const tokenInfoFields: (keyof TokenInfo)[] = ['tokenId', 'tokenName', 'symbol', 'decimal']
 
   const tokenErrors = useSUDTAccountInfoErrors({
     info,
-    isCKB: AccountType.CKB === accountType,
+    isCKB: !isUDT,
     existingAccountNames,
     t,
   })
@@ -190,7 +201,7 @@ const SUDTCreateDialog = ({
       }
       case DialogSection.Token: {
         if (isTokenReady) {
-          onSubmit({ ...info, accountName: info.accountName.trim(), tokenName: info.tokenName.trim() })
+          onSubmit({ ...info, udtType, accountName: info.accountName.trim(), tokenName: info.tokenName.trim() })
         }
         break
       }
@@ -216,7 +227,7 @@ const SUDTCreateDialog = ({
       }
     }
   }
-  const openSUDTTokenUrl = useOpenSUDTTokenUrl(info.tokenId, isMainnet)
+  const openSUDTTokenUrl = useOpenUDTTokenUrl(info.tokenId, udtType, isMainnet)
   return (
     <Dialog
       show
@@ -285,14 +296,16 @@ const SUDTCreateDialog = ({
                     className={styles.settingField}
                     placeholder={t(`s-udt.create-dialog.input.${field.label}`)}
                     hint={
-                      !tokenErrors[field.key] && field.key === 'tokenId' && accountType === AccountType.SUDT
-                        ? t(`s-udt.create-dialog.placeholder.${field.label}`)
+                      !tokenErrors[field.key] && field.key === 'tokenId' && isUDT
+                        ? t(`s-udt.create-dialog.placeholder.${field.label}`, {
+                            udtType: AccountType.SUDT === accountType ? 'sUDT' : 'xUDT',
+                          })
                         : undefined
                     }
                   />
                 ))}
             </div>
-            {accountType === AccountType.SUDT && !tokenErrors.tokenId && info.tokenId && (
+            {isUDT && !tokenErrors.tokenId && info.tokenId && (
               <button
                 type="button"
                 className={styles.explorerNavButton}

diff --git a/packages/neuron-ui/src/components/SUDTMigrateDialog/index.tsx b/packages/neuron-ui/src/components/SUDTMigrateDialog/index.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { SpecialAssetCell } from 'components/SpecialAssetList/hooks'
 import { MIN_CKB_REQUIRED_BY_NORMAL_SUDT, SHANNON_CKB_RATIO } from 'utils/const'
 import Dialog from 'widgets/Dialog'
+import { PresetScript, UDTType } from 'utils'
 import styles from './sUDTMigrateDialog.module.scss'
 
 const items = [
@@ -38,12 +39,13 @@ const SUDTMigrateDialog = ({
     setType('')
     onCancel()
   }
+  const udtType = cell.customizedAssetInfo.type === PresetScript.SUDT ? UDTType.SUDT : UDTType.XUDT
 
   return (
     <Dialog
       className={styles.container}
       show
-      title={t('migrate-sudt.title')}
+      title={t('migrate-sudt.title', { udtType })}
       onCancel={handleCancel}
       cancelText={t('migrate-sudt.cancel')}
       confirmText={t('migrate-sudt.next')}
@@ -64,8 +66,8 @@ const SUDTMigrateDialog = ({
             role="button"
             tabIndex={idx}
           >
-            <div className={styles.title}>{t(v.title)}</div>
-            <div className={styles.subTitle}>{t(v.subTitle)}</div>
+            <div className={styles.title}>{t(v.title, { udtType })}</div>
+            <div className={styles.subTitle}>{t(v.subTitle, { udtType })}</div>
           </div>
         ))}
       </>

diff --git a/packages/neuron-ui/src/components/SUDTMigrateToNewAccountDialog/index.tsx b/packages/neuron-ui/src/components/SUDTMigrateToNewAccountDialog/index.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { SpecialAssetCell } from 'components/SpecialAssetList/hooks'
 import TextField from 'widgets/TextField'
 import Dialog from 'widgets/Dialog'
-import { getSUDTAmount, isSuccessResponse } from 'utils'
+import { getSUDTAmount, getUdtType, isSuccessResponse } from 'utils'
 import { generateSudtMigrateAcpTx } from 'services/remote'
 import { AppActions, showGlobalAlertDialog, useDispatch } from 'states'
 import { useTokenInfo, TokenInfoType } from './hooks'
@@ -43,6 +43,7 @@ const SUDTMigrateToNewAccountDialog = ({
     tokenId: cell.type?.args,
     sUDTAccounts,
   })
+  const udtType = getUdtType(cell.type)
 
   const confirmDisabled = useMemo(
     () => fields.some(v => (tokenInfoErrors[v.key] || !tokenInfo[v.key]) && v.key !== 'balance'),
@@ -121,7 +122,7 @@ const SUDTMigrateToNewAccountDialog = ({
     <Dialog
       className={styles.container}
       show
-      title={t('migrate-sudt.turn-into-new-account.title')}
+      title={t('migrate-sudt.turn-into-new-account.title', { udtType })}
       onCancel={onBack}
       cancelText={t('migrate-sudt.cancel')}
       confirmText={t('migrate-sudt.confirm')}

diff --git a/packages/neuron-ui/src/components/SUDTUpdateDialog/index.tsx b/packages/neuron-ui/src/components/SUDTUpdateDialog/index.tsx
@@ -2,13 +2,13 @@ import React, { useReducer, useMemo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { destroyAssetAccount } from 'services/remote'
 import { useState as useGlobalState, useDispatch, AppActions } from 'states'
-import { isSuccessResponse } from 'utils'
+import { UDTType, isSuccessResponse } from 'utils'
 import TextField from 'widgets/TextField'
 import Dialog from 'widgets/Dialog'
 import Tooltip from 'widgets/Tooltip'
 import { ReactComponent as Delete } from 'widgets/Icons/Delete.svg'
 import { ReactComponent as ExplorerIcon } from 'widgets/Icons/ExplorerIcon.svg'
-import { useSUDTAccountInfoErrors, useOpenSUDTTokenUrl } from 'utils/hooks'
+import { useSUDTAccountInfoErrors, useOpenUDTTokenUrl } from 'utils/hooks'
 import styles from './sUDTUpdateDialog.module.scss'
 
 export interface BasicInfo {
@@ -30,6 +30,7 @@ export interface SUDTUpdateDialogProps extends TokenInfo {
   onCancel: () => void
   existingAccountNames: string[]
   balance: string
+  udtType?: UDTType
 }
 
 const fields: { key: keyof Omit<TokenInfo, 'accountId' | 'isCKB'>; label: string }[] = [
@@ -78,6 +79,7 @@ const SUDTUpdateDialog = ({
   isCKB = false,
   existingAccountNames = [],
   balance,
+  udtType,
 }: SUDTUpdateDialogProps) => {
   const {
     wallet: { id: walletId },
@@ -106,7 +108,7 @@ const SUDTUpdateDialog = ({
       onSubmit({ ...info, accountName: info.accountName.trim(), tokenName: info.tokenName.trim(), accountId })
     }
   }
-  const openSUDTTokenUrl = useOpenSUDTTokenUrl(info.tokenId, isMainnet)
+  const openUDTTokenUrl = useOpenUDTTokenUrl(info.tokenId, udtType, isMainnet)
 
   const onDestroy = useCallback(() => {
     destroyAssetAccount({ walletID: walletId, id: accountId! }).then(res => {
@@ -184,7 +186,7 @@ const SUDTUpdateDialog = ({
           })}
         </div>
         {!isCKB && !tokenErrors.tokenId && info.tokenId && (
-          <button type="button" className={styles.explorerNavButton} onClick={openSUDTTokenUrl}>
+          <button type="button" className={styles.explorerNavButton} onClick={openUDTTokenUrl}>
             <ExplorerIcon /> {t('history.view-in-explorer-button-title')}
           </button>
         )}

diff --git a/packages/neuron-ui/src/components/SpecialAssetList/hooks.ts b/packages/neuron-ui/src/components/SpecialAssetList/hooks.ts
@@ -180,13 +180,6 @@ export const useSpecialAssetColumnInfo = ({
           }
           break
         }
-        case PresetScript.SUDT: {
-          status = 'user-defined-token'
-          const tokenInfo = tokenInfoList.find(info => info.tokenID === type?.args)
-          const amountInfo = getSUDTAmount({ tokenInfo, data })
-          amount = amountInfo.amount
-          break
-        }
         default: {
           // ignore
         }
@@ -220,6 +213,14 @@ export const useSpecialAssetColumnInfo = ({
           amount = t('special-assets.unknown-asset')
           break
         }
+        case PresetScript.XUDT:
+        case PresetScript.SUDT: {
+          status = 'user-defined-token'
+          const tokenInfo = tokenInfoList.find(info => info.tokenID === type?.args)
+          const amountInfo = getSUDTAmount({ tokenInfo, data })
+          amount = amountInfo.amount
+          break
+        }
         default: {
           break
         }
@@ -235,6 +236,7 @@ export const useSpecialAssetColumnInfo = ({
         epochsInfo,
         isSpore,
         sporeClusterInfo,
+        udtType: assetInfo.type,
       }
     },
     [epoch, bestKnownBlockTimestamp, tokenInfoList, t]