From c8278184b219a42970ecf72a2df28a40e9144ca8 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Tue, 28 May 2024 23:54:55 +0800
Subject: [PATCH 1/2] feat: Support set start block number for multisig address

---
 .../src/components/AmendSUDTSend/index.tsx    |   2 +-
 .../src/components/AmendSend/index.tsx        |   2 +-
 .../src/components/MultisigAddress/hooks.ts   |  80 +++++++++-
 .../src/components/MultisigAddress/index.tsx  | 140 ++++++++++++++---
 .../multisigAddress.module.scss               |  53 +++++--
 .../src/components/PageContainer/hooks.ts     | 102 ++----------
 .../src/components/PageContainer/index.tsx    |  74 ++-------
 .../PageContainer/pageContainer.module.scss   |  42 -----
 .../SetStartBlockNumberDialog/index.tsx       | 148 ++++++++++++++++++
 .../setStartBlockNumberDialog.module.scss     |  41 +++++
 .../src/components/SpecialAssetList/index.tsx |   4 +-
 .../neuron-ui/src/containers/Main/index.tsx   |   2 +-
 .../neuron-ui/src/services/remote/multisig.ts |   2 +
 .../src/services/remote/remoteApiWrapper.ts   |   1 +
 .../neuron-ui/src/widgets/Button/index.tsx    |   8 +-
 .../{NoDiskSpaceWarn.png => Attention.png}    | Bin
 packages/neuron-ui/src/widgets/Icons/icon.tsx |   6 +
 .../widgets/MigrateCkbDataDialog/index.tsx    |   2 +-
 .../src/block-sync-renderer/index.ts          |  26 ++-
 .../sync/light-synchronizer.ts                | 113 ++++++++-----
 .../src/block-sync-renderer/sync/queue.ts     |  13 +-
 .../block-sync-renderer/sync/synchronizer.ts  |  13 +-
 .../src/block-sync-renderer/task.ts           |  10 +-
 packages/neuron-wallet/src/controllers/api.ts |   9 +-
 .../neuron-wallet/src/controllers/multisig.ts |  32 ++++
 .../chain/entities/multisig-config.ts         |   3 +
 ...820157100-RemoveAddressesMultisigConfig.ts |   4 +-
 .../1681360188494-AddTypeSyncProgress.ts      |   7 +-
 .../1702781527414-RenameSyncProgress.ts       |  19 +--
 .../1716539079505-AddStartBlockNumber.ts      |  14 ++
 .../src/database/chain/ormconfig.ts           |   2 +
 .../multisig-config-db-changed-subject.ts     |   2 +-
 .../neuron-wallet/src/services/multisig.ts    |  34 ++--
 .../src/services/sync-progress.ts             |  19 ++-
 .../index/createBlockSyncTask.test.ts         |   1 +
 .../light-synchronizer.test.ts                |   7 +-
 .../tests/block-sync-renderer/task.test.ts    |   3 +-
 .../tests/services/multisig.test.ts           |  24 +++
 38 files changed, 701 insertions(+), 363 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
 create mode 100644 packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss
 rename packages/neuron-ui/src/widgets/Icons/{NoDiskSpaceWarn.png => Attention.png} (100%)
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts

diff --git a/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
index 5cdbc79812..66250d03b6 100644
--- a/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
+++ b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
@@ -198,7 +198,7 @@ const AmendSUDTSend = () => {
             </div>
             <div className={styles.rightFooter}>
               <div className={styles.actions}>
-                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                <Button type="submit" disabled={!!disabled} label={t('send.send')}>
                   {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
                 </Button>
               </div>
diff --git a/packages/neuron-ui/src/components/AmendSend/index.tsx b/packages/neuron-ui/src/components/AmendSend/index.tsx
index 7ba3873d1e..453eef097b 100644
--- a/packages/neuron-ui/src/components/AmendSend/index.tsx
+++ b/packages/neuron-ui/src/components/AmendSend/index.tsx
@@ -250,7 +250,7 @@ const AmendSend = () => {
                 <span>{t('send.allow-use-sent-cell')}</span>
               </label>
               <div className={styles.actions}>
-                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                <Button type="submit" disabled={!!disabled} label={t('send.send')}>
                   {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
                 </Button>
               </div>
diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index 20853bdbca..d5a431f22c 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -79,16 +79,21 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
       }
     })
   }, [setEntities])
-  const updateConfig = useCallback(
+  const onUpdateConfig = useCallback((values: Partial<MultisigEntity> & { id: number }) => {
+    return updateMultisigConfig(values).then(res => {
+      if (isSuccessResponse(res)) {
+        setEntities(v => v.map(config => (res.result && config.id === res.result?.id ? res.result : config)))
+      } else {
+        throw new Error(typeof res.message === 'string' ? res.message : res.message.content!)
+      }
+    })
+  }, [])
+  const onUpdateConfigAlias = useCallback(
     (id: number) => (e: React.SyntheticEvent<unknown>) => {
       const { value } = e.target as HTMLInputElement
-      updateMultisigConfig({ id, alias: value || '' }).then(res => {
-        if (isSuccessResponse(res)) {
-          setEntities(v => v.map(config => (res.result && config.id === res.result?.id ? res.result : config)))
-        }
-      })
+      onUpdateConfig({ id, alias: value || '' })
     },
-    [setEntities]
+    [onUpdateConfig]
   )
   const deleteConfigById = useCallback(
     (id: number) => {
@@ -141,7 +146,8 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
   return {
     saveConfig,
     allConfigs,
-    updateConfig,
+    onUpdateConfigAlias,
+    onUpdateConfig,
     deleteConfigById,
     onImportConfig,
     configs,
@@ -365,3 +371,61 @@ export const useSubscription = ({
   }, [isLightClient, getAndSaveMultisigSyncProgress])
   return { multisigBanlances, multisigSyncProgress }
 }
+
+export const useCancelWithLightClient = () => {
+  const [isCloseWarningDialogShow, setIsCloseWarningDialogShow] = useState(false)
+  const onCancel = useCallback(() => {
+    setIsCloseWarningDialogShow(true)
+  }, [setIsCloseWarningDialogShow])
+  const onCancelCloseMultisigDialog = useCallback(() => {
+    setIsCloseWarningDialogShow(false)
+  }, [setIsCloseWarningDialogShow])
+  return {
+    isCloseWarningDialogShow,
+    onCancel,
+    onCancelCloseMultisigDialog,
+  }
+}
+
+export const useSetStartBlockNumber = ({
+  onUpdateConfig,
+}: {
+  onUpdateConfig: (v: Partial<MultisigEntity> & { id: number }) => Promise<void>
+}) => {
+  const [isSetStartBlockShown, setIsSetStartBlockShown] = useState(false)
+  const [editId, setEditId] = useState<number | undefined>()
+  const [address, setAddress] = useState<string | undefined>()
+  const [lastStartBlockNumber, setLastStartBlockNumber] = useState<number | undefined>()
+  const onConfirm = useCallback(
+    (startBlockNumber: number) => {
+      if (editId) {
+        return onUpdateConfig({
+          id: editId,
+          startBlockNumber,
+        }).then(() => {
+          setIsSetStartBlockShown(false)
+        })
+      }
+      return Promise.reject(new Error('The Edit multisig config is empty'))
+    },
+    [editId]
+  )
+  const openDialog = useCallback<React.MouseEventHandler<HTMLButtonElement>>(e => {
+    const { id, address: editAddress, startBlockNumber } = e.currentTarget.dataset
+    if (id) {
+      setEditId(+id)
+    }
+    setAddress(editAddress)
+    setLastStartBlockNumber(startBlockNumber ? +startBlockNumber : undefined)
+    setIsSetStartBlockShown(true)
+  }, [])
+  return {
+    openDialog,
+    closeDialog: useCallback(() => setIsSetStartBlockShown(false), []),
+    isSetStartBlockShown,
+    onConfirm,
+    address,
+    lastStartBlockNumber,
+    onCancel: useCallback(() => setIsSetStartBlockShown(false), []),
+  }
+}
diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index 262fbe8596..f0f3f4bbf0 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   useOnLocaleChange,
@@ -11,24 +11,39 @@ import { useState as useGlobalState } from 'states'
 import MultisigAddressCreateDialog from 'components/MultisigAddressCreateDialog'
 import MultisigAddressInfo from 'components/MultisigAddressInfo'
 import SendFromMultisigDialog from 'components/SendFromMultisigDialog'
-import { MultisigConfig } from 'services/remote'
+import { MultisigConfig, changeMultisigSyncStatus } from 'services/remote'
 import ApproveMultisigTxDialog from 'components/ApproveMultisigTxDialog'
 import Dialog from 'widgets/Dialog'
 import Table from 'widgets/Table'
 import Tooltip from 'widgets/Tooltip'
 import AlertDialog from 'widgets/AlertDialog'
-import { ReactComponent as AddSimple } from 'widgets/Icons/AddSimple.svg'
-import { ReactComponent as Details } from 'widgets/Icons/Details.svg'
-import { ReactComponent as Delete } from 'widgets/Icons/Delete.svg'
-import { ReactComponent as Confirm } from 'widgets/Icons/Confirm.svg'
-import { ReactComponent as Transfer } from 'widgets/Icons/Transfer.svg'
-import { ReactComponent as Upload } from 'widgets/Icons/Upload.svg'
-import { ReactComponent as Edit } from 'widgets/Icons/Edit.svg'
-import { Download, Search } from 'widgets/Icons/icon'
+import {
+  Download,
+  Search,
+  AddSimple,
+  Details,
+  Delete,
+  Confirm,
+  Transfer,
+  Upload,
+  Edit,
+  Confirming,
+} from 'widgets/Icons/icon'
+import AttentionCloseDialog from 'widgets/Icons/Attention.png'
 import { HIDE_BALANCE, NetworkType } from 'utils/const'
 import { onEnter } from 'utils/inputDevice'
 import getMultisigSignStatus from 'utils/getMultisigSignStatus'
-import { useSearch, useConfigManage, useExportConfig, useActions, useSubscription } from './hooks'
+import Button from 'widgets/Button'
+import SetStartBlockNumberDialog from 'components/SetStartBlockNumberDialog'
+import {
+  useSearch,
+  useConfigManage,
+  useExportConfig,
+  useActions,
+  useSubscription,
+  useCancelWithLightClient,
+  useSetStartBlockNumber,
+} from './hooks'
 
 import styles from './multisigAddress.module.scss'
 
@@ -58,7 +73,11 @@ const MultisigAddress = () => {
   useExitOnWalletChange()
   const {
     wallet: { id: walletId, addresses },
-    chain: { networkID },
+    chain: {
+      syncState: { bestKnownBlockNumber },
+      networkID,
+      connectionStatus,
+    },
     settings: { networks = [] },
   } = useGlobalState()
   const isMainnet = isMainnetUtil(networks, networkID)
@@ -67,11 +86,19 @@ const MultisigAddress = () => {
     [networks, networkID]
   )
   const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false)
-  const { allConfigs, saveConfig, updateConfig, deleteConfigById, onImportConfig, configs, onFilterConfig } =
-    useConfigManage({
-      walletId,
-      isMainnet,
-    })
+  const {
+    allConfigs,
+    saveConfig,
+    onUpdateConfig,
+    onUpdateConfigAlias,
+    deleteConfigById,
+    onImportConfig,
+    configs,
+    onFilterConfig,
+  } = useConfigManage({
+    walletId,
+    isMainnet,
+  })
   const { multisigBanlances, multisigSyncProgress } = useSubscription({
     walletId,
     isMainnet,
@@ -141,10 +168,39 @@ const MultisigAddress = () => {
   }, [multisigBanlances, sendAction.sendFromMultisig])
 
   const onBack = useGoBack()
+  const {
+    onCancel: onCancelWithLight,
+    isCloseWarningDialogShow,
+    onCancelCloseMultisigDialog,
+  } = useCancelWithLightClient()
+  const {
+    isSetStartBlockShown,
+    openDialog: openSetStartBlockNumber,
+    lastStartBlockNumber,
+    address,
+    onConfirm,
+    onCancel,
+  } = useSetStartBlockNumber({ onUpdateConfig })
+
+  useEffect(() => {
+    if (isLightClient) {
+      changeMultisigSyncStatus(true)
+    }
+    return () => {
+      if (isLightClient) {
+        changeMultisigSyncStatus(false)
+      }
+    }
+  }, [isLightClient])
 
   return (
     <div>
-      <Dialog show={showMainDialog} title={t('multisig-address.window-title')} onCancel={onBack} showFooter={false}>
+      <Dialog
+        show={showMainDialog}
+        title={t('multisig-address.window-title')}
+        onCancel={isLightClient ? onCancelWithLight : onBack}
+        showFooter={false}
+      >
         <div className={styles.container}>
           <div className={styles.head}>
             <div className={styles.searchBox}>
@@ -221,8 +277,8 @@ const MultisigAddress = () => {
                               <textarea
                                 className={styles.descInput}
                                 value={item.alias || ''}
-                                onChange={updateConfig(item.id)}
-                                onKeyDown={updateConfig(item.id)}
+                                onChange={onUpdateConfigAlias(item.id)}
+                                onKeyDown={onUpdateConfigAlias(item.id)}
                               />
                               <Edit />
                             </div>
@@ -261,7 +317,21 @@ const MultisigAddress = () => {
                   align: 'left',
                   hidden: !isLightClient,
                   render(_, __, item) {
-                    return <div>{multisigSyncProgress?.[item.fullPayload] ?? 0}</div>
+                    return (
+                      <div className={styles.syncBlock}>
+                        {connectionStatus === 'online' ? <Confirming className={styles.syncing} /> : null}
+                        {multisigSyncProgress?.[item.fullPayload] ?? 0}
+                        <Button
+                          type="text"
+                          onClick={openSetStartBlockNumber}
+                          data-id={item.id}
+                          data-address={item.fullPayload}
+                          data-start-block-number={item.startBlockNumber}
+                        >
+                          <Edit />
+                        </Button>
+                      </div>
+                    )
                   },
                 },
                 {
@@ -366,6 +436,23 @@ const MultisigAddress = () => {
         }}
       />
 
+      <Dialog
+        title={t('multisig-address.multi-details')}
+        show={isCloseWarningDialogShow}
+        onConfirm={onBack}
+        onCancel={onCancelCloseMultisigDialog}
+        confirmText={t('multisig-address.ok')}
+        contentClassName={styles.closeMutisigContent}
+        className={styles.closeMultisigDialog}
+        confirmProps={{ type: 'cancel', className: styles.confirmBtn }}
+      >
+        <img src={AttentionCloseDialog} alt="Synchronization Abort" />
+        <h4>Synchronization Abort</h4>
+        <p>
+          Leaving the current window will cause the multisig synchronization to be aborted, so please confirm to leave.
+        </p>
+      </Dialog>
+
       {sendAction.sendFromMultisig && sendAction.isDialogOpen ? (
         <SendFromMultisigDialog
           closeDialog={sendAction.closeDialog}
@@ -382,6 +469,17 @@ const MultisigAddress = () => {
           isMainnet={isMainnet}
         />
       ) : null}
+      {address ? (
+        <SetStartBlockNumberDialog
+          show={isSetStartBlockShown}
+          headerTipNumber={bestKnownBlockNumber}
+          initStartBlockNumber={lastStartBlockNumber}
+          isMainnet={isMainnet}
+          address={address}
+          onUpdateStartBlockNumber={onConfirm}
+          onCancel={onCancel}
+        />
+      ) : null}
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss b/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
index 02dd6dc9ea..7508e4f9a1 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
+++ b/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
@@ -1,4 +1,5 @@
 @import '../../styles/mixin.scss';
+@import '../../styles/animation.scss';
 
 .container {
   .head {
@@ -87,6 +88,12 @@
     color: var(--main-text-color);
 
     @include checkbox;
+
+    .syncBlock {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
   }
 
   .address {
@@ -180,18 +187,44 @@
   }
 }
 
-.dialog {
-  @include dialog-container;
-  padding: 30px 50px;
+.ok {
+  margin: 12px 0;
+  text-align: center;
 }
 
-.approveDialog {
-  @include dialog-container;
-  padding: 30px 50px;
-  max-width: 800px;
+.closeMultisigDialog {
+  width: 568px;
+
+  .closeMutisigContent {
+    text-align: center;
+    color: var(--main-text-color);
+
+    & > img {
+      width: 56px;
+      height: 56px;
+    }
+
+    & > h4 {
+      text-align: center;
+      font-size: 16px;
+      font-weight: 500;
+      margin: 12px 0 24px 0;
+    }
+  }
+
+  .confirmBtn {
+    &:hover {
+      color: var(--error-color) !important;
+      border-color: var(--error-color) !important;
+    }
+  }
 }
 
-.ok {
-  margin: 12px 0;
-  text-align: center;
+.syncing {
+  @include infinite-rotation;
+  margin-right: 4px;
+
+  path {
+    fill: var(--primary-color);
+  }
 }
diff --git a/packages/neuron-ui/src/components/PageContainer/hooks.ts b/packages/neuron-ui/src/components/PageContainer/hooks.ts
index ce87534fd6..f52b64a126 100644
--- a/packages/neuron-ui/src/components/PageContainer/hooks.ts
+++ b/packages/neuron-ui/src/components/PageContainer/hooks.ts
@@ -1,101 +1,38 @@
-import { TFunction } from 'i18next'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { importedWalletDialogShown } from 'services/localCache'
-import { isDark, openExternal, setTheme as setThemeAPI, updateWalletStartBlockNumber } from 'services/remote'
+import { isDark, setTheme as setThemeAPI, updateWalletStartBlockNumber } from 'services/remote'
 import { Migrate } from 'services/subjects'
-import { getExplorerUrl, isSuccessResponse } from 'utils'
-
-const waitConfirmTime = 5
-
-const useCountDown = (second: number) => {
-  const [countdown, setCountdown] = useState(0)
-  const countDecreaseIntervalRef = useRef<ReturnType<typeof setInterval>>()
-  const resetCountDown = useCallback(() => {
-    clearInterval(countDecreaseIntervalRef.current)
-    setCountdown(second)
-    const decrement = () => {
-      countDecreaseIntervalRef.current = setInterval(() => {
-        setCountdown(v => {
-          if (v > 0) {
-            return v - 1
-          }
-          clearInterval(countDecreaseIntervalRef.current)
-          return v
-        })
-      }, 1_000)
-    }
-    decrement()
-  }, [setCountdown, countDecreaseIntervalRef])
-  return {
-    countdown,
-    resetCountDown,
-  }
-}
+import { isSuccessResponse } from 'utils'
 
 export const useSetBlockNumber = ({
-  firstAddress,
   walletID,
-  isMainnet,
   isLightClient,
   isHomePage,
   initStartBlockNumber,
-  headerTipNumber,
-  t,
 }: {
-  firstAddress: string
   walletID: string
-  isMainnet: boolean
   isLightClient: boolean
   isHomePage?: boolean
   initStartBlockNumber?: number
-  headerTipNumber: number
-  t: TFunction
 }) => {
   const [isSetStartBlockShown, setIsSetStartBlockShown] = useState(false)
-  const [startBlockNumber, setStartBlockNumber] = useState('')
-  const [blockNumberErr, setBlockNumberErr] = useState('')
-  const isSetLessThanBefore = useMemo(
-    () => !!(startBlockNumber && initStartBlockNumber && +startBlockNumber < initStartBlockNumber),
-    [initStartBlockNumber, startBlockNumber]
-  )
-  const { countdown, resetCountDown } = useCountDown(waitConfirmTime)
-  const onChangeStartBlockNumber = useCallback(
-    (e: React.SyntheticEvent<HTMLInputElement>) => {
-      const { value } = e.currentTarget
-      const blockNumber = value.replaceAll(',', '')
-      if (Number.isNaN(+blockNumber)) {
-        return
-      }
-      setStartBlockNumber(+blockNumber > headerTipNumber ? headerTipNumber.toString() : blockNumber)
-      setBlockNumberErr(+blockNumber > headerTipNumber ? t('set-start-block-number.reset-to-header-tip-number') : '')
-      resetCountDown()
+  const onConfirm = useCallback(
+    (startBlockNumber: number) => {
+      return updateWalletStartBlockNumber({
+        id: walletID,
+        startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}`,
+      }).then(res => {
+        if (isSuccessResponse(res)) {
+          setIsSetStartBlockShown(false)
+        } else {
+          throw new Error(typeof res.message === 'string' ? res.message : res.message.content!)
+        }
+      })
     },
-    [resetCountDown, initStartBlockNumber, headerTipNumber, t]
+    [walletID]
   )
-  const onOpenAddressInExplorer = useCallback(() => {
-    const explorerUrl = getExplorerUrl(isMainnet)
-    openExternal(`${explorerUrl}/address/${firstAddress}?sort=time`)
-  }, [firstAddress, isMainnet])
-  const onViewBlock = useCallback(() => {
-    const explorerUrl = getExplorerUrl(isMainnet)
-    openExternal(`${explorerUrl}/block/${startBlockNumber}`)
-  }, [startBlockNumber, isMainnet])
-  const onConfirm = useCallback(() => {
-    updateWalletStartBlockNumber({
-      id: walletID,
-      startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}`,
-    }).then(res => {
-      if (isSuccessResponse(res)) {
-        setIsSetStartBlockShown(false)
-      } else {
-        setBlockNumberErr(typeof res.message === 'string' ? res.message : res.message.content!)
-      }
-    })
-  }, [startBlockNumber, walletID])
   const openDialog = useCallback(() => {
     setIsSetStartBlockShown(true)
-    setStartBlockNumber(initStartBlockNumber?.toString() ?? '')
-    setBlockNumberErr('')
   }, [initStartBlockNumber])
   useEffect(() => {
     if (isHomePage) {
@@ -110,14 +47,7 @@ export const useSetBlockNumber = ({
     openDialog,
     closeDialog: useCallback(() => setIsSetStartBlockShown(false), []),
     isSetStartBlockShown,
-    startBlockNumber,
-    onChangeStartBlockNumber,
-    onOpenAddressInExplorer,
-    onViewBlock,
     onConfirm,
-    blockNumberErr,
-    countdown,
-    isSetLessThanBefore,
   }
 }
 
diff --git a/packages/neuron-ui/src/components/PageContainer/index.tsx b/packages/neuron-ui/src/components/PageContainer/index.tsx
index 8a665470e2..97305d8e3e 100755
--- a/packages/neuron-ui/src/components/PageContainer/index.tsx
+++ b/packages/neuron-ui/src/components/PageContainer/index.tsx
@@ -6,9 +6,10 @@ import {
   isMainnet as isMainnetUtil,
   localNumberFormatter,
   getNetworkLabelI18nkey,
+  RoutePath,
 } from 'utils'
 import Alert from 'widgets/Alert'
-import { Attention, Close, NewTab } from 'widgets/Icons/icon'
+import { Close } from 'widgets/Icons/icon'
 import { ReactComponent as Sun } from 'widgets/Icons/Sun.svg'
 import { ReactComponent as Moon } from 'widgets/Icons/Moon.svg'
 import SyncStatusComponent from 'components/SyncStatus'
@@ -16,8 +17,7 @@ import { AppActions, useDispatch, useState as useGlobalState } from 'states'
 import { openExternal } from 'services/remote'
 import Tooltip from 'widgets/Tooltip'
 import { NetworkType } from 'utils/const'
-import Dialog from 'widgets/Dialog'
-import TextField from 'widgets/TextField'
+import SetStartBlockNumberDialog from 'components/SetStartBlockNumberDialog'
 
 import { useMigrate, useSetBlockNumber, useTheme } from './hooks'
 import styles from './pageContainer.module.scss'
@@ -84,28 +84,13 @@ const PageContainer: React.FC<ComponentProps> = props => {
     [isMainnet, validTarget]
   )
   const isMigrate = useMigrate()
-  const {
-    isSetStartBlockShown,
-    openDialog,
-    closeDialog,
-    onChangeStartBlockNumber,
-    startBlockNumber,
-    onOpenAddressInExplorer,
-    onViewBlock,
-    onConfirm,
-    countdown,
-    isSetLessThanBefore,
-    blockNumberErr,
-  } = useSetBlockNumber({
-    firstAddress: addresses[0]?.address,
-    isMainnet,
+  const { isSetStartBlockShown, openDialog, closeDialog, onConfirm } = useSetBlockNumber({
     isLightClient,
     walletID: id,
     isHomePage,
     initStartBlockNumber: walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined,
-    headerTipNumber: bestKnownBlockNumber,
-    t,
   })
+  const isOpenMultisigWithLight = isLightClient && window.location.href.includes(RoutePath.MultisigAddress)
   return (
     <div className={`${styles.page} ${className || ''}`}>
       <div className={styles.head}>
@@ -132,7 +117,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
           <div className={styles.syncStatus}>
             <SyncStatusComponent
               syncStatus={syncStatus}
-              connectionStatus={connectionStatus}
+              connectionStatus={isOpenMultisigWithLight ? 'offline' : connectionStatus}
               syncPercents={syncPercents}
               syncBlockNumbers={syncBlockNumbers}
               isLookingValidTarget={isLookingValidTarget}
@@ -154,48 +139,15 @@ const PageContainer: React.FC<ComponentProps> = props => {
         </Alert>
       )}
       <div className={styles.body}>{children}</div>
-      <Dialog
-        title={t('set-start-block-number.title')}
-        confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
+      <SetStartBlockNumberDialog
         show={isSetStartBlockShown}
+        headerTipNumber={bestKnownBlockNumber}
+        initStartBlockNumber={walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined}
+        isMainnet={isMainnet}
+        address={addresses[0]?.address}
+        onUpdateStartBlockNumber={onConfirm}
         onCancel={closeDialog}
-        onConfirm={onConfirm}
-        disabled={!startBlockNumber || !!countdown}
-        contentClassName={styles.setBlockContent}
-      >
-        <div className={styles.setBlockWarn}>
-          <Attention />
-          {t('set-start-block-number.warn')}
-        </div>
-        <div className={styles.content}>
-          <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
-          <TextField
-            field="startBlockNumber"
-            onChange={onChangeStartBlockNumber}
-            placeholder={t('set-start-block-number.input-place-holder')}
-            value={localNumberFormatter(startBlockNumber)}
-            error={blockNumberErr}
-            suffix={
-              startBlockNumber ? (
-                <button type="button" className={styles.viewAction} onClick={onViewBlock}>
-                  {t('set-start-block-number.view-block')}
-                  <NewTab />
-                </button>
-              ) : (
-                <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
-                  {t('set-start-block-number.locate-first-tx')}
-                  <NewTab />
-                </button>
-              )
-            }
-          />
-          {isSetLessThanBefore ? (
-            <Alert status="error" className={styles.errorMessage} withIcon={false}>
-              {t('set-start-block-number.set-less-than-before')}
-            </Alert>
-          ) : null}
-        </div>
-      </Dialog>
+      />
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
index 8c6fb0278a..d45835d52d 100755
--- a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
+++ b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
@@ -143,45 +143,3 @@
     color: var(--main-text-color);
   }
 }
-
-.setBlockContent {
-  padding: 0 0 20px 0;
-  overflow-y: auto;
-
-  .content {
-    padding: 0 16px 0 16px;
-  }
-  .startBlockTip {
-    font-weight: 400;
-    color: var(--secondary-text-color);
-  }
-
-  .setBlockWarn {
-    height: 32px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color: var(--warn-background-color);
-    color: var(--warn-text-color);
-    font-size: 12px;
-    font-weight: 500;
-
-    & > svg {
-      margin-right: 4px;
-    }
-  }
-}
-
-.viewAction {
-  border: none;
-  background-color: transparent;
-  cursor: pointer;
-  color: var(--primary-color);
-  display: flex;
-  align-items: center;
-
-  & > svg {
-    width: 12px;
-    height: 12px;
-  }
-}
diff --git a/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
new file mode 100644
index 0000000000..1549aed15c
--- /dev/null
+++ b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
@@ -0,0 +1,148 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { openExternal } from 'services/remote'
+import { getExplorerUrl, localNumberFormatter } from 'utils'
+import Dialog from 'widgets/Dialog'
+import { Attention, NewTab } from 'widgets/Icons/icon'
+import TextField from 'widgets/TextField'
+import Alert from 'widgets/Alert'
+import styles from './setStartBlockNumberDialog.module.scss'
+
+const SET_START_BLOCK_COUNTDOWN_SECOND = 5
+
+const useCountDown = (second: number) => {
+  const [countdown, setCountdown] = useState(0)
+  const countDecreaseIntervalRef = useRef<ReturnType<typeof setInterval>>()
+  const resetCountDown = useCallback(() => {
+    clearInterval(countDecreaseIntervalRef.current)
+    setCountdown(second)
+    const decrement = () => {
+      countDecreaseIntervalRef.current = setInterval(() => {
+        setCountdown(v => {
+          if (v > 0) {
+            return v - 1
+          }
+          clearInterval(countDecreaseIntervalRef.current)
+          return v
+        })
+      }, 1_000)
+    }
+    decrement()
+  }, [setCountdown, countDecreaseIntervalRef])
+  return {
+    countdown,
+    resetCountDown,
+  }
+}
+
+const SetStartBlockNumberDialog = ({
+  initStartBlockNumber,
+  headerTipNumber,
+  isMainnet,
+  address,
+  onUpdateStartBlockNumber,
+  onCancel,
+  show,
+}: {
+  initStartBlockNumber?: number
+  headerTipNumber: number
+  isMainnet: boolean
+  address: string
+  onUpdateStartBlockNumber: (blockNumber: number) => Promise<void>
+  onCancel: () => void
+  show: boolean
+}) => {
+  const [t] = useTranslation()
+  const [startBlockNumber, setStartBlockNumber] = useState<number | undefined>(undefined)
+  const [blockNumberErr, setBlockNumberErr] = useState('')
+  const isSetLessThanBefore = useMemo(
+    () =>
+      startBlockNumber !== undefined && initStartBlockNumber !== undefined && startBlockNumber < initStartBlockNumber,
+    [initStartBlockNumber, startBlockNumber]
+  )
+  const { countdown, resetCountDown } = useCountDown(SET_START_BLOCK_COUNTDOWN_SECOND)
+  const onChangeStartBlockNumber = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.currentTarget
+      const blockNumber = value.replaceAll(',', '')
+      if (Number.isNaN(+blockNumber)) {
+        return
+      }
+      setStartBlockNumber(
+        // eslint-disable-next-line no-nested-ternary
+        +blockNumber > headerTipNumber ? headerTipNumber : blockNumber === '' ? undefined : +blockNumber
+      )
+      setBlockNumberErr(+blockNumber > headerTipNumber ? t('set-start-block-number.reset-to-header-tip-number') : '')
+      resetCountDown()
+    },
+    [resetCountDown, headerTipNumber, t]
+  )
+  const onOpenAddressInExplorer = useCallback(() => {
+    const explorerUrl = getExplorerUrl(isMainnet)
+    openExternal(`${explorerUrl}/address/${address}?sort=time`)
+  }, [address, isMainnet])
+  const onViewBlock = useCallback(() => {
+    const explorerUrl = getExplorerUrl(isMainnet)
+    openExternal(`${explorerUrl}/block/${startBlockNumber}`)
+  }, [startBlockNumber, isMainnet])
+  const onConfirm = useCallback(() => {
+    if (startBlockNumber !== undefined) {
+      onUpdateStartBlockNumber(startBlockNumber).catch(res => {
+        setBlockNumberErr(typeof res.message === 'string' ? res.message : res.message.content!)
+      })
+    }
+  }, [startBlockNumber])
+  useEffect(() => {
+    if (show) {
+      setStartBlockNumber(initStartBlockNumber)
+    }
+  }, [show, initStartBlockNumber, setStartBlockNumber])
+  return (
+    <Dialog
+      title={t('set-start-block-number.title')}
+      confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
+      show={show}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      disabled={!startBlockNumber || !!countdown}
+      contentClassName={styles.setBlockContent}
+    >
+      <div className={styles.setBlockWarn}>
+        <Attention />
+        {t('set-start-block-number.warn')}
+      </div>
+      <div className={styles.content}>
+        <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
+        <TextField
+          field="startBlockNumber"
+          onChange={onChangeStartBlockNumber}
+          placeholder={t('set-start-block-number.input-place-holder')}
+          value={startBlockNumber === undefined ? '' : localNumberFormatter(startBlockNumber)}
+          error={blockNumberErr}
+          suffix={
+            startBlockNumber !== undefined ? (
+              <button type="button" className={styles.viewAction} onClick={onViewBlock}>
+                {t('set-start-block-number.view-block')}
+                <NewTab />
+              </button>
+            ) : (
+              <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
+                {t('set-start-block-number.locate-first-tx')}
+                <NewTab />
+              </button>
+            )
+          }
+        />
+        {isSetLessThanBefore ? (
+          <Alert status="error" className={styles.errorMessage} withIcon={false}>
+            {t('set-start-block-number.set-less-than-before')}
+          </Alert>
+        ) : null}
+      </div>
+    </Dialog>
+  )
+}
+
+SetStartBlockNumberDialog.displayName = 'SetStartBlockNumberDialog'
+
+export default SetStartBlockNumberDialog
diff --git a/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss
new file mode 100644
index 0000000000..3d00c0d236
--- /dev/null
+++ b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss
@@ -0,0 +1,41 @@
+.setBlockContent {
+  padding: 0 0 20px 0;
+  overflow-y: auto;
+
+  .content {
+    padding: 0 16px 0 16px;
+  }
+  .startBlockTip {
+    font-weight: 400;
+    color: var(--secondary-text-color);
+  }
+
+  .setBlockWarn {
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--warn-background-color);
+    color: var(--warn-text-color);
+    font-size: 12px;
+    font-weight: 500;
+
+    & > svg {
+      margin-right: 4px;
+    }
+  }
+
+  .viewAction {
+    border: none;
+    background-color: transparent;
+    cursor: pointer;
+    color: var(--primary-color);
+    display: flex;
+    align-items: center;
+
+    & > svg {
+      width: 12px;
+      height: 12px;
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
index f0f9a69cb5..171aa745cb 100644
--- a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
+++ b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
@@ -493,7 +493,7 @@ const SpecialAssetList = () => {
                           label={t(`special-assets.${status}`)}
                           className={styles.actionBtn}
                           onClick={handleAction}
-                          disabled={btnDisabled}
+                          disabled={!!btnDisabled}
                         />
                       </Tooltip>
                     ) : (
@@ -505,7 +505,7 @@ const SpecialAssetList = () => {
                         label={t(`special-assets.${status}`)}
                         className={styles.actionBtn}
                         onClick={handleAction}
-                        disabled={btnDisabled}
+                        disabled={!!btnDisabled}
                       />
                     )}
                     <Button
diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
index 92b27d5cb3..8fd8c30dc5 100644
--- a/packages/neuron-ui/src/containers/Main/index.tsx
+++ b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -10,7 +10,7 @@ import RadioGroup from 'widgets/RadioGroup'
 import NetworkEditorDialog from 'components/NetworkEditorDialog'
 import { AddSimple } from 'widgets/Icons/icon'
 import DataPathDialog from 'widgets/DataPathDialog'
-import NoDiskSpaceWarn from 'widgets/Icons/NoDiskSpaceWarn.png'
+import NoDiskSpaceWarn from 'widgets/Icons/Attention.png'
 import MigrateCkbDataDialog from 'widgets/MigrateCkbDataDialog'
 import { keepScreenAwake } from 'services/localCache'
 import LockWindowDialog from 'components/GeneralSetting/LockWindowDialog'
diff --git a/packages/neuron-ui/src/services/remote/multisig.ts b/packages/neuron-ui/src/services/remote/multisig.ts
index 5b5ce1579a..d9c4b48629 100644
--- a/packages/neuron-ui/src/services/remote/multisig.ts
+++ b/packages/neuron-ui/src/services/remote/multisig.ts
@@ -21,6 +21,7 @@ export type MultisigEntity = MultisigParams & {
   id?: number
   walletId: string
   alias?: string
+  startBlockNumber?: number
 }
 
 export type MultisigConfig = MultisigEntity & {
@@ -52,3 +53,4 @@ export const loadMultisigTxJson = remoteApi<string, OfflineSignJSON>('load-multi
 export const getMultisigSyncProgress = remoteApi<string[], { hash: string; localSavedBlockNumber: number }[]>(
   'get-sync-progress-by-addresses'
 )
+export const changeMultisigSyncStatus = remoteApi<boolean, void>('change-multisig-sync-status')
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index e61d51197d..c8cb6f0722 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -159,6 +159,7 @@ type Action =
   | 'get-hold-sudt-cell-capacity'
   | 'start-migrate'
   | 'get-sync-progress-by-addresses'
+  | 'change-multisig-sync-status'
   // spore
   | 'generate-transfer-spore-tx'
   // cell-manage
diff --git a/packages/neuron-ui/src/widgets/Button/index.tsx b/packages/neuron-ui/src/widgets/Button/index.tsx
index 9de7ef9f19..9d4e6e276e 100644
--- a/packages/neuron-ui/src/widgets/Button/index.tsx
+++ b/packages/neuron-ui/src/widgets/Button/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { ButtonHTMLAttributes } from 'react'
 import Spinner from 'widgets/Spinner'
 import styles from './button.module.scss'
 
@@ -20,13 +20,9 @@ const Button = React.forwardRef(
     }: {
       type?: 'default' | 'cancel' | 'ok' | 'submit' | 'confirm' | 'primary' | 'reset' | 'text'
       label?: string
-      onClick?: any
-      disabled?: boolean
       className?: string
-      children?: React.ReactChild
       loading?: boolean
-      [key: string]: any
-    },
+    } & Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'type'>,
     ref: React.LegacyRef<HTMLButtonElement>
   ) => {
     const btnType = isNativeType(type) ? type : 'button'
diff --git a/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png b/packages/neuron-ui/src/widgets/Icons/Attention.png
similarity index 100%
rename from packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png
rename to packages/neuron-ui/src/widgets/Icons/Attention.png
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index c8a1f9bd2e..18ede963d1 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -58,6 +58,9 @@ import { ReactComponent as ImportKeystoreSvg } from './SoftWalletImportKeystore.
 import { ReactComponent as ImportHardwareSvg } from './HardWalletImport.svg'
 import { ReactComponent as DepositTimeSortSvg } from './DepositTimeSort.svg'
 import { ReactComponent as QuestionSvg } from './Question.svg'
+import { ReactComponent as DetailsSvg } from './Details.svg'
+import { ReactComponent as ConfirmSvg } from './Confirm.svg'
+import { ReactComponent as UploadSvg } from './Upload.svg'
 
 import styles from './icon.module.scss'
 
@@ -132,3 +135,6 @@ export const ImportKeystore = WrapSvg(ImportKeystoreSvg)
 export const ImportHardware = WrapSvg(ImportHardwareSvg)
 export const DepositTimeSort = WrapSvg(DepositTimeSortSvg)
 export const Question = WrapSvg(QuestionSvg)
+export const Details = WrapSvg(DetailsSvg)
+export const Confirm = WrapSvg(ConfirmSvg)
+export const Upload = WrapSvg(UploadSvg)
diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
index d323c05c7e..536c1b17ff 100644
--- a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
@@ -47,7 +47,7 @@ const MigrateCkbDataDialog = ({
     [currentPath, onConfirm]
   )
   const onActionClick = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
+    (e: React.MouseEvent<HTMLButtonElement>) => {
       if (e.currentTarget.dataset.syncType) {
         startSync(e.currentTarget.dataset.syncType)
       }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/index.ts b/packages/neuron-wallet/src/block-sync-renderer/index.ts
index 7bada7dac1..892c676618 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/index.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/index.ts
@@ -16,15 +16,13 @@ import CommonUtils from '../utils/common'
 import queueWrapper from '../utils/queue'
 import env from '../env'
 import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
-import Multisig from '../services/multisig'
-import { SyncAddressType } from '../database/chain/entities/sync-progress'
-import { debounceTime } from 'rxjs/operators'
 import { TransactionPersistor } from '../services/tx'
 
 let network: Network | null
 let child: ChildProcess | null = null
 let requestId = 0
 let requests = new Map<number, Record<'resolve' | 'reject', (val?: unknown) => unknown>>()
+let isSyncMultisigWithLight = false
 
 export const killBlockSyncTask = async () => {
   const _child = child
@@ -178,6 +176,7 @@ export const createBlockSyncTask = async () => {
       url: network.remote,
       addressMetas,
       nodeType: network.type,
+      syncMultisig: isSyncMultisigWithLight,
     }
     const msg: Required<WorkerMessage<StartParams>> = { type: 'call', channel: 'start', id: requestId++, message }
     return registerRequest(_child, msg).catch(err => {
@@ -199,17 +198,10 @@ export const registerRequest = (c: ChildProcess, msg: Required<WorkerMessage>) =
 
 AddressCreatedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
 WalletDeletedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
-MultisigConfigDbChangedSubject.getSubject()
-  .pipe(debounceTime(1000))
-  .subscribe(async () => {
-    if (!child) {
-      return
-    }
-    const appendScripts = await Multisig.getMultisigConfigForLight()
-    const msg: Required<
-      WorkerMessage<{ walletId: string; script: CKBComponents.Script; addressType: SyncAddressType }[]>
-    > = { type: 'call', channel: 'append_scripts', id: requestId++, message: appendScripts }
-    return registerRequest(child, msg).catch(err => {
-      logger.error(`Sync:\ffailed to append script to light client`, err)
-    })
-  })
+MultisigConfigDbChangedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
+
+export async function changeMultisigSyncStatus(status: boolean) {
+  logger.info(`Sync:\t ${status ? 'start' : 'stop'} multisig sync`)
+  isSyncMultisigWithLight = status
+  await resetSyncTask(true)
+}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index eb1f52bcf0..fe89dabefb 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -4,7 +4,7 @@ import { Address } from '../../models/address'
 import AddressMeta from '../../database/address/meta'
 import { scheduler } from 'timers/promises'
 import SyncProgressService from '../../services/sync-progress'
-import { Synchronizer, AppendScript } from './synchronizer'
+import { Synchronizer } from './synchronizer'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { FetchTransactionReturnType, LightRPC, LightScriptFilter } from '../../utils/ckb-rpc'
 import Multisig from '../../services/multisig'
@@ -28,6 +28,7 @@ const THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET = 100_000
 export default class LightSynchronizer extends Synchronizer {
   private lightRpc: LightRPC
   private addressMetas: AddressMeta[]
+  private syncMultisig?: boolean
 
   constructor(addresses: Address[], nodeUrl: string) {
     super({ addresses, nodeUrl })
@@ -84,7 +85,9 @@ export default class LightSynchronizer extends Synchronizer {
   private async synchronize() {
     const syncScripts = await this.upsertTxHashes()
     await this.updateSyncedBlockOfScripts(syncScripts)
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     const hasNextBlock = await this.notifyAndSyncNext(minSyncBlockNumber)
     if (!hasNextBlock) {
       await this.updateBlockStartNumber(minSyncBlockNumber)
@@ -180,8 +183,8 @@ export default class LightSynchronizer extends Synchronizer {
     )
   }
 
-  private async initSyncProgress(appendScripts: AppendScript[] = []) {
-    if (!this.addressMetas.length && !appendScripts.length) {
+  private async initSyncProgress() {
+    if (!this.addressMetas.length) {
       return
     }
     const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
@@ -215,48 +218,73 @@ export default class LightSynchronizer extends Synchronizer {
             walletMinBlockNumber[currentWalletId] - THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET
         )
       })
-    const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
-    const addScripts = [
-      ...allScripts
-        .filter(v => {
-          const scriptHash = scriptToHash(v.script)
-          return (
-            !existSyncScripts[scriptHash] ||
-            +existSyncScripts[scriptHash].blockNumber < walletMinBlockNumber[v.walletId]
-          )
-        })
-        .map(v => {
-          return {
-            ...v,
-            blockNumber: `0x${walletMinBlockNumber[v.walletId].toString(16)}`,
-          }
-        }),
-      ...appendScripts
-        .filter(v => !existSyncScripts[scriptToHash(v.script)])
-        .map(v => ({
+    const addScripts = allScripts
+      .filter(v => {
+        const scriptHash = scriptToHash(v.script)
+        return (
+          !existSyncScripts[scriptHash] || +existSyncScripts[scriptHash].blockNumber < walletMinBlockNumber[v.walletId]
+        )
+      })
+      .map(v => {
+        return {
           ...v,
-          blockNumber: `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
-        })),
-    ]
+          blockNumber: `0x${walletMinBlockNumber[v.walletId].toString(16)}`,
+        }
+      })
     await this.lightRpc.setScripts(addScripts, 'partial')
-    const allScriptHashes = new Set([
-      ...allScripts.map(v => scriptToHash(v.script)),
-      ...appendScripts.map(v => scriptToHash(v.script)),
-    ])
+    const allScriptHashes = new Set(allScripts.map(v => scriptToHash(v.script)))
     const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
     await this.lightRpc.setScripts(deleteScript, 'delete')
     const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
     await SyncProgressService.initSyncProgress(addScripts)
     await SyncProgressService.updateSyncProgressFlag(walletIds)
+  }
+
+  private async initMultisigSyncProgress() {
+    const multisigScripts = await Multisig.getMultisigConfigForLight()
+    if (!multisigScripts.length) {
+      return
+    }
+    const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
+    const syncScripts = await this.lightRpc.getScripts()
+    const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+    const existSyncScripts: Record<string, LightScriptFilter> = {}
+    retainedSyncScripts.forEach(v => {
+      existSyncScripts[scriptToHash(v.script)] = v
+    })
+    const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
+    const addScripts = multisigScripts
+      .filter(v => {
+        const scriptHash = scriptToHash(v.script)
+        return (
+          !existSyncScripts[scriptToHash(v.script)] ||
+          +existSyncScripts[scriptHash].blockNumber < (v.startBlockNumber ?? 0)
+        )
+      })
+      .map(v => ({
+        ...v,
+        blockNumber: `0x${Math.max(
+          otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0,
+          v.startBlockNumber ?? 0
+        ).toString(16)}`,
+      }))
+    await this.lightRpc.setScripts(addScripts, 'partial')
+    const allScriptHashes = new Set(multisigScripts.map(v => scriptToHash(v.script)))
+    const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
+    await this.lightRpc.setScripts(deleteScript, 'delete')
+    await SyncProgressService.initSyncProgress(addScripts)
     await SyncProgressService.removeByHashesAndAddressType(
       SyncAddressType.Multisig,
-      appendScripts.map(v => scriptToHash(v.script))
+      multisigScripts.map(v => scriptToHash(v.script))
     )
   }
 
-  private async initSync() {
-    const appendScripts = await Multisig.getMultisigConfigForLight()
-    await this.initSyncProgress(appendScripts)
+  private async initSync(syncMultisig?: boolean) {
+    if (syncMultisig) {
+      await this.initMultisigSyncProgress()
+    } else {
+      await this.initSyncProgress()
+    }
     while (this.pollingIndexer) {
       await this.synchronize()
       await scheduler.wait(5000)
@@ -293,21 +321,18 @@ export default class LightSynchronizer extends Synchronizer {
     )
   }
 
-  public async connect() {
+  public async connect(syncMultisig?: boolean) {
     try {
       logger.info('LightConnector:\tconnect ...:')
       this.pollingIndexer = true
-      this.initSync()
+      this.syncMultisig = syncMultisig
+      this.initSync(syncMultisig)
     } catch (error) {
       logger.error(`Error connecting to Light: ${error.message}`)
       throw error
     }
   }
 
-  async appendScript(scripts: AppendScript[]) {
-    this.initSyncProgress(scripts)
-  }
-
   private async checkTxExist(txHashes: string[]) {
     const transactions = await this.lightRpc
       .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
@@ -317,7 +342,9 @@ export default class LightSynchronizer extends Synchronizer {
 
   async processTxsInNextBlockNumber() {
     const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     if (
       nextBlockNumber !== undefined &&
       txHashesInNextBlock.length &&
@@ -339,7 +366,9 @@ export default class LightSynchronizer extends Synchronizer {
     } else {
       return
     }
-    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     await this.updateBlockStartNumber(Math.min(parseInt(blockNumber), minCachedBlockNumber))
     this.processNextBlockNumber()
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
index 6ff88e8e90..8eb2b923f3 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -17,7 +17,7 @@ import IndexerCacheService from './indexer-cache-service'
 import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import { ShouldInChildProcess } from '../../exceptions'
-import { AppendScript, BlockTips, Synchronizer } from './synchronizer'
+import { BlockTips, Synchronizer } from './synchronizer'
 import LightSynchronizer from './light-synchronizer'
 import { generateRPC } from '../../utils/ckb-rpc'
 import { NetworkType } from '../../models/network'
@@ -36,14 +36,16 @@ export default class Queue {
   #multiSignBlake160s: string[]
   #anyoneCanPayLockHashes: string[]
   #assetAccountInfo: AssetAccountInfo
+  #syncMultisig: boolean
 
-  constructor(url: string, addresses: AddressInterface[], nodeType: NetworkType) {
+  constructor(url: string, addresses: AddressInterface[], nodeType: NetworkType, syncMultisig: boolean) {
     this.#url = url
     this.#addresses = addresses
     this.#rpcService = new RpcService(url, nodeType)
     this.#nodeType = nodeType
     this.#assetAccountInfo = new AssetAccountInfo()
     this.#lockHashes = AddressParser.batchToLockHash(this.#addresses.map(meta => meta.address))
+    this.#syncMultisig = syncMultisig
 
     const blake160s = this.#addresses.map(meta => meta.blake160)
     this.#lockArgsSet = new Set(
@@ -69,7 +71,7 @@ export default class Queue {
       } else {
         this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#nodeType)
       }
-      await this.#indexerConnector!.connect()
+      await this.#indexerConnector!.connect(this.#syncMultisig)
     } catch (error) {
       logger.error('Restarting child process due to error', error.message)
       if (process.send) {
@@ -119,10 +121,6 @@ export default class Queue {
     }
   }
 
-  async appendLightScript(scripts: AppendScript[]) {
-    await this.#indexerConnector?.appendScript(scripts)
-  }
-
   private async fetchTxsWithStatus(txHashes: string[]) {
     const rpc = generateRPC(this.#url, this.#nodeType)
     const txsWithStatus = await rpc
@@ -269,6 +267,7 @@ export default class Queue {
           indexerTipNumber: tip.indexerTipNumber,
           cacheTipNumber: tip.cacheTipNumber,
           timestamp: Date.now(),
+          syncMultisig: this.#syncMultisig,
         },
       })
     } else {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
index cd6b840581..ff9c576f8c 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
@@ -4,7 +4,6 @@ import { type QueryOptions } from '@ckb-lumos/base'
 import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
 import AddressMeta from '../../database/address/meta'
 import { Address } from '../../models/address'
-import { SyncAddressType } from '../../database/chain/entities/sync-progress'
 import IndexerCacheService from './indexer-cache-service'
 import logger from '../../utils/logger'
 import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
@@ -14,13 +13,6 @@ export interface BlockTips {
   indexerTipNumber: number | undefined
 }
 
-export interface AppendScript {
-  walletId: string
-  script: CKBComponents.Script
-  addressType: SyncAddressType
-  scriptType: CKBRPC.ScriptType
-}
-
 export abstract class Synchronizer {
   public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
   public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string }>()
@@ -32,13 +24,10 @@ export abstract class Synchronizer {
   private indexerQueryQueue: QueueObject<QueryOptions> | undefined
   protected _needGenerateAddress: boolean = false
 
-  abstract connect(): Promise<void>
+  abstract connect(syncMultisig?: boolean): Promise<void>
   abstract processTxsInNextBlockNumber(): Promise<void>
   protected abstract upsertTxHashes(): Promise<unknown>
   public abstract notifyCurrentBlockNumberProcessed(blockNumber: string): Promise<void>
-  async appendScript(_scripts: AppendScript[]) {
-    // do nothing
-  }
 
   constructor({ addresses, nodeUrl }: { addresses: Address[]; nodeUrl: string }) {
     this.indexer = new CkbIndexer(nodeUrl)
diff --git a/packages/neuron-wallet/src/block-sync-renderer/task.ts b/packages/neuron-wallet/src/block-sync-renderer/task.ts
index dc937616dd..124a781fdd 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/task.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/task.ts
@@ -21,7 +21,6 @@ export interface WorkerMessage<T = any> {
     | 'address-created'
     | 'indexer-error'
     | 'check-and-save-wallet-address'
-    | 'append_scripts'
   message: T
 }
 
@@ -32,6 +31,7 @@ export interface StartParams {
   url: SyncQueueParams[0]
   addressMetas: SyncQueueParams[1]
   nodeType: SyncQueueParams[2]
+  syncMultisig: SyncQueueParams[3]
 }
 
 export type QueryIndexerParams = QueryOptions
@@ -62,7 +62,7 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
       try {
         await initConnection(message.genesisHash)
 
-        syncQueue = new SyncQueue(message.url, message.addressMetas, message.nodeType)
+        syncQueue = new SyncQueue(message.url, message.addressMetas, message.nodeType, message.syncMultisig)
         syncQueue.start()
       } catch (err) {
         logger.error(`Block Sync Task:\t`, err)
@@ -92,12 +92,6 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
       }
       break
     }
-    case 'append_scripts': {
-      if (Array.isArray(message)) {
-        await syncQueue?.appendLightScript(message)
-      }
-      break
-    }
     default: {
       // ignore
     }
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 0647f9db2a..911baa4d96 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -59,7 +59,7 @@ import startMonitor, { stopMonitor } from '../services/monitor'
 import { migrateCkbData } from '../services/ckb-runner'
 import NodeService from '../services/node'
 import SyncProgressService from '../services/sync-progress'
-import { resetSyncTaskQueue } from '../block-sync-renderer'
+import { changeMultisigSyncStatus, resetSyncTaskQueue } from '../block-sync-renderer'
 import DataUpdateSubject from '../models/subjects/data-update'
 import CellManagement from './cell-management'
 import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
@@ -913,6 +913,13 @@ export default class ApiController {
       return this.#multisigController.loadMultisigTxJson(fullPayload)
     })
 
+    handle('change-multisig-sync-status', (_, status: boolean) => {
+      changeMultisigSyncStatus(status)
+      return {
+        status: ResponseCode.Success,
+      }
+    })
+
     //migrate
     handle('start-migrate', async () => {
       migrateCkbData()
diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index ea41a69bb1..9ba5bc5ac3 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -14,6 +14,10 @@ import Multisig from '../models/multisig'
 import SystemScriptInfo from '../models/system-script-info'
 import NetworksService from '../services/networks'
 import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
+import { NetworkType } from '../models/network'
+import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
+import { LightRPC } from '../utils/ckb-rpc'
+import SyncProgressService from '../services/sync-progress'
 
 interface MultisigConfigOutput {
   multisig_configs: Record<
@@ -55,6 +59,23 @@ export default class MultisigController {
     }
   }
 
+  async resetMultisigSync(config: MultisigConfig, startBlockNumber: number) {
+    const network = NetworksService.getInstance().getCurrent()
+    const lightRpc = new LightRPC(network.remote)
+    const script = Multisig.getMultisigScript(config.blake160s, config.r, config.m, config.n)
+    await lightRpc.setScripts(
+      [
+        {
+          script,
+          blockNumber: `0x${startBlockNumber.toString(16)}`,
+          scriptType: 'lock' as CKBRPC.ScriptType,
+        },
+      ],
+      'partial'
+    )
+    SyncProgressService.resetMultisigSync(scriptToHash(script), startBlockNumber)
+  }
+
   async updateConfig(params: {
     id: number
     walletId?: string
@@ -63,8 +84,19 @@ export default class MultisigController {
     n?: number
     addresses?: string[]
     alias?: string
+    startBlockNumber?: number
   }) {
+    const config = await this.#multisigService.getMultisigConfigById(params.id)
     const result = await this.#multisigService.updateMultisigConfig(params)
+    const network = NetworksService.getInstance().getCurrent()
+    if (params.startBlockNumber && network.type === NetworkType.Light) {
+      if (config?.startBlockNumber !== undefined && config.startBlockNumber > params.startBlockNumber) {
+        // if set small than last, reset by set_script
+        this.resetMultisigSync(config, params.startBlockNumber)
+      }
+      // if it's light client, restart queue task
+      MultisigConfigDbChangedSubject.getSubject().next('UpdateStartBlockNumber')
+    }
     return {
       status: ResponseCode.Success,
       result,
diff --git a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
index 698be44a0f..3e62b73e5b 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -29,6 +29,9 @@ export default class MultisigConfig {
   @Column()
   lastestBlockNumber: string = ''
 
+  @Column()
+  startBlockNumber?: number
+
   public static fromModel(model: MultisigConfigModel): MultisigConfig {
     const multisigConfig = new MultisigConfig()
 
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
index 2d8469aff9..279acba979 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
@@ -8,7 +8,9 @@ export class RemoveAddressesMultisigConfig1651820157100 implements MigrationInte
     public async up(queryRunner: QueryRunner): Promise<any> {
       await queryRunner.renameColumn('multisig_config', 'addresses', 'blake160s')
       await queryRunner.dropColumn('multisig_config', 'fullpayload')
-      const configList = await queryRunner.manager.find(MultisigConfig)
+      // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+      // so it's better to use query to find the items
+      const configList: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
       const updated = configList.map(v => {
         v.blake160s = v.blake160s.map(v => addressToScript(v).args)
         return v
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
index e5dfeabc7e..3958f3e287 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
@@ -15,10 +15,9 @@ export class AddTypeSyncProgress1681360188494 implements MigrationInterface {
       default: SyncAddressType.Default,
     }))
     await queryRunner.createIndex("sync_progress", new TableIndex({ columnNames: ["addressType"] }))
-    const multisigConfigs = await queryRunner.connection
-      .getRepository(MultisigConfig)
-      .createQueryBuilder()
-      .getMany()
+    // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+    // so it's better to use query to find the items
+    const multisigConfigs: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
     const scriptHashes = multisigConfigs.map(v => scriptToHash(Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n)))
     await queryRunner.query(`UPDATE sync_progress set addressType=1 where hash in (${scriptHashes.map(v => `'${v}'`).join(',')})`)
   }
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
index 4a6c4b78d8..7ef43299d1 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
@@ -1,21 +1,18 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+import {MigrationInterface, QueryRunner} from "typeorm";
 
 export class RenameSyncProgress1702781527414 implements MigrationInterface {
     name = 'RenameSyncProgress1702781527414'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.renameColumn('sync_progress', 'blockStartNumber', 'localSavedBlockNumber')
-        await queryRunner.renameColumn('sync_progress', 'blockEndNumber', 'syncedBlockNumber')
-        await queryRunner.addColumn('sync_progress', new TableColumn({
-          name: 'lightStartBlockNumber',
-          type: 'integer',
-          default: 0
-        }))
+        // the typeorm renameColumn will throw an exception about drop indexer when rename or add column
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockStartNumber" to "localSavedBlockNumber"') 
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockEndNumber" to "syncedBlockNumber"')
+        await queryRunner.query(`ALTER TABLE "sync_progress" ADD COLUMN "lightStartBlockNumber" integer DEFAULT 0;`)
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.renameColumn('sync_progress', 'localSavedBlockNumber', 'blockStartNumber')
-        await queryRunner.renameColumn('sync_progress', 'syncedBlockNumber', 'blockEndNumber')
-    }
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "localSavedBlockNumber" to "blockStartNumber"') 
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "syncedBlockNumber" to "blockEndNumber"') 
+      }
 
 }
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
new file mode 100644
index 0000000000..c1bdb527c5
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddStartBlockNumber1716539079505 implements MigrationInterface {
+    name = 'AddStartBlockNumber1716539079505'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(`ALTER TABLE "multisig_config" ADD COLUMN "startBlockNumber" integer;`)
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(`ALTER TABLE "multisig_config" DROP COLUMN "startBlockNumber";`)
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index e49a21cad4..c3458375cd 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -68,6 +68,7 @@ import MultisigConfigSubscribe from './subscriber/multisig-config-subscriber'
 import TxDescriptionSubscribe from './subscriber/tx-description-subscriber'
 import SudtTokenInfoSubscribe from './subscriber/sudt-token-info-subscriber'
 import AssetAccountSubscribe from './subscriber/asset-account-subscriber'
+import { AddStartBlockNumber1716539079505 } from './migrations/1716539079505-AddStartBlockNumber'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 export type ConnectionName = 'light' | 'full'
@@ -184,6 +185,7 @@ const getConnectionOptions = (genesisBlockHash: string, connectionName: Connecti
       RenameSyncProgress1702781527414,
       RemoveAddressInIndexerCache1704357651876,
       AmendTransaction1709008125088,
+      AddStartBlockNumber1716539079505,
     ],
     subscribers: [
       AddressSubscribe,
diff --git a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
index fc8358a5e8..cbdfd63c1f 100644
--- a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
+++ b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
@@ -2,7 +2,7 @@ import { ReplaySubject } from 'rxjs'
 
 // subscribe this Subject to monitor any transaction table changes
 export class MultisigConfigDbChangedSubject {
-  private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove'>(100)
+  private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove' | 'UpdateStartBlockNumber'>(100)
 
   public static getSubject() {
     return MultisigConfigDbChangedSubject.subject
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index 5f97cd3b3a..2f3da9467f 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -41,6 +41,7 @@ export default class MultisigService {
     n?: number
     blake160s?: string[]
     alias?: string
+    startBlockNumber?: number
   }) {
     const result = await getConnection()
       .getRepository(MultisigConfig)
@@ -52,19 +53,15 @@ export default class MultisigService {
     if (!result) {
       throw new MultisigConfigNotExistError()
     }
-    await getConnection()
-      .createQueryBuilder()
-      .update(MultisigConfig)
-      .set({
-        alias: params.alias ?? result.alias,
-        walletId: params.walletId ?? result.walletId,
-        r: params.r ?? result.r,
-        m: params.m ?? result.m,
-        n: params.n ?? result.n,
-        blake160s: params.blake160s ?? result.blake160s,
-      })
-      .where('id = :id', { id: params.id })
-      .execute()
+    await getConnection().getRepository(MultisigConfig).update(params.id, {
+      alias: params.alias,
+      walletId: params.walletId,
+      r: params.r,
+      m: params.m,
+      n: params.n,
+      blake160s: params.blake160s,
+      startBlockNumber: params.startBlockNumber,
+    })
     return { ...result, ...params }
   }
 
@@ -77,6 +74,16 @@ export default class MultisigService {
     return result
   }
 
+  async getMultisigConfigById(id: number) {
+    return getConnection()
+      .getRepository(MultisigConfig)
+      .createQueryBuilder()
+      .where({
+        id,
+      })
+      .getOne()
+  }
+
   async deleteConfig(id: number) {
     const config = await getConnection()
       .getRepository(MultisigConfig)
@@ -342,6 +349,7 @@ export default class MultisigService {
       script: Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n),
       addressType: SyncAddressType.Multisig,
       scriptType: 'lock' as CKBRPC.ScriptType,
+      startBlockNumber: v.startBlockNumber,
     }))
   }
 }
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 54839896f2..1c46bdac31 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -86,15 +86,15 @@ export default class SyncProgressService {
     return result
   }
 
-  static async getCurrentWalletMinSyncedBlockNumber() {
+  static async getCurrentWalletMinSyncedBlockNumber(addressType: SyncAddressType = SyncAddressType.Default) {
     const currentWallet = WalletService.getInstance().getCurrent()
     const item = await getConnection()
       .getRepository(SyncProgress)
       .createQueryBuilder()
       .where({
         delete: false,
-        addressType: SyncAddressType.Default,
-        ...(currentWallet ? { walletId: currentWallet.id } : {}),
+        addressType,
+        ...(currentWallet && addressType === SyncAddressType.Default ? { walletId: currentWallet.id } : {}),
       })
       .orderBy('syncedBlockNumber', 'ASC')
       .getOne()
@@ -144,4 +144,17 @@ export default class SyncProgressService {
       addressType: SyncAddressType.Default,
     })
   }
+
+  static async resetMultisigSync(hash: string, startBlockNumber: number) {
+    await getConnection()
+      .createQueryBuilder()
+      .update(SyncProgress)
+      .set({
+        localSavedBlockNumber: startBlockNumber,
+        lightStartBlockNumber: startBlockNumber,
+        syncedBlockNumber: startBlockNumber,
+      })
+      .where({ hash })
+      .execute()
+  }
 }
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
index d53022eb38..6f04520d7e 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
@@ -77,6 +77,7 @@ describe(`Create block sync task`, () => {
         genesisHash: STUB_NETWORK.genesisHash,
         nodeType: NetworkType.Normal,
         url: STUB_NETWORK.remote,
+        syncMultisig: false,
       },
     })
   })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
index 8279828f14..0b8d0b9531 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
@@ -126,12 +126,15 @@ describe('test light synchronizer', () => {
       await connect.initSyncProgress()
       expect(getScriptsMock).toBeCalledTimes(0)
     })
-    it('append multisig script', async () => {
+    it('sync multisig config', async () => {
       getScriptsMock.mockResolvedValue([])
       const connect = new LightSynchronizer([], '')
       getOtherTypeSyncBlockNumberMock.mockResolvedValueOnce({})
+      getMultisigConfigForLightMock.mockResolvedValueOnce([
+        { walletId: 'walletId', script, addressType: 1, scriptType: 'lock' },
+      ])
       //@ts-ignore
-      await connect.initSyncProgress([{ walletId: 'walletId', script, addressType: 1, scriptType: 'lock' }])
+      await connect.initMultisigSyncProgress()
       expect(getScriptsMock).toBeCalledTimes(1)
       expect(setScriptsMock).toHaveBeenNthCalledWith(
         1,
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
index 9e0369e00a..706f11482f 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
@@ -70,7 +70,8 @@ describe(`Block Sync Task`, () => {
       expect(stubbedSyncQueue).toHaveBeenCalledWith(
         STUB_START_MESSAGE.message.url,
         STUB_START_MESSAGE.message.addressMetas,
-        STUB_START_MESSAGE.message.nodeType
+        STUB_START_MESSAGE.message.nodeType,
+        undefined
       )
       expect(stubbedSyncQueueStart).toHaveBeenCalled()
     })
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index 4f0e72fe7e..444c916b22 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -9,6 +9,7 @@ import SystemScriptInfo from '../../src/models/system-script-info'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 import { NetworkType } from '../../src/models/network'
+import { scheduler } from 'timers/promises'
 
 const [alice, bob, charlie] = keyInfos
 
@@ -30,6 +31,7 @@ jest.mock('../../src/services/networks', () => ({
     getCurrent: () => ({
       type: NetworkType.Normal,
     }),
+    isMainnet: jest.fn(),
   }),
 }))
 
@@ -45,6 +47,7 @@ describe('multisig service', () => {
   )
   const defaultMultisigConfig = MultisigConfig.fromModel(multisigConfigModel)
   defaultMultisigConfig.lastestBlockNumber = '0x0'
+  defaultMultisigConfig.startBlockNumber = 0
   const lock = {
     args: Multisig.hash(
       multisigConfigModel.blake160s,
@@ -97,6 +100,7 @@ describe('multisig service', () => {
     it('save success', async () => {
       const anotherConfig = MultisigConfig.fromModel(multisigConfigModel)
       anotherConfig.lastestBlockNumber = '0x0'
+      anotherConfig.startBlockNumber = 0
       anotherConfig.r = 2
       const res = await multisigService.saveMultisigConfig(anotherConfig)
       const count = await getConnection()
@@ -133,6 +137,26 @@ describe('multisig service', () => {
         .getOne()
       expect(config?.alias).toBe('newalisa')
     })
+    it('only update startBlockNumber and original data should not be change', async () => {
+      await multisigService.updateMultisigConfig({
+        id: multisigConfigModel.id!,
+        startBlockNumber: 256,
+      })
+      await scheduler.wait(2_000)
+      const config = await getConnection()
+        .getRepository(MultisigConfig)
+        .createQueryBuilder()
+        .where({
+          id: multisigConfigModel.id,
+        })
+        .getOne()
+      expect(config?.alias).toBe('alias')
+      expect(config?.startBlockNumber).toBe(256)
+      expect(config?.walletId).toBe(multisigConfigModel.walletId)
+      expect(config?.blake160s).toStrictEqual(multisigConfigModel.blake160s)
+      expect(config?.r).toBe(multisigConfigModel.r)
+      expect(config?.m).toBe(multisigConfigModel.m)
+    })
   })
 
   describe('test get config', () => {

From 86a74d7c623264b9c9d179023adbdb8a381ebe53 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Sat, 1 Jun 2024 22:49:04 +0800
Subject: [PATCH 2/2] fix: Add pause status for wallet sync

---
 packages/neuron-ui/src/components/NervosDAORecord/index.tsx | 2 +-
 packages/neuron-ui/src/components/PageContainer/index.tsx   | 2 +-
 packages/neuron-ui/src/components/SyncStatus/index.tsx      | 4 ++++
 packages/neuron-ui/src/locales/en.json                      | 1 +
 packages/neuron-ui/src/locales/es.json                      | 1 +
 packages/neuron-ui/src/locales/fr.json                      | 1 +
 packages/neuron-ui/src/locales/zh-tw.json                   | 1 +
 packages/neuron-ui/src/locales/zh.json                      | 1 +
 packages/neuron-ui/src/types/App/index.d.ts                 | 2 +-
 packages/neuron-ui/src/utils/enums.ts                       | 2 ++
 10 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
index 9b622beed7..58ee5342cd 100644
--- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
@@ -38,7 +38,7 @@ export interface DAORecordProps extends State.NervosDAORecord {
   depositEpoch: string // deposit epoch string
   currentEpoch: string // current epoch string
   withdrawCapacity: string | null // capacity that is available for withdraw
-  connectionStatus: 'online' | 'offline' | 'connecting' // connection status
+  connectionStatus: State.ConnectionStatus // connection status
   onClick: React.EventHandler<React.MouseEvent> // on action button click
   tipBlockTimestamp: number // tip block timestamp, used to calculate apc, dovetails with current epoch
   genesisBlockTimestamp: number | undefined // genesis block timestamp, used to calculate apc
diff --git a/packages/neuron-ui/src/components/PageContainer/index.tsx b/packages/neuron-ui/src/components/PageContainer/index.tsx
index 97305d8e3e..d17f8b3649 100755
--- a/packages/neuron-ui/src/components/PageContainer/index.tsx
+++ b/packages/neuron-ui/src/components/PageContainer/index.tsx
@@ -117,7 +117,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
           <div className={styles.syncStatus}>
             <SyncStatusComponent
               syncStatus={syncStatus}
-              connectionStatus={isOpenMultisigWithLight ? 'offline' : connectionStatus}
+              connectionStatus={isOpenMultisigWithLight ? 'pause' : connectionStatus}
               syncPercents={syncPercents}
               syncBlockNumbers={syncBlockNumbers}
               isLookingValidTarget={isLookingValidTarget}
diff --git a/packages/neuron-ui/src/components/SyncStatus/index.tsx b/packages/neuron-ui/src/components/SyncStatus/index.tsx
index d425869b0e..b6054af134 100644
--- a/packages/neuron-ui/src/components/SyncStatus/index.tsx
+++ b/packages/neuron-ui/src/components/SyncStatus/index.tsx
@@ -124,6 +124,10 @@ const SyncStatus = ({
     return <span>{t('navbar.connecting')}</span>
   }
 
+  if (ConnectionStatus.Pause === connectionStatus) {
+    return <span>{t('navbar.pause')}</span>
+  }
+
   if (ConnectionStatus.Offline === connectionStatus) {
     return (
       <span className={styles.redDot}>
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index f7c72d0e3b..e8100aea72 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -21,6 +21,7 @@
       "special-assets": "Customized Assets",
       "sync-not-start": "Sync not started yet",
       "connecting": "Connecting",
+      "pause": "Sync paused",
       "experimental-functions": "Experimental",
       "s-udt": "Asset Accounts",
       "update-neuron-with-ckb": "The version of the CKB node does not match Neuron (v{{ version }}), which may cause compatibility issues. Please update to the latest version of Neuron.",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 325880ce4e..8bcdc744d4 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -21,6 +21,7 @@
       "special-assets": "Activos personalizados",
       "sync-not-start": "Sincronización no iniciada aún",
       "connecting": "Conectando",
+      "pause": "Pausar sincronización",
       "experimental-functions": "Experimental",
       "s-udt": "Cuentas de activos",
       "update-neuron-with-ckb": "La versión del nodo de CKB no coincide con Neuron (v{{ version }}), lo que puede causar problemas de compatibilidad. Por favor actualice a la última versión de Neuron.",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 710b521d1c..bc59c94a4c 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -21,6 +21,7 @@
       "special-assets": "Actifs personnalisés",
       "sync-not-start": "Synchronisation pas encore démarrée",
       "connecting": "Connexion",
+      "pause": "Pause synchronisation",
       "experimental-functions": "Expérimental",
       "s-udt": "Comptes d'actifs",
       "update-neuron-with-ckb": "La version du noeud CKB ne correspond pas à Neuron (v{{ version }}), ce qui peut entraîner des problèmes de compatibilité. Veuillez mettre à jour vers la dernière version de Neuron.",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 3d82319d84..193bd9f94e 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -21,6 +21,7 @@
       "special-assets": "自定義資產",
       "sync-not-start": "同步尚未開始",
       "connecting": "正在連接節點",
+      "pause": "同步暫停",
       "experimental-functions": "實驗性功能",
       "s-udt": "資產賬戶",
       "update-neuron-with-ckb": "CKB 節點版本與 Neuron (v{{ version }}) 不匹配，可能導致兼容性問題。請更新到最新版 Neuron。",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 0854352928..58d5d508ba 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -21,6 +21,7 @@
       "special-assets": "自定义资产",
       "sync-not-start": "同步尚未开始",
       "connecting": "正在连接节点",
+      "pause": "同步暂停",
       "experimental-functions": "实验性功能",
       "s-udt": "资产账户",
       "update-neuron-with-ckb": "CKB 节点版本与 Neuron (v{{ version }}) 不匹配，可能导致兼容性问题。请更新到最新版 Neuron。",
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index e9902f710c..2a237caef5 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -239,7 +239,7 @@ declare namespace State {
     balance: string
     addresses: Address[]
   }
-  type ConnectionStatus = 'online' | 'offline' | 'connecting'
+  type ConnectionStatus = 'online' | 'offline' | 'connecting' | 'pause'
 
   type SyncState = Readonly<{
     cacheTipBlockNumber: number
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index 647f421446..747c8398a5 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -2,6 +2,8 @@ export enum ConnectionStatus {
   Online = 'online',
   Offline = 'offline',
   Connecting = 'connecting',
+  // pasue by open multisig address with light client
+  Pause = 'pause',
 }
 
 export enum RoutePath {