From 4712ae70b986a481b2392db4f4020f96f406c974 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Sat, 7 May 2022 11:16:00 +0800
Subject: [PATCH 1/5] Refactor: Use blake160 replace addresse. Rename
 'multi-sign' to 'multisig'

---
 .../src/components/MultisigAddress/hooks.ts   | 69 ++++++++++---------
 .../MultisigAddressCreateDialog/hooks.ts      | 44 +++++++-----
 .../MultisigAddressCreateDialog/index.tsx     | 19 +++--
 .../SendFromMultisigDialog/hooks.ts           |  6 +-
 packages/neuron-ui/src/locales/en.json        |  4 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  4 +-
 packages/neuron-ui/src/locales/zh.json        |  4 +-
 .../neuron-ui/src/services/remote/multisig.ts | 39 ++++++-----
 .../src/services/remote/remoteApiWrapper.ts   |  1 -
 packages/neuron-ui/src/types/App/index.d.ts   |  4 +-
 packages/neuron-ui/src/utils/index.ts         |  1 +
 packages/neuron-ui/src/utils/multisig.ts      | 38 ++++++++++
 .../src/block-sync-renderer/sync/queue.ts     |  5 +-
 packages/neuron-wallet/src/controllers/api.ts | 11 ++-
 .../neuron-wallet/src/controllers/multisig.ts | 62 +++--------------
 .../src/database/address/meta.ts              |  4 +-
 .../chain/entities/multisig-config.ts         | 11 +--
 ...820157092-RemoveAddressesMultisigConfig.ts | 16 +++++
 ...820157094-RemoveAddressesMultisigConfig.ts | 23 +++++++
 .../src/database/chain/ormconfig.ts           |  4 +-
 .../src/models/multisig-config.ts             | 37 ++++------
 .../src/models/{multi-sign.ts => multisig.ts} | 40 +++++------
 .../src/models/transaction-size.ts            | 12 +---
 packages/neuron-wallet/src/services/cells.ts  |  5 +-
 .../src/services/hardware/hardware.ts         |  8 +--
 .../neuron-wallet/src/services/multisig.ts    | 34 +++++----
 .../src/services/transaction-sender.ts        | 39 ++++++-----
 .../src/services/tx/transaction-generator.ts  | 16 +++--
 packages/neuron-wallet/src/utils/multisig.ts  | 12 ++--
 .../tests/block-sync-renderer/queue.test.ts   |  4 +-
 .../tests/controllers/multisig.test.ts        | 59 +++++++---------
 .../tests/database/address/meta.test.ts       |  4 +-
 .../tests/models/multi-sign.test.ts           | 16 ++---
 .../tests/services/cells.test.ts              |  4 +-
 .../tests/services/multisig.test.ts           | 17 +++--
 .../services/tx/transaction-generator.test.ts | 18 ++---
 .../services/tx/transaction-sender.test.ts    | 51 +++-----------
 .../tests/utils/multisig.test.ts              |  3 +-
 38 files changed, 379 insertions(+), 369 deletions(-)
 create mode 100644 packages/neuron-ui/src/utils/multisig.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts
 rename packages/neuron-wallet/src/models/{multi-sign.ts => multisig.ts} (64%)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index 46462b16e7..08bd5ba271 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -1,8 +1,9 @@
-import React, { useCallback, useState, useEffect } from 'react'
-import { useDialogWrapper, isSuccessResponse } from 'utils'
+import React, { useCallback, useState, useEffect, useMemo } from 'react'
+import { useDialogWrapper, isSuccessResponse, getMultisigAddress, DefaultLockInfo } from 'utils'
 import { MultisigOutputUpdate } from 'services/subjects'
 import {
   MultisigConfig,
+  MultisigEntity,
   saveMultisigConfig,
   getMultisigConfig,
   importMultisigConfig,
@@ -13,6 +14,7 @@ import {
   loadMultisigTxJson,
   OfflineSignJSON,
 } from 'services/remote'
+import { addressToScript, scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
 
 export const useSearch = (clearSelected: () => void) => {
   const [keywords, setKeywords] = useState('')
@@ -39,76 +41,81 @@ export const useSearch = (clearSelected: () => void) => {
 }
 
 export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isMainnet: boolean }) => {
-  const [configs, setConfigs] = useState<MultisigConfig[]>([])
+  const [entities, setEntities] = useState<MultisigEntity[]>([])
   const saveConfig = useCallback(
-    ({ m, n, r, addresses, fullPayload }) => {
+    ({ m, n, r, addresses }: { m: number; n: number; r: number; addresses: string[] }) => {
       return saveMultisigConfig({
         m,
         n,
         r,
-        addresses,
-        fullPayload,
+        blake160s: addresses.map(v => addressToScript(v).args),
         walletId,
       }).then(res => {
         if (isSuccessResponse(res)) {
-          if (res.result) {
-            setConfigs(v => [res.result!, ...v])
-          }
+          setEntities(v => (res.result ? [res.result, ...v] : v))
         } else {
           throw new Error(typeof res.message === 'string' ? res.message : res.message.content)
         }
       })
     },
-    [walletId, setConfigs]
+    [walletId, setEntities]
   )
   useEffect(() => {
-    getMultisigConfig({
-      walletId,
-    }).then(res => {
-      if (isSuccessResponse(res)) {
-        setConfigs(res.result)
+    getMultisigConfig(walletId).then(res => {
+      if (isSuccessResponse(res) && res.result) {
+        setEntities(res.result)
       }
     })
-  }, [setConfigs, walletId])
+  }, [setEntities, walletId, isMainnet])
   const updateConfig = useCallback(
     (id: number) => (alias: string | undefined) => {
       updateMultisigConfig({ id, alias: alias || '' }).then(res => {
         if (isSuccessResponse(res)) {
-          setConfigs(v => v.map(config => (config.id === res.result?.id ? res.result : config)))
+          setEntities(v => v.map(config => (res.result && config.id === res.result?.id ? res.result : config)))
         }
       })
     },
-    [setConfigs]
+    [setEntities]
+  )
+  const configs = useMemo<MultisigConfig[]>(
+    () =>
+      entities.map(entity => ({
+        ...entity,
+        addresses: entity.blake160s.map(args =>
+          scriptToAddress(
+            {
+              args,
+              codeHash: DefaultLockInfo.CodeHash,
+              hashType: DefaultLockInfo.HashType,
+            },
+            isMainnet
+          )
+        ),
+        fullPayload: getMultisigAddress(entity.blake160s, entity.r, entity.m, entity.n, isMainnet),
+      })),
+    [entities, isMainnet]
   )
-  const filterConfig = useCallback((key: string) => {
-    setConfigs(v =>
-      v.filter(config => {
-        return config.alias?.includes(key) || config.fullPayload === key
-      })
-    )
-  }, [])
   const deleteConfigById = useCallback(
     (id: number) => {
-      setConfigs(v => v.filter(config => config.id !== id))
+      setEntities(v => v.filter(config => config.id !== id))
     },
-    [setConfigs]
+    [setEntities]
   )
   const onImportConfig = useCallback(() => {
-    importMultisigConfig({ isMainnet, walletId }).then(res => {
+    importMultisigConfig(walletId).then(res => {
       if (isSuccessResponse(res) && res.result) {
         const { result } = res
         if (result) {
-          setConfigs(v => [...result, ...v])
+          setEntities(v => [...result, ...v])
         }
       }
     })
-  }, [walletId, isMainnet])
+  }, [walletId])
   return {
     saveConfig,
     allConfigs: configs,
     updateConfig,
     deleteConfigById,
-    filterConfig,
     onImportConfig,
   }
 }
diff --git a/packages/neuron-ui/src/components/MultisigAddressCreateDialog/hooks.ts b/packages/neuron-ui/src/components/MultisigAddressCreateDialog/hooks.ts
index 4892c4dc2b..42bbba9525 100644
--- a/packages/neuron-ui/src/components/MultisigAddressCreateDialog/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddressCreateDialog/hooks.ts
@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo, useState, useEffect } from 'react'
-import { createMultisigAddress } from 'services/remote'
-import { isSuccessResponse, validateAddress, isSecp256k1Address } from 'utils'
+import { validateAddress, isSecp256k1Address, getMultisigAddress } from 'utils'
 import { useTranslation } from 'react-i18next'
+import { addressToScript } from '@nervosnetwork/ckb-sdk-utils'
 
 export enum Step {
   setMN = 0,
@@ -28,15 +28,26 @@ export const useMAndN = () => {
     },
     [setN]
   )
-  const isError = useMemo(() => {
-    return !m || !n || Number(m) > Number(n)
+  const errorI18nKey: string | undefined = useMemo(() => {
+    if (!m || !n) {
+      return 'm-n-required'
+    }
+    const numM = Number(m)
+    const numN = Number(n)
+    if (numM > numN) {
+      return 'm-less-equal-n'
+    }
+    if (numM < 1 || numM > 255 || numN < 1 || numN > 255) {
+      return 'm-n-between-0-255'
+    }
+    return undefined
   }, [m, n])
   return {
     m,
     n,
     setMBySelect,
     setNBySelect,
-    isError,
+    errorI18nKey,
   }
 }
 
@@ -117,17 +128,18 @@ export const useViewMultisigAddress = ({
   const [multisigAddress, changeMultisigAddress] = useState('')
   useEffect(() => {
     if (step === Step.viewMultiAddress) {
-      createMultisigAddress({
-        r,
-        m,
-        n,
-        addresses,
-        isMainnet,
-      }).then(res => {
-        if (isSuccessResponse(res) && res.result) {
-          changeMultisigAddress(res.result)
-        }
-      })
+      try {
+        const address = getMultisigAddress(
+          addresses.map(v => addressToScript(v).args),
+          r,
+          m,
+          n,
+          isMainnet
+        )
+        changeMultisigAddress(address)
+      } catch (error) {
+        // ignore error. The ui ensures the correctness of the parameters
+      }
     }
   }, [step, changeMultisigAddress, m, n, r, addresses, isMainnet])
   return multisigAddress
diff --git a/packages/neuron-ui/src/components/MultisigAddressCreateDialog/index.tsx b/packages/neuron-ui/src/components/MultisigAddressCreateDialog/index.tsx
index 09e3201315..53f9f5a302 100644
--- a/packages/neuron-ui/src/components/MultisigAddressCreateDialog/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddressCreateDialog/index.tsx
@@ -18,11 +18,13 @@ const SetMN = ({
   n,
   changeM,
   changeN,
+  errorI18nKey,
 }: {
   m: string
   n: string
   changeM: (v: string) => void
   changeN: (v: string) => void
+  errorI18nKey?: string
 }) => {
   const [t] = useTranslation()
   return (
@@ -34,9 +36,7 @@ const SetMN = ({
         &nbsp;&nbsp;&nbsp;&nbsp;of&nbsp;&nbsp;&nbsp;&nbsp;
         <InputSelect options={keysCountArr} value={n} onChange={changeN} />
       </div>
-      {m && n && Number(m) > Number(n) && (
-        <span className={styles.error}>{t('multisig-address.create-dialog.m-n.error')}</span>
-      )}
+      {errorI18nKey && <span className={styles.error}>{t(`multisig-address.create-dialog.m-n.${errorI18nKey}`)}</span>}
     </div>
   )
 }
@@ -46,11 +46,11 @@ const MultisigAddressCreateDialog = ({
   confirm: saveConfig,
 }: {
   closeDialog: () => void
-  confirm: (v: Omit<MultisigConfig, 'id' | 'walletId'>) => Promise<void>
+  confirm: (v: Omit<MultisigConfig, 'id' | 'walletId' | 'fullPayload' | 'blake160s'>) => Promise<void>
 }) => {
   const [step, changeStep] = useState(Step.setMN)
   const [t] = useTranslation()
-  const { m, n, setMBySelect, setNBySelect, isError: mnErr } = useMAndN()
+  const { m, n, setMBySelect, setNBySelect, errorI18nKey: mnErr } = useMAndN()
   const next = useCallback(() => {
     changeStep(step + 1)
   }, [changeStep, step])
@@ -87,18 +87,17 @@ const MultisigAddressCreateDialog = ({
     saveConfig({
       m: Number(m),
       n: Number(n),
-      r,
+      r: Number(r),
       addresses,
-      fullPayload: multisigAddress,
     }).then(() => {
       closeDialog()
     })
-  }, [m, n, r, addresses, multisigAddress, saveConfig, closeDialog])
+  }, [m, n, r, addresses, saveConfig, closeDialog])
 
   return (
     <>
       <p>{t('multisig-address.create-dialog.title')}</p>
-      {step === Step.setMN && <SetMN m={m} n={n} changeM={setMBySelect} changeN={setNBySelect} />}
+      {step === Step.setMN && <SetMN m={m} n={n} changeM={setMBySelect} changeN={setNBySelect} errorI18nKey={mnErr} />}
       {step === Step.setMultiAddress && (
         <>
           <p>{t('multisig-address.create-dialog.multi-address-info.title', { m, n })}</p>
@@ -126,7 +125,7 @@ const MultisigAddressCreateDialog = ({
         <Button
           label={t(`multisig-address.create-dialog.actions.${step === Step.viewMultiAddress ? 'confirm' : 'next'}`)}
           type="primary"
-          disabled={(step === Step.setMN && mnErr) || (step === Step.setMultiAddress && addressErr)}
+          disabled={(step === Step.setMN && !!mnErr) || (step === Step.setMultiAddress && addressErr)}
           onClick={step === Step.viewMultiAddress ? confirm : next}
         />
       </div>
diff --git a/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts b/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
index 109ed39e7b..ce6d7e4a2f 100644
--- a/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
+++ b/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
@@ -12,11 +12,11 @@ import { useDispatch } from 'states'
 import { AppActions, StateDispatch } from 'states/stateProvider/reducer'
 import {
   generateMultisigTx,
-  MultisigConfig,
   generateMultisigSendAllTx,
   exportTransactionAsJSON,
   OfflineSignStatus,
   OfflineSignType,
+  MultisigConfig,
 } from 'services/remote'
 import { TFunction } from 'i18next'
 
@@ -95,8 +95,8 @@ export const useSendInfo = ({
   t: TFunction
 }) => {
   const [sendInfoList, setSendInfoList] = useState<
-    { address: string | undefined; amount: string | undefined; unit: CapacityUnit; disabled: boolean }[]
-  >([{ address: undefined, amount: undefined, unit: CapacityUnit.CKB, disabled: false }])
+    { address: string | undefined; amount: string | undefined; unit: CapacityUnit; disabled?: boolean }[]
+  >([{ address: undefined, amount: undefined, unit: CapacityUnit.CKB }])
   const addSendInfo = useCallback(() => {
     setSendInfoList(v => [...v, { address: undefined, amount: undefined, unit: CapacityUnit.CKB, disabled: false }])
   }, [setSendInfoList])
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 93c41eb10d..8d77adc683 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -916,7 +916,9 @@
         "copy-address": "Copy Address",
         "m-n": {
           "title": "Please choose the multisig address configuration in the m-of-n type where any m private keys out of a possible n are required to move the asset.",
-          "error": "for m-of-n multisig address, m shouldn't be greater than n"
+          "m-less-equal-n": "For m-of-n multisig address, m shouldn't be greater than n",
+          "m-n-required": "Please input or choose m/n",
+          "m-n-between-0-256": "m/n should between 0 and 256"
         },
         "multi-address-info": {
           "title": "Please input the signers for the {{m}}-of-{{n}} multisig address",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index f6ef417d41..823c59d0e7 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -908,7 +908,9 @@
         "copy-address": "復製地址",
         "m-n": {
           "title": "請選擇 m-of-n 類型的多重簽名地址配置，從 n 個密鑰中通過 m 個確認來轉移資產。",
-          "error": "對於 m-of-n 多重簽名地址，m 不應大於 n"
+          "m-less-equal-n": "對於 m-of-n 多重簽名地址，m 不應大於 n",
+          "m-n-required": "請輸入/選擇 m/n",
+          "m-n-between-0-256": "m/n 應該在 0-256 之間"
         },
         "multi-address-info": {
           "title": "對於 {{m}}-of-{{n}}, 請輸入 {{n}} 個簽名者地址",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 102b5829d6..46a427202f 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -908,7 +908,9 @@
         "copy-address": "复制地址",
         "m-n": {
           "title": "请选择 m-of-n 类型的多重签名地址配置，从 n 个密钥中通过 m 个确认来转移资产。",
-          "error": "对于 m-of-n 多重签名地址，m 不应大于 n"
+          "m-less-equal-n": "对于 m-of-n 多重签名地址，m 不应大于 n",
+          "m-n-required": "请输入/选择 m/n",
+          "m-n-between-0-256": "m/n 应该在 0-256 之间"
         },
         "multi-address-info": {
           "title": "对于 {{m}}-of-{{n}}, 请输入 {{n}} 个签名者地址",
diff --git a/packages/neuron-ui/src/services/remote/multisig.ts b/packages/neuron-ui/src/services/remote/multisig.ts
index 3e8f90d1ee..89ac83f02e 100644
--- a/packages/neuron-ui/src/services/remote/multisig.ts
+++ b/packages/neuron-ui/src/services/remote/multisig.ts
@@ -1,33 +1,40 @@
 import { remoteApi } from './remoteApiWrapper'
 import { OfflineSignJSON } from './offline'
 
-interface MultisigParams {
+type PartialSome<T, R extends keyof T> = Omit<T, R> &
+  {
+    [P in R]?: T[P]
+  }
+
+type RequiredSome<T, R extends keyof T> = Omit<T, R> &
+  {
+    [P in R]-?: T[P]
+  }
+
+type MultisigParams = {
+  id: number
   r: number
   m: number
   n: number
-  addresses: string[]
-  isMainnet: boolean
+  blake160s: string[]
 }
 
-export interface MultisigConfig {
-  id: number
+export type MultisigEntity = MultisigParams & {
+  id?: number
   walletId: string
-  r: number
-  m: number
-  n: number
-  addresses: string[]
   alias?: string
+}
+
+export type MultisigConfig = MultisigEntity & {
+  addresses: string[]
   fullPayload: string
 }
 
-export const createMultisigAddress = remoteApi<MultisigParams>('create-multisig-address')
-export const saveMultisigConfig = remoteApi<Omit<MultisigConfig, 'id'>, MultisigConfig>('save-multisig-config')
-export const getMultisigConfig = remoteApi<{ walletId: string }>('get-multisig-config')
-export const importMultisigConfig = remoteApi<{ isMainnet: boolean; walletId: string }, MultisigConfig[]>(
-  'import-multisig-config'
-)
+export const saveMultisigConfig = remoteApi<PartialSome<MultisigEntity, 'id'>, MultisigEntity>('save-multisig-config')
+export const getMultisigConfig = remoteApi<string, MultisigEntity[]>('get-multisig-config')
+export const importMultisigConfig = remoteApi<string, MultisigConfig[]>('import-multisig-config')
 export const exportMultisigConfig = remoteApi<MultisigConfig[]>('export-multisig-config')
-export const updateMultisigConfig = remoteApi<{ id: number } & Omit<Partial<MultisigConfig>, 'id'>, MultisigConfig>(
+export const updateMultisigConfig = remoteApi<RequiredSome<Partial<MultisigEntity>, 'id'>, MultisigEntity>(
   'update-multisig-config'
 )
 export const deleteMultisigConfig = remoteApi<number, boolean>('delete-multisig-config')
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 496eaf02de..c610a5c576 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -129,7 +129,6 @@ type Action =
   // nft
   | 'generate-transfer-nft-tx'
   // multisig
-  | 'create-multisig-address'
   | 'save-multisig-config'
   | 'get-multisig-config'
   | 'import-multisig-config'
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index e35319143d..9e0e7b2c90 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -101,9 +101,7 @@ declare namespace State {
       r: number
       m: number
       n: number
-      addresses: string[]
-      alias?: string
-      fullPayload: string
+      blake160s: string[]
     }
   }
 
diff --git a/packages/neuron-ui/src/utils/index.ts b/packages/neuron-ui/src/utils/index.ts
index 0c05d7633a..9631f58270 100644
--- a/packages/neuron-ui/src/utils/index.ts
+++ b/packages/neuron-ui/src/utils/index.ts
@@ -24,5 +24,6 @@ export * from './sortAccounts'
 export * from './getSyncLeftTime'
 export * from './baseActions'
 export * from './getSUDTAmount'
+export * from './multisig'
 
 export { CONSTANTS }
diff --git a/packages/neuron-ui/src/utils/multisig.ts b/packages/neuron-ui/src/utils/multisig.ts
new file mode 100644
index 0000000000..44b13556f5
--- /dev/null
+++ b/packages/neuron-ui/src/utils/multisig.ts
@@ -0,0 +1,38 @@
+import { scriptToAddress, blake2b, PERSONAL, hexToBytes } from '@nervosnetwork/ckb-sdk-utils'
+import { MultiSigLockInfo } from './enums'
+
+function getMultisigParamsHex(v: number) {
+  if (v < 0 || v > 255) {
+    throw new Error("Multisig's r/m/n should between 0 and 255")
+  }
+  return v.toString(16).padStart(2, '0')
+}
+
+function multisigSerialize(blake160s: string[], r: number = 0, m: number = 1, n: number = 1) {
+  const hexR = getMultisigParamsHex(r)
+  const hexM = getMultisigParamsHex(m)
+  const hexN = getMultisigParamsHex(n)
+  return `0x00${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
+}
+
+function multisigHash(blake160s: string[], r: number = 0, m: number = 1, n: number = 1): string {
+  const serializeResult = multisigSerialize(blake160s, r, m, n)
+  const blake2bHash = blake2b(32, null, null, PERSONAL)
+  blake2bHash.update(hexToBytes(serializeResult))
+  return `0x${blake2bHash.digest('hex')}`.slice(0, 42)
+}
+
+export function getMultisigAddress(blake160s: string[], r: number, m: number, n: number, isMainnet: boolean) {
+  return scriptToAddress(
+    {
+      args: multisigHash(blake160s, r, m, n),
+      codeHash: MultiSigLockInfo.CodeHash,
+      hashType: MultiSigLockInfo.HashType,
+    },
+    isMainnet
+  )
+}
+
+export default {
+  getMultisigAddress,
+}
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 12e185b971..022ebf8352 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -10,7 +10,7 @@ import SystemScriptInfo from 'models/system-script-info'
 import AssetAccountInfo from 'models/asset-account-info'
 import { Address as AddressInterface } from "models/address"
 import AddressParser from 'models/address-parser'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 import TxAddressFinder from './tx-address-finder'
 import IndexerConnector, { BlockTips } from './indexer-connector'
 import IndexerCacheService from './indexer-cache-service'
@@ -40,9 +40,8 @@ export default class Queue {
     this.#assetAccountInfo = new AssetAccountInfo()
     this.#lockHashes = AddressParser.batchToLockHash(this.#addresses.map(meta => meta.address))
 
-    const multiSign = new MultiSign()
     const blake160s = this.#addresses.map(meta => meta.blake160)
-    this.#multiSignBlake160s = blake160s.map(blake160 => multiSign.hash(blake160))
+    this.#multiSignBlake160s = blake160s.map(blake160 => Multisig.hash([blake160]))
     this.#anyoneCanPayLockHashes = blake160s.map(b => this.#assetAccountInfo.generateAnyoneCanPayScript(b).computeHash())
   }
 
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 477365ebc7..d82228100c 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -598,9 +598,6 @@ export default class ApiController {
     })
 
     // multi sign
-    handle('create-multisig-address', async (_, params) => {
-      return this.#multisigController.createMultisigAddress(params)
-    })
 
     handle('save-multisig-config', async (_, params) => {
       return this.#multisigController.saveConfig(params)
@@ -614,12 +611,12 @@ export default class ApiController {
       return this.#multisigController.deleteConfig(params)
     })
 
-    handle('get-multisig-config', async (_, params) => {
-      return this.#multisigController.getConfig(params)
+    handle('get-multisig-config', async (_, walletId: string) => {
+      return this.#multisigController.getConfig(walletId)
     })
 
-    handle('import-multisig-config', async (_, params) => {
-      return this.#multisigController.importConfig(params)
+    handle('import-multisig-config', async (_, walletId: string) => {
+      return this.#multisigController.importConfig(walletId)
     })
 
     handle('export-multisig-config', async (_, params) => {
diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index 3d28975d67..81317b2c9d 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -2,17 +2,13 @@ import fs from 'fs'
 import path from 'path'
 import { dialog, BrowserWindow } from 'electron'
 import { t } from 'i18next'
-import { scriptToAddress, addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
 import { ResponseCode } from 'utils/const'
-import MultiSign from 'models/multi-sign'
-import SystemScriptInfo from 'models/system-script-info'
 import MultisigConfig from 'database/chain/entities/multisig-config'
 import MultisigConfigModel from 'models/multisig-config'
 import MultisigService from 'services/multisig'
-import { MultisigConfigAddressError } from 'exceptions/multisig'
 import CellsService from 'services/cells'
 import OfflineSignService from 'services/offline-sign'
-import HexUtils from 'utils/hex'
 
 export default class MultisigController {
   // eslint-disable-next-line prettier/prettier
@@ -22,53 +18,20 @@ export default class MultisigController {
     this.#multisigService = new MultisigService();
   }
 
-  createMultisigAddress(params: {
-    r: number
-    m: number
-    n: number
-    addresses: string[]
-    isMainnet: boolean
-  }) {
-    const multiSign = new MultiSign();
-    const multiSignPrefix = {
-      S: MultiSign.defaultS,
-      R: HexUtils.toHex(params.r, 2),
-      M: HexUtils.toHex(params.m, 2),
-      N: HexUtils.toHex(params.n, 2)
-    };
-    const blake160s = params.addresses.map(address => addressToScript(address).args)
-    if (blake160s.some(blake160 => blake160.length !== 42)) {
-      throw new MultisigConfigAddressError()
-    }
-    return {
-      status: ResponseCode.Success,
-      result: scriptToAddress(
-        {
-          args: multiSign.hash(blake160s, multiSignPrefix),
-          codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
-          hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE
-        },
-        params.isMainnet
-      )
-    }
-  }
-
   async saveConfig(params: {
     walletId: string
     r: number
     m: number
     n: number
-    addresses: string[]
+    blake160s: string[]
     alias: string
-    fullPayload: string
   }) {
     const multiSignConfig = MultisigConfig.fromModel(new MultisigConfigModel(
       params.walletId,
+      params.r,
       params.m,
       params.n,
-      params.r,
-      params.addresses,
-      params.fullPayload,
+      params.blake160s,
       params.alias
     ))
     const result = await this.#multisigService.saveMultisigConfig(multiSignConfig)
@@ -87,7 +50,6 @@ export default class MultisigController {
     n?: number
     addresses?: string[]
     alias?: string
-    fullPayload?: string
   }) {
     const result = await this.#multisigService.updateMultisigConfig(params)
     return {
@@ -118,17 +80,15 @@ export default class MultisigController {
     }
   }
 
-  async getConfig(params: {
-    walletId: string
-  }) {
-    const result = await this.#multisigService.getMultisigConfig(params.walletId)
+  async getConfig(walletId: string) {
+    const result = await this.#multisigService.getMultisigConfig(walletId)
     return {
       status: ResponseCode.Success,
       result
     }
   }
 
-  async importConfig({ isMainnet, walletId }: { isMainnet: boolean, walletId: string }) {
+  async importConfig(walletId: string) {
     const { canceled, filePaths } = await dialog.showOpenDialog(BrowserWindow.getFocusedWindow()!, {
       title: t('multisig-config.import-config'),
       filters: [{
@@ -143,7 +103,7 @@ export default class MultisigController {
     }
     try {
       const json = fs.readFileSync(filePaths[0], 'utf-8')
-      let configs: Array<{r: number, m: number, n: number, addresses: string[], alias: string}> = JSON.parse(json)
+      let configs: Array<{r: number, m: number, n: number, blake160s: string[], alias: string}> = JSON.parse(json)
       if (!Array.isArray(configs)) {
         configs = [configs]
       }
@@ -151,7 +111,7 @@ export default class MultisigController {
         configs.some(config => config.r === undefined
           || config.m === undefined
           || config.n === undefined
-          || config.addresses === undefined)
+          || config.blake160s === undefined)
       ) {
         dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
         return
@@ -159,7 +119,6 @@ export default class MultisigController {
       const saveConfigs = configs.map(config => ({
         ...config,
         walletId,
-        fullPayload: this.createMultisigAddress({ ...config, isMainnet }).result
       }))
       const savedResult = await Promise.allSettled(saveConfigs.map(config => this.saveConfig(config)))
       const saveSuccessConfigs: MultisigConfig[] = []
@@ -194,9 +153,8 @@ export default class MultisigController {
     r: number
     m: number
     n: number
-    addresses: string[]
+    blake160s: string[]
     alias?: string
-    fullPayload: string
   }[]) {
     const { canceled, filePath } = await dialog.showSaveDialog(BrowserWindow.getFocusedWindow()!, {
       title: t('multisig-config.export-config'),
diff --git a/packages/neuron-wallet/src/database/address/meta.ts b/packages/neuron-wallet/src/database/address/meta.ts
index 390a51915b..199754bf32 100644
--- a/packages/neuron-wallet/src/database/address/meta.ts
+++ b/packages/neuron-wallet/src/database/address/meta.ts
@@ -4,7 +4,7 @@ import Script from 'models/chain/script'
 import SystemScriptInfo from 'models/system-script-info'
 import AssetAccountInfo from 'models/asset-account-info'
 import HdPublicKeyInfoModel from 'models/keys/hd-public-key-info'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 
 export default class AddressMeta implements Address {
   walletId: string
@@ -100,7 +100,7 @@ export default class AddressMeta implements Address {
   }
 
   public generateSingleMultiSignLockScript(): Script {
-    return SystemScriptInfo.generateMultiSignScript(new MultiSign().hash(this.blake160))
+    return SystemScriptInfo.generateMultiSignScript(Multisig.hash([this.blake160]))
   }
 
   public generateACPLockScript(): Script {
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 7f691adeb7..aa90c8ab30 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -21,14 +21,11 @@ export default class MultisigConfig {
   r!: number
 
   @Column('simple-array')
-  addresses!: string[]
+  blake160s!: string[]
 
   @Column()
   alias!: string
 
-  @Column()
-  fullPayload!: string
-
   @Column()
   lastestBlockNumber!: string
 
@@ -36,15 +33,13 @@ export default class MultisigConfig {
     const multisigConfig = new MultisigConfig()
 
     multisigConfig.walletId = model.walletId
+    multisigConfig.r = model.r
     multisigConfig.m = model.m
     multisigConfig.n = model.n
-    multisigConfig.r = model.r
-    multisigConfig.addresses = model.addresses
+    multisigConfig.blake160s = model.blake160s
     if (model.alias) {
       multisigConfig.alias = model.alias
     }
-    multisigConfig.fullPayload = model.fullPayload
-
     return multisigConfig
   }
 
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
new file mode 100644
index 0000000000..46fcbf1d08
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveAddressesMultisigConfig1651820157092 implements MigrationInterface {
+    name = 'RemoveAddressesMultisigConfig1651820157092'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+      const configList = await queryRunner.query('select * from multisig_config')
+      console.log(configList)
+      console.log(configList.length)
+    }
+
+    public async down(): Promise<void> {
+      // do nothing
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts
new file mode 100644
index 0000000000..dbd5e2d5fd
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm"
+import { addressToScript } from "@nervosnetwork/ckb-sdk-utils"
+import MultisigConfig from "../entities/multisig-config"
+
+export class RemoveAddressesMultisigConfig1651820157100 implements MigrationInterface {
+    name = 'RemoveAddressesMultisigConfig1651820157100'
+
+    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)
+      const updated = configList.map(v => {
+        v.blake160s = v.blake160s.map(v => addressToScript(v).args)
+        return v
+      })
+      await queryRunner.manager.save(updated)
+    }
+
+    public async down(): Promise<void> {
+      // do nothing
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 736898be8f..196fadf17d 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -46,6 +46,7 @@ import { AddMultisigConfig1646817547204 } from './migrations/1646817547204-AddMu
 import { AddMultisigOutput1649729996969 } from './migrations/1649729996969-AddMultisigOutput'
 import { UpdateAddressDescription1650984779265 } from './migrations/1650984779265-UpdateAddressDescription'
 import { RemoveDuplicateBlake160s1651133703535 } from './migrations/1651133703535-RemoveDuplicateBlake160s'
+import { RemoveAddressesMultisigConfig1651820157100 } from './migrations/1651820157094-RemoveAddressesMultisigConfig'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -107,7 +108,8 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       AddMultisigConfig1646817547204,
       AddMultisigOutput1649729996969,
       UpdateAddressDescription1650984779265,
-      RemoveDuplicateBlake160s1651133703535
+      RemoveDuplicateBlake160s1651133703535,
+      RemoveAddressesMultisigConfig1651820157100
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/src/models/multisig-config.ts b/packages/neuron-wallet/src/models/multisig-config.ts
index 797572c625..c830649995 100644
--- a/packages/neuron-wallet/src/models/multisig-config.ts
+++ b/packages/neuron-wallet/src/models/multisig-config.ts
@@ -1,31 +1,21 @@
-import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import Multisig from './multisig'
 
 export default class MultisigConfigModel {
   public id?: number
   public walletId: string
+  public r: number
   public m: number
   public n: number
-  public r: number
-  public addresses: string[]
+  public blake160s: string[]
   public alias?: string
-  public fullPayload: string
 
-  constructor(
-    walletId: string,
-    m: number,
-    n: number,
-    r: number,
-    addresses: string[],
-    fullPayload: string,
-    alias?: string,
-    id?: number
-  ) {
+  constructor(walletId: string, r: number, m: number, n: number, blake160s: string[], alias?: string, id?: number) {
     this.walletId = walletId
+    this.r = r
     this.m = m
     this.n = n
-    this.r = r
-    this.addresses = addresses
-    this.fullPayload = fullPayload
+    this.blake160s = blake160s
     this.alias = alias
     this.id = id
   }
@@ -35,18 +25,16 @@ export default class MultisigConfigModel {
     m: number
     n: number
     r: number
-    addresses: string[]
+    blake160s: string[]
     alias?: string
-    fullPayload: string
     id?: number
   }): MultisigConfigModel {
     return new MultisigConfigModel(
       params.walletId,
+      params.r,
       params.m,
       params.n,
-      params.r,
-      params.addresses,
-      params.fullPayload,
+      params.blake160s,
       params.alias,
       params.id
     )
@@ -57,13 +45,12 @@ export default class MultisigConfigModel {
       m: this.m,
       n: this.n,
       r: this.r,
-      addresses: this.addresses,
-      fullPayload: this.fullPayload,
+      blake160s: this.blake160s,
       alias: this.alias
     }
   }
 
   public getLockHash() {
-    return scriptToHash(addressToScript(this.fullPayload))
+    return scriptToHash(Multisig.getMultisigScript(this.blake160s, this.r, this.m, this.n))
   }
 }
diff --git a/packages/neuron-wallet/src/models/multi-sign.ts b/packages/neuron-wallet/src/models/multisig.ts
similarity index 64%
rename from packages/neuron-wallet/src/models/multi-sign.ts
rename to packages/neuron-wallet/src/models/multisig.ts
index 879a5edcc2..d9429ec5a4 100644
--- a/packages/neuron-wallet/src/models/multi-sign.ts
+++ b/packages/neuron-wallet/src/models/multisig.ts
@@ -1,5 +1,6 @@
 import { MultisigPrefixError } from 'exceptions'
 import Blake2b from './blake2b'
+import SystemScriptInfo from './system-script-info'
 
 export interface MultisigPrefix {
   S: string
@@ -8,32 +9,22 @@ export interface MultisigPrefix {
   N: string
 }
 
-const defaultMultisigPrefix = {
-  S: '0x00',
-  R: '0x00',
-  M: '0x01',
-  N: '0x01'
-}
-
-export default class MultiSign {
+export default class Multisig {
   // 1 epoch = 4h = 240min
   EPOCH_MINUTES = 240
 
   static defaultS: string = '0x00'
 
-  serialize(blake160s: string[], { S, R, M, N }: MultisigPrefix = defaultMultisigPrefix) {
-    this.validateMultisigPrefix(S)
-    this.validateMultisigPrefix(R)
-    this.validateMultisigPrefix(M)
-    this.validateMultisigPrefix(N)
-    return `${S}${R.slice(2)}${M.slice(2)}${N.slice(2)}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
+  static serialize(blake160s: string[], r: number = 0, m: number = 1, n: number = 1) {
+    const hexR = Multisig.getMultisigParamsHex(r)
+    const hexM = Multisig.getMultisigParamsHex(m)
+    const hexN = Multisig.getMultisigParamsHex(n)
+    return `0x00${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
   }
 
-  hash(blake160: string | string[], multisigPrefix: MultisigPrefix = defaultMultisigPrefix): string {
-    return Blake2b.digest(this.serialize(typeof blake160 === 'string' ? [blake160] : blake160, multisigPrefix)).slice(
-      0,
-      42
-    )
+  static hash(blake160s: string[], r: number = 0, m: number = 1, n: number = 1): string {
+    const serializeResult = Multisig.serialize(blake160s, r, m, n)
+    return Blake2b.digest(serializeResult).slice(0, 42)
   }
 
   since(minutes: number, headerEpoch: string): string {
@@ -59,7 +50,11 @@ export default class MultiSign {
   }
 
   args(blake160: string, minutes: number, headerEpoch: string): string {
-    return this.hash(blake160) + this.since(minutes, headerEpoch).slice(2)
+    return Multisig.hash([blake160]) + this.since(minutes, headerEpoch).slice(2)
+  }
+
+  static getMultisigScript(blake160s: string[], r: number, m: number, n: number) {
+    return SystemScriptInfo.generateMultiSignScript(Multisig.hash(blake160s, r, m, n))
   }
 
   parseSince(args: string): bigint {
@@ -81,9 +76,10 @@ export default class MultiSign {
     }
   }
 
-  private validateMultisigPrefix(v: string) {
-    if (!v.startsWith('0x') || v.length !== 4) {
+  private static getMultisigParamsHex(v: number) {
+    if (v < 0 || v > 255) {
       throw new MultisigPrefixError()
     }
+    return v.toString(16).padStart(2, '0')
   }
 }
diff --git a/packages/neuron-wallet/src/models/transaction-size.ts b/packages/neuron-wallet/src/models/transaction-size.ts
index 82e0072e3a..ac357772dd 100644
--- a/packages/neuron-wallet/src/models/transaction-size.ts
+++ b/packages/neuron-wallet/src/models/transaction-size.ts
@@ -4,7 +4,7 @@ import { serializeFixVec } from '@nervosnetwork/ckb-sdk-utils/lib/serialization'
 import Output from './chain/output'
 import WitnessArgs from './chain/witness-args'
 import Transaction from './chain/transaction'
-import MultiSign from './multi-sign'
+import Multisig from './multisig'
 import Script, { ScriptHashType } from './chain/script'
 import BufferUtils from 'utils/buffer'
 
@@ -81,20 +81,14 @@ export default class TransactionSize {
 
   public static singleMultiSignWitness(): number {
     const blake160 = '0x' + '0'.repeat(40)
-    const lock = new MultiSign().serialize([blake160]) + '0'.repeat(130)
+    const lock = Multisig.serialize([blake160]) + '0'.repeat(130)
     const wit = new WitnessArgs(lock)
     return TransactionSize.witness(wit)
   }
 
   public static multiSignWitness(r: number, m: number, n: number): number {
     const blake160 = '0x' + '0'.repeat(40)
-    const lock =
-      new MultiSign().serialize(new Array(n).fill(blake160), {
-        R: HexUtils.toHex(r, 2),
-        M: HexUtils.toHex(m, 2),
-        N: HexUtils.toHex(n, 2),
-        S: MultiSign.defaultS
-      }) + '0'.repeat(130 * m)
+    const lock = Multisig.serialize(new Array(n).fill(blake160), r, m, n) + '0'.repeat(130 * m)
     const wit = new WitnessArgs(lock)
     return TransactionSize.witness(wit)
   }
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index e8f8f58928..ea92b54133 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -18,7 +18,7 @@ import { TransactionStatus } from 'models/chain/transaction'
 import OutPoint from 'models/chain/out-point'
 import Input from 'models/chain/input'
 import WitnessArgs from 'models/chain/witness-args'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 import BufferUtils from 'utils/buffer'
 import LiveCell from 'models/chain/live-cell'
 import Output from 'models/chain/output'
@@ -246,8 +246,7 @@ export default class CellsService {
     pageSize: number
   ): Promise<PaginationResult<Cell>> {
     const blake160Hashes = new Set(blake160s)
-    const multiSign = new MultiSign()
-    const multiSignHashes = new Set(blake160s.map(blake160 => multiSign.hash(blake160)))
+    const multiSignHashes = new Set(blake160s.map(blake160 => Multisig.hash([blake160])))
     const assetAccountInfo = new AssetAccountInfo()
     const chequeLockCodeHash = assetAccountInfo.getChequeInfo().codeHash
     const nftIssuerCodehash = assetAccountInfo.getNftIssuerInfo().codeHash
diff --git a/packages/neuron-wallet/src/services/hardware/hardware.ts b/packages/neuron-wallet/src/services/hardware/hardware.ts
index 9843353015..d2421f0931 100644
--- a/packages/neuron-wallet/src/services/hardware/hardware.ts
+++ b/packages/neuron-wallet/src/services/hardware/hardware.ts
@@ -4,7 +4,7 @@ import WitnessArgs from 'models/chain/witness-args'
 import { serializeWitnessArgs } from '@nervosnetwork/ckb-sdk-utils'
 import AddressService from 'services/addresses'
 import TransactionSender from 'services/transaction-sender'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 import WalletService from 'services/wallets'
 import DeviceSignIndexSubject from 'models/subjects/device-sign-index-subject'
 import type { DeviceInfo, ExtendedPublicKey, PublicKey } from './common'
@@ -42,7 +42,7 @@ export abstract class Hardware {
 
     const multiSignBlake160s = isMultiSign ? addressInfos.map(i => {
       return {
-        multiSignBlake160: new MultiSign().hash(i.blake160),
+        multiSignBlake160: Multisig.hash([i.blake160]),
         path: i.path
       }
     }) : []
@@ -81,8 +81,8 @@ export abstract class Hardware {
           }
           return serializeWitnessArgs(args.toSDK())
         })
-        const blake160 = addressInfos.find(i => witnessesArgs[0].lockArgs.slice(0, 42) === new MultiSign().hash(i.blake160))!.blake160
-        const serializedMultiSign: string = new MultiSign().serialize([blake160])
+        const blake160 = addressInfos.find(i => witnessesArgs[0].lockArgs.slice(0, 42) === Multisig.hash([i.blake160]))!.blake160
+        const serializedMultiSign: string = Multisig.serialize([blake160])
         const witnesses = await TransactionSender.signSingleMultiSignScript(path, serializedWitnesses, txHash, serializedMultiSign, wallet)
         const signature = await this.signTransaction(
           walletID,
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index f7fb355179..fb3a8a73e1 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -3,12 +3,13 @@ import MultisigConfig from 'database/chain/entities/multisig-config'
 import MultisigOutput from 'database/chain/entities/multisig-output'
 import { MultisigConfigNotExistError, MultisigConfigExistError } from 'exceptions/multisig'
 import { rpcBatchRequest } from 'utils/rpc-request'
-import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
 import MultisigOutputChangedSubject from 'models/subjects/multisig-output-db-changed-subject'
 import Transaction from 'models/chain/transaction'
 import { OutputStatus } from 'models/chain/output'
 import IndexerService from './indexer'
 import NetworksService from './networks'
+import Multisig from 'models/multisig'
 
 const max64Int = '0x' + 'f'.repeat(16)
 export default class MultisigService {
@@ -18,7 +19,10 @@ export default class MultisigService {
       .createQueryBuilder()
       .where({
         walletId: multisigConfig.walletId,
-        fullPayload: multisigConfig.fullPayload
+        r: multisigConfig.r,
+        m: multisigConfig.m,
+        n: multisigConfig.n,
+        blake160s: multisigConfig.blake160s
       })
       .getCount()
     if (result > 0) {
@@ -33,9 +37,8 @@ export default class MultisigService {
     r?: number
     m?: number
     n?: number
-    addresses?: string[]
+    blake160s?: string[]
     alias?: string
-    fullPayload?: string
   }) {
     const result = await getConnection()
       .getRepository(MultisigConfig)
@@ -56,8 +59,7 @@ export default class MultisigService {
         r: params.r ?? result.r,
         m: params.m ?? result.m,
         n: params.n ?? result.n,
-        addresses: params.addresses ?? result.addresses,
-        fullPayload: params.fullPayload ?? result.fullPayload
+        blake160s: params.blake160s ?? result.blake160s
       })
       .where('id = :id', { id: params.id })
       .execute()
@@ -95,7 +97,7 @@ export default class MultisigService {
       const res = await rpcBatchRequest(
         IndexerService.LISTEN_URI,
         currentMultisigConfigs.map(v => {
-          const script = addressToScript(v.fullPayload)
+          const script = Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n)
           return {
             method: 'get_cells',
             params: [
@@ -112,7 +114,7 @@ export default class MultisigService {
               },
               'desc',
               '0x64',
-              addressCursorMap.get(v.fullPayload)
+              addressCursorMap.get(script.args)
             ]
           }
         })
@@ -120,7 +122,9 @@ export default class MultisigService {
       const nextMultisigConfigs: MultisigConfig[] = []
       res.forEach((v, idx) => {
         if (!v.error && v?.result?.objects?.length) {
-          addressCursorMap.set(currentMultisigConfigs[idx].fullPayload, v?.result?.last_cursor)
+          const config = currentMultisigConfigs[idx]
+          const script = Multisig.getMultisigScript(config.blake160s, config.r, config.m, config.n)
+          addressCursorMap.set(script.args, v?.result?.last_cursor)
           liveCells.push(
             ...v.result.objects
               .filter((object: any) => !object?.output?.type)
@@ -154,7 +158,7 @@ export default class MultisigService {
       const res = await rpcBatchRequest(
         IndexerService.LISTEN_URI,
         currentMultisigConfigs.map(v => {
-          const script = addressToScript(v.fullPayload)
+          const script = Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n)
           return {
             method: 'get_transactions',
             params: [
@@ -171,7 +175,7 @@ export default class MultisigService {
               },
               'desc',
               '0x64',
-              addressCursorMap.get(v.fullPayload)
+              addressCursorMap.get(script.args)
             ]
           }
         })
@@ -179,7 +183,9 @@ export default class MultisigService {
       const nextMultisigConfigs: MultisigConfig[] = []
       res.forEach((v, idx) => {
         if (!v.error && v?.result?.objects?.length) {
-          addressCursorMap.set(currentMultisigConfigs[idx].fullPayload, v?.result?.last_cursor)
+          const config = currentMultisigConfigs[idx]
+          const script = Multisig.getMultisigScript(config.blake160s, config.r, config.m, config.n)
+          addressCursorMap.set(script.args, v?.result?.last_cursor)
           v.result.objects.forEach((transaction: any) => {
             multisigOutputTxHashList.add(transaction.tx_hash)
           })
@@ -227,7 +233,9 @@ export default class MultisigService {
       .getRepository(MultisigConfig)
       .createQueryBuilder()
       .getMany()
-    const multisigLockHashList = multisigConfigs.map(v => scriptToHash(addressToScript(v.fullPayload)))
+    const multisigLockHashList = multisigConfigs.map(v =>
+      scriptToHash(Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n))
+    )
     await getConnection()
       .createQueryBuilder()
       .delete()
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index cd1a82e3f9..dc144d825a 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -1,6 +1,6 @@
 import WalletService, { Wallet } from 'services/wallets'
 import NodeService from './node'
-import { addressToScript, serializeWitnessArgs, toUint64Le } from '@nervosnetwork/ckb-sdk-utils'
+import { scriptToAddress, serializeWitnessArgs, toUint64Le } from '@nervosnetwork/ckb-sdk-utils'
 import { TransactionPersistor, TransactionGenerator, TargetOutput } from './tx'
 import AddressService from './addresses'
 import { Address } from 'models/address'
@@ -19,7 +19,7 @@ import WitnessArgs from 'models/chain/witness-args'
 import Transaction from 'models/chain/transaction'
 import BlockHeader from 'models/chain/block-header'
 import Script from 'models/chain/script'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 import Blake2b from 'models/blake2b'
 import HexUtils from 'utils/hex'
 import ECPair from '@nervosnetwork/ckb-sdk-utils/lib/ecpair'
@@ -39,6 +39,7 @@ import { Hardware } from './hardware/hardware'
 import MultisigService from './multisig'
 import { getMultisigStatus } from 'utils/multisig'
 import { SignStatus } from 'models/offline-sign'
+import NetworksService from './networks'
 
 interface SignInfo {
   witnessArgs: WitnessArgs
@@ -134,7 +135,7 @@ export default class TransactionSender {
     const multiSignBlake160s = isMultiSign
       ? addressInfos.map(i => {
           return {
-            multiSignBlake160: new MultiSign().hash(i.blake160),
+            multiSignBlake160: Multisig.hash([i.blake160]),
             path: i.path
           }
         })
@@ -196,10 +197,9 @@ export default class TransactionSender {
       let signed: (string | CKBComponents.WitnessArgs | WitnessArgs)[] = []
 
       if (isMultiSign) {
-        const blake160 = addressInfos.find(
-          i => witnessesArgs[0].lockArgs.slice(0, 42) === new MultiSign().hash(i.blake160)
-        )!.blake160
-        const serializedMultiSign: string = new MultiSign().serialize([blake160])
+        const blake160 = addressInfos.find(i => witnessesArgs[0].lockArgs.slice(0, 42) === Multisig.hash([i.blake160]))!
+          .blake160
+        const serializedMultiSign: string = Multisig.serialize([blake160])
         signed = await TransactionSender.signSingleMultiSignScript(
           privateKey,
           serializedWitnesses,
@@ -317,8 +317,7 @@ export default class TransactionSender {
       if (!multisigConfig) {
         throw new MultisigConfigNeedError()
       }
-      const multisigArgses = multisigConfig.addresses.map(v => addressToScript(v).args)
-      const [privateKey, blake160] = findPrivateKeyAndBlake160(multisigArgses, tx.signatures?.[lockHash])
+      const [privateKey, blake160] = findPrivateKeyAndBlake160(multisigConfig.blake160s, tx.signatures?.[lockHash])
 
       const witnessesArgs = witnessSigningEntries.filter(w => w.lockHash === lockHash)
       const serializedWitnesses: (WitnessArgs | string)[] = witnessesArgs.map((value: SignInfo, index: number) => {
@@ -332,12 +331,12 @@ export default class TransactionSender {
         return serializeWitnessArgs(args.toSDK())
       })
       let witnesses: (string | WitnessArgs)[] = []
-      const serializedMultiSign: string = new MultiSign().serialize(multisigArgses, {
-        M: HexUtils.toHex(multisigConfig.m, 2),
-        N: HexUtils.toHex(multisigConfig.n, 2),
-        R: HexUtils.toHex(multisigConfig.r, 2),
-        S: MultiSign.defaultS
-      })
+      const serializedMultiSign: string = Multisig.serialize(
+        multisigConfig.blake160s,
+        multisigConfig.r,
+        multisigConfig.m,
+        multisigConfig.n
+      )
       witnesses = await TransactionSender.signSingleMultiSignScript(
         privateKey!,
         serializedWitnesses,
@@ -500,11 +499,17 @@ export default class TransactionSender {
     }))
 
     try {
-      const lockScript = addressToScript(multisigConfig.fullPayload)
+      const lockScript = Multisig.getMultisigScript(
+        multisigConfig.blake160s,
+        multisigConfig.r,
+        multisigConfig.m,
+        multisigConfig.n
+      )
+      const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
       const tx: Transaction = await TransactionGenerator.generateTx(
         '',
         targetOutputs,
-        multisigConfig.fullPayload,
+        multisigAddresses,
         '0',
         '1000',
         {
diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
index 8213aae6b3..7a0c82dc49 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -16,7 +16,7 @@ import Script, { ScriptHashType } from 'models/chain/script'
 import Transaction from 'models/chain/transaction'
 import WitnessArgs from 'models/chain/witness-args'
 import AddressParser from 'models/address-parser'
-import MultiSign from 'models/multi-sign'
+import Multisig from 'models/multisig'
 import RpcService from 'services/rpc-service'
 import NodeService from 'services/node'
 import BlockHeader from 'models/chain/block-header'
@@ -179,9 +179,7 @@ export class TransactionGenerator {
       if (date) {
         const blake160 = lockScript.args
         const minutes: number = +((BigInt(date) - BigInt(tipHeaderTimestamp)) / BigInt(1000 * 60)).toString()
-        const script = SystemScriptInfo.generateMultiSignScript(
-          new MultiSign().args(blake160, +minutes, tipHeaderEpoch)
-        )
+        const script = SystemScriptInfo.generateMultiSignScript(new Multisig().args(blake160, +minutes, tipHeaderEpoch))
         output.setLock(script)
         output.setMultiSignBlake160(script.args.slice(0, 42))
       }
@@ -260,7 +258,11 @@ export class TransactionGenerator {
 
     const allInputs: Input[] = await CellsService.gatherAllInputs(
       walletId,
-      multisigConfig?.fullPayload ? Script.fromSDK(addressToScript(multisigConfig?.fullPayload)) : undefined
+      multisigConfig
+        ? Script.fromSDK(
+            Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n)
+          )
+        : undefined
     )
 
     if (allInputs.length === 0) {
@@ -281,7 +283,7 @@ export class TransactionGenerator {
         const blake160 = lockScript.args
         const minutes: number = +((BigInt(date) - BigInt(tipHeaderTimestamp)) / BigInt(1000 * 60)).toString()
         const script: Script = SystemScriptInfo.generateMultiSignScript(
-          new MultiSign().args(blake160, minutes, tipHeaderEpoch)
+          new Multisig().args(blake160, minutes, tipHeaderEpoch)
         )
         output.setLock(script)
         output.setMultiSignBlake160(script.args.slice(0, 42))
@@ -566,7 +568,7 @@ export class TransactionGenerator {
       lock: lockScript
     })
 
-    const since = new MultiSign().parseSince(prevOutput.lock.args)
+    const since = new Multisig().parseSince(prevOutput.lock.args)
 
     const input = new Input(outPoint, since.toString(), prevOutput.capacity, prevOutput.lock)
     const tx = Transaction.fromObject({
diff --git a/packages/neuron-wallet/src/utils/multisig.ts b/packages/neuron-wallet/src/utils/multisig.ts
index 9a713c3405..3d3e1ee2f5 100644
--- a/packages/neuron-wallet/src/utils/multisig.ts
+++ b/packages/neuron-wallet/src/utils/multisig.ts
@@ -1,13 +1,15 @@
-import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+import Multisig from 'models/multisig'
 import MultisigConfigModel from 'models/multisig-config'
 import { Signatures, SignStatus } from 'models/offline-sign'
 
 export const getMultisigStatus = (multisigConfig: MultisigConfigModel, signatures: Signatures) => {
-  const multisigLockHash = scriptToHash(addressToScript(multisigConfig.fullPayload))
-  const multisigBlake160s = multisigConfig.addresses.map(v => addressToScript(v).args)
+  const multisigLockHash = scriptToHash(
+    Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n)
+  )
   let signed = 0
   signatures?.[multisigLockHash]?.forEach(blake160 => {
-    if (multisigBlake160s.includes(blake160)) {
+    if (multisigConfig.blake160s.includes(blake160)) {
       signed += 1
     }
   })
@@ -18,7 +20,7 @@ export const getMultisigStatus = (multisigConfig: MultisigConfigModel, signature
     return SignStatus.PartiallySigned
   }
   for (let i = 0; i < multisigConfig.r; i++) {
-    if (!signatures?.[multisigLockHash]?.includes(multisigBlake160s[i])) {
+    if (!signatures?.[multisigLockHash]?.includes(multisigConfig.blake160s[i])) {
       return SignStatus.PartiallySigned
     }
   }
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
index 5e1b067b05..1f8b6bb1e8 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
@@ -14,7 +14,7 @@ import OutPoint from '../../src/models/chain/out-point'
 import Script, { ScriptHashType } from '../../src/models/chain/script'
 import { flushPromises } from '../test-utils'
 import AssetAccountInfo from '../../src/models/asset-account-info'
-import MultiSign from '../../src/models/multi-sign'
+import Multisig from '../../src/models/multisig'
 
 const stubbedIndexerConnectorConstructor = jest.fn()
 const stubbedTxAddressFinderConstructor = jest.fn()
@@ -211,7 +211,7 @@ describe('queue', () => {
                 lockHashes,
                 [new AssetAccountInfo().generateAnyoneCanPayScript(addressInfo.blake160).computeHash()],
                 fakeTxs[0].transaction,
-                [new MultiSign().hash(addressInfo.blake160)]
+                [Multisig.hash([addressInfo.blake160])]
               )
             })
             it('saves transactions', () => {
diff --git a/packages/neuron-wallet/tests/controllers/multisig.test.ts b/packages/neuron-wallet/tests/controllers/multisig.test.ts
index 3bcef60589..e03528e78c 100644
--- a/packages/neuron-wallet/tests/controllers/multisig.test.ts
+++ b/packages/neuron-wallet/tests/controllers/multisig.test.ts
@@ -58,6 +58,14 @@ jest.mock('../../src/services/cells', () => ({
   getMultisigBalances: jest.fn(),
 }))
 
+const isMainnetMock = jest.fn().mockReturnValue(false)
+
+jest.mock('../../src/services/networks', () => ({
+  getInstance: () => ({
+    isMainnet: isMainnetMock
+  })
+}))
+
 const loadTransactionJSONMock = jest.fn()
 jest.mock('../../src/services/offline-sign', () => ({
   loadTransactionJSON: () => loadTransactionJSONMock()
@@ -69,10 +77,10 @@ const multisigConfig = {
       r: 1,
       m: 2,
       n: 3,
-      addresses: [
-        'ckt1qyqvmm64mjmcwftjx6a73kxr8z23ks5sef5sv2702w',
-        'ckt1qyqrgqluh0v7yrarreezawvcrv3q8t28tyzqveg4zl',
-        'ckt1qyqvwh396xsgcqmp0ltjz9s85zn50xkjascsz88vrw'
+      blake160s: [
+        '0xcdef55dcb787257236bbe8d8c338951b4290ca69',
+        '0x3403fcbbd9e20fa31e722eb9981b2203ad475904',
+        '0xc75e25d1a08c03617fd7211607a0a7479ad2ec31'
       ],
       isMainnet: false
     },
@@ -83,10 +91,10 @@ const multisigConfig = {
       r: 1,
       m: 2,
       n: 3,
-      addresses: [
-        'ckt1qyqvmm64mjmcwftjx6a73kxr8z23ks5sef5sv2702w',
-        'ckt1qyqrgqluh0v7yrarreezawvcrv3q8t28tyzqveg4zl',
-        'ckt1qyqvwh396xsgcqmp0ltjz9s85zn50xkjascsz88vrw'
+      blake160s: [
+        '0xcdef55dcb787257236bbe8d8c338951b4290ca69',
+        '0x3403fcbbd9e20fa31e722eb9981b2203ad475904',
+        '0xc75e25d1a08c03617fd7211607a0a7479ad2ec31'
       ],
       isMainnet: true
     },
@@ -101,26 +109,14 @@ describe('test for multisig controller', () => {
     dialogRes = { canceled: false, filePaths: ['./'], filePath: './' }
   })
 
-  describe('test createMultisigAddress', () => {
-    it('test net', () => {
-      const multisigAddress = multisigController.createMultisigAddress(multisigConfig.testnet.params)
-      expect(multisigAddress.result).toEqual(multisigConfig.testnet.result)
-    })
-    it('main net', () => {
-      const multisigAddress = multisigController.createMultisigAddress(multisigConfig.mainnet.params)
-      expect(multisigAddress.result).toEqual(multisigConfig.mainnet.result)
-    })
-  })
-
   it('test save config', async () => {
     const params = {
       walletId: 'string',
       r: 1,
       m: 1,
       n: 1,
-      addresses: [],
+      blake160s: [],
       alias: 'string',
-      fullPayload: 'string',
       changed: expect.any(Function)
     }
     await multisigController.saveConfig(params)
@@ -151,15 +147,14 @@ describe('test for multisig controller', () => {
   })
 
   it('get config', async () => {
-    const params = { walletId: 'abcd' }
-    await multisigController.getConfig(params)
-    expect(MultiSigServiceMock.prototype.getMultisigConfig).toHaveBeenCalledWith(params.walletId)
+    await multisigController.getConfig('abcd')
+    expect(MultiSigServiceMock.prototype.getMultisigConfig).toHaveBeenCalledWith('abcd')
   })
 
   describe('import config', () => {
     it('cancel import', async () => {
       dialogRes = { canceled: true, filePaths: [], filePath: './' }
-      const res = await multisigController.importConfig({ isMainnet: false, walletId: '1234'})
+      const res = await multisigController.importConfig('1234')
       expect(res).toBeUndefined()
     })
     it('import data is error', async () => {
@@ -167,7 +162,7 @@ describe('test for multisig controller', () => {
         ...multisigConfig.testnet.params,
         r: undefined
       }]
-      const res = await multisigController.importConfig({ isMainnet: false, walletId: '1234'})
+      const res = await multisigController.importConfig('1234')
       expect(res).toBeUndefined()
     })
     it('import object success', async () => {
@@ -176,11 +171,10 @@ describe('test for multisig controller', () => {
         ...multisigConfig.testnet.params,
         id: 1,
         walletId: '1234',
-        alias: '',
-        fullPayload: multisigConfig.testnet.result,
+        alias: ''
       } as any)
-      const res = await multisigController.importConfig({ isMainnet: false, walletId: '1234'})
-      expect(res?.result[0].fullPayload).toBe(multisigConfig.testnet.result)
+      const res = await multisigController.importConfig('1234')
+      expect(res?.result[0].blake160s).toBe(multisigConfig.testnet.params.blake160s)
     })
     it('import success', async () => {
       fileContent = multisigConfig.testnet.params
@@ -189,10 +183,9 @@ describe('test for multisig controller', () => {
         id: 1,
         walletId: '1234',
         alias: '',
-        fullPayload: multisigConfig.testnet.result,
       } as any)
-      const res = await multisigController.importConfig({ isMainnet: false, walletId: '1234'})
-      expect(res?.result[0].fullPayload).toBe(multisigConfig.testnet.result)
+      const res = await multisigController.importConfig('1234')
+      expect(res?.result[0].blake160s).toBe(multisigConfig.testnet.params.blake160s)
     })
   })
 
diff --git a/packages/neuron-wallet/tests/database/address/meta.test.ts b/packages/neuron-wallet/tests/database/address/meta.test.ts
index a8e06c15a6..2dc8814701 100644
--- a/packages/neuron-wallet/tests/database/address/meta.test.ts
+++ b/packages/neuron-wallet/tests/database/address/meta.test.ts
@@ -1,7 +1,7 @@
 import { Address, AddressVersion } from '../../../src/models/address'
 import { AddressType } from '../../../src/models/keys/address'
 import AddressMeta from '../../../src/database/address/meta'
-import MultiSign from "../../../src/models/multi-sign";
+import Multisig from "../../../src/models/multisig";
 import AssetAccountInfo from '../../../src/models/asset-account-info'
 
 describe('Address Dao tests', () => {
@@ -43,7 +43,7 @@ describe('Address Dao tests', () => {
     it('#generateSingleMultiSignLockScript', () => {
       const script = addressMeta.generateSingleMultiSignLockScript()
       expect(script).toEqual({
-        args: new MultiSign().hash(address.blake160),
+        args: Multisig.hash([address.blake160]),
         codeHash: '0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8',
         hashType: 'type'
       })
diff --git a/packages/neuron-wallet/tests/models/multi-sign.test.ts b/packages/neuron-wallet/tests/models/multi-sign.test.ts
index 5e903ccc9f..346809be77 100644
--- a/packages/neuron-wallet/tests/models/multi-sign.test.ts
+++ b/packages/neuron-wallet/tests/models/multi-sign.test.ts
@@ -1,4 +1,4 @@
-import MultiSign from "../../src/models/multi-sign"
+import Multisig from "../../src/models/multisig"
 
 describe('MultiSign Test', () => {
   const minutes = 360
@@ -15,39 +15,39 @@ describe('MultiSign Test', () => {
   const serialized = "0x0000010136c329ed630d6ce750712a477543672adab57f4c"
 
   it('since', () => {
-    const since = new MultiSign().since(minutes, headerEpoch)
+    const since = new Multisig().since(minutes, headerEpoch)
     expect(since).toEqual(expectedSince)
   })
 
   it('since, minutes < 0', () => {
     expect(() => {
-      new MultiSign().since(-1, headerEpoch)
+      new Multisig().since(-1, headerEpoch)
     }).toThrowError()
   })
 
   it('serialize', () => {
-    const s = new MultiSign().serialize([bob.blake160])
+    const s = Multisig.serialize([bob.blake160])
     expect(s).toEqual(serialized)
   })
 
   it('serialize with r/m/n', () => {
-    const s = new MultiSign().serialize([bob.blake160], { S: '0x00', R: '0x01', M: '0x02', N: '0x03'})
+    const s = Multisig.serialize([bob.blake160], 1, 2, 3)
     expect(s).toEqual('0x0001020336c329ed630d6ce750712a477543672adab57f4c')
   })
 
   it('serialize with r/m/n exception', () => {
     expect(() => {
-      new MultiSign().serialize([bob.blake160], { S: '0x00', R: '0x01', M: '0x02', N: '0xf000'})
+      Multisig.serialize([bob.blake160], 1, 2, 300)
     }).toThrow()
   })
 
   it('hash', () => {
-    const hash = new MultiSign().hash(bob.blake160)
+    const hash = Multisig.hash([bob.blake160])
     expect(hash).toEqual(bob.hash)
   })
 
   it('args', () => {
-    const args = new MultiSign().args(bob.blake160, minutes, headerEpoch)
+    const args = new Multisig().args(bob.blake160, minutes, headerEpoch)
     expect(args).toEqual(expectedArgs)
   })
 })
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index ba78167cd1..9c80877265 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -17,7 +17,7 @@ import SystemScriptInfo from '../../src/models/system-script-info'
 import TransactionPersistor from '../../src/services/tx/transaction-persistor'
 import OutPoint from '../../src/models/chain/out-point'
 import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
-import MultiSign from '../../src/models/multi-sign'
+import Multisig from '../../src/models/multisig'
 import AssetAccountInfo from '../../src/models/asset-account-info'
 import MultisigOutput from '../../src/database/chain/entities/multisig-output'
 import { MultisigConfigNeedError, TransactionInputParamterMiss } from '../../src/exceptions'
@@ -982,7 +982,7 @@ describe('CellsService', () => {
     const assetAccountInfo = new AssetAccountInfo()
     const publicKeyHash = bob.lockScript.args
     const bobDefaultLock = SystemScriptInfo.generateSecpScript(publicKeyHash)
-    const multiSignHash = new MultiSign().hash(publicKeyHash)
+    const multiSignHash = Multisig.hash([publicKeyHash])
     const multiSignLockScript = SystemScriptInfo.generateMultiSignScript(multiSignHash)
     const pageSize = 2
 
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index 209c8bfaac..1314cd70c6 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -5,6 +5,12 @@ import MultisigConfigModel from '../../src/models/multisig-config'
 import MultisigService from '../../src/services/multisig'
 import MultisigOutput from '../../src/database/chain/entities/multisig-output'
 import { OutputStatus } from '../../src/models/chain/output'
+import { keyInfos } from '../setupAndTeardown/public-key-info.fixture'
+import Multisig from '../../src/models/multisig'
+import SystemScriptInfo from '../../src/models/system-script-info'
+import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
+
+const [alice, bob, charlie] = keyInfos
 
 const rpcBatchRequestMock = jest.fn()
 jest.mock('../../src/utils/rpc-request', () => ({
@@ -26,16 +32,15 @@ describe('multisig service', () => {
     1,
     2,
     3,
-    ['addresses'],
-    'ckt1qpw9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sq2y0lufgxn0q93dyx2wndvjhvjnfglxkaqlz8tny',
+    [alice.publicKeyInBlake160, bob.publicKeyInBlake160, charlie.publicKeyInBlake160],
     'alias'
   );
   const defaultMultisigConfig = MultisigConfig.fromModel(multisigConfigModel)
   defaultMultisigConfig.lastestBlockNumber = '0x0'
   const lock = {
-    args: '0x447ff8941a6f0162d2194e9b592bb2534a3e6b74',
-    code_hash: '0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8',
-    hash_type: 'type'
+    args: Multisig.hash(multisigConfigModel.blake160s, multisigConfigModel.r, multisigConfigModel.m, multisigConfigModel.n),
+    code_hash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+    hash_type: SystemScriptInfo.MULTI_SIGN_HASH_TYPE
   }
   const defaultTxOutpoint = { tx_hash: 'tx_hash', index: '0x0' }
   const defaultOutput = {
@@ -257,7 +262,7 @@ describe('multisig service', () => {
   describe('deleteRemovedMultisigOutput', () => {
     it('delete cell thats config not in db', async () => {
       const output =  MultisigOutput.fromIndexer(defaultOutput)
-      output.lockHash = '0x8a281512ae899c8cb2bfd177c7747e1ff20b5980'
+      output.lockHash = scriptToHash(alice.lockScript)
       output.outPointTxHash = '0x9821d3184b5743726e4686541a74213eaa63e2d8f4fb9ee9ff50878aa9177c87'
       await getConnection().manager.save(output)
       await MultisigService.deleteRemovedMultisigOutput()
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index b065ce8b9d..a639047d4b 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -12,7 +12,7 @@ import Transaction, { TransactionStatus } from '../../../src/models/chain/transa
 import OutPoint from '../../../src/models/chain/out-point'
 import Output, { OutputStatus } from '../../../src/models/chain/output'
 import BlockHeader from '../../../src/models/chain/block-header'
-import MultiSign from '../../../src/models/multi-sign'
+import Multisig from '../../../src/models/multisig'
 import SystemScriptInfo from '../../../src/models/system-script-info'
 import AssetAccountInfo from '../../../src/models/asset-account-info'
 import BufferUtils from '../../../src/utils/buffer'
@@ -461,7 +461,7 @@ describe('TransactionGenerator', () => {
           const multiSignOutput = tx.outputs.find(o => o.lock.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH)
           expect(multiSignOutput).toBeDefined()
 
-          const multiSign = new MultiSign()
+          const multiSign = new Multisig()
           const epoch = multiSign.parseSince(multiSignOutput!.lock.args)
           // @ts-ignore: Private method
           const parsedEpoch = multiSign.parseEpoch(epoch)
@@ -715,7 +715,7 @@ describe('TransactionGenerator', () => {
 
         expect(tx.outputs[0].lock.codeHash).toEqual(SystemScriptInfo.MULTI_SIGN_CODE_HASH)
 
-        const multiSign = new MultiSign()
+        const multiSign = new Multisig()
         const epoch = multiSign.parseSince(tx.outputs[0].lock.args)
         // @ts-ignore: Private method
         const parsedEpoch = multiSign.parseEpoch(epoch)
@@ -744,13 +744,9 @@ describe('TransactionGenerator', () => {
           r: 1,
           m: 2,
           n: 3,
-          addresses: [
-            'ckt1qyqdpymnu202x3p4cnrrgek5czcdsg95xznswjr98y',
-            'ckt1qyqdpymnu202x3p4cnrrgek5czcdsg95xznswjr98y',
-            'ckt1qyqwqcknusdreymrhhme00hg9af3pr5hcmwqzfxvda'
-          ],
-          fullPayload:
-            'ckt1qpw9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sqv8hxhzc8r3pqtcuuym7j5fkumtcrc2ucqe3z37y'
+          blake160s: (
+            ['ckt1qyqdpymnu202x3p4cnrrgek5czcdsg95xznswjr98y', 'ckt1qyqdpymnu202x3p4cnrrgek5czcdsg95xznswjr98y', 'ckt1qyqwqcknusdreymrhhme00hg9af3pr5hcmwqzfxvda']
+          ).map(v => addressToScript(v).args),
         })
       )
 
@@ -1029,7 +1025,7 @@ describe('TransactionGenerator', () => {
   describe('generateWithdrawMultiSignTx', () => {
     const prevOutput = Output.fromObject({
       capacity: toShannon('1000'),
-      lock: SystemScriptInfo.generateMultiSignScript(new MultiSign().args(bob.lockScript.args, 100, '0x7080018000001'))
+      lock: SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.lockScript.args, 100, '0x7080018000001'))
     })
     const outPoint = OutPoint.fromObject({
       txHash: '0x' + '0'.repeat(64),
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
index 230c919515..8269aa7ed1 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -152,9 +152,8 @@ import {
 } from '../../../src/exceptions'
 import TransactionSender from '../../../src/services/transaction-sender'
 import MultisigConfigModel from '../../../src/models/multisig-config'
-import Multisig from '../../../src/models/multi-sign'
-import { addressToScript, scriptToAddress, serializeWitnessArgs } from '@nervosnetwork/ckb-sdk-utils'
-import MultiSign from '../../../src/models/multi-sign'
+import Multisig from '../../../src/models/multisig'
+import { addressToScript, serializeWitnessArgs } from '@nervosnetwork/ckb-sdk-utils'
 
 const fakeScript = new Script(
   '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
@@ -610,8 +609,7 @@ describe('TransactionSender Test', () => {
           m: 1,
           n: 1,
           r: 1,
-          fullPayload: 'fullPayload',
-          addresses: ['addresses']
+          blake160s: ['blake160s']
         })
         await transactionSender.generateMultisigSendAllTx(targetOutputs, multisigConfig)
         expect(stubbedGenerateSendingAllTx).toHaveBeenCalledWith('', targetOutputs, '0', '1000', multisigConfig)
@@ -836,12 +834,8 @@ describe('TransactionSender Test', () => {
       }
 
       const createMultisigConfig = (r: number, m: number, addresses: string[]): [string, MultisigConfigModel] => {
-        const multiArgs = new Multisig().hash(addresses, {
-          S: '0x00',
-          R: `0x${r.toString(16).padStart(2, '0')}`,
-          M: `0x${r.toString(16).padStart(2, '0')}`,
-          N: `0x${addresses.length.toString(16).padStart(2, '0')}`
-        })
+        const blake160s = addresses.map(v => addressToScript(v).args)
+        const multiArgs = Multisig.hash(blake160s, r, m, addresses.length)
         return [
           multiArgs,
           MultisigConfigModel.fromObject({
@@ -849,12 +843,7 @@ describe('TransactionSender Test', () => {
             r,
             m,
             n: addresses.length,
-            addresses,
-            fullPayload: scriptToAddress({
-              args: multiArgs,
-              hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
-              codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH
-            })
+            blake160s: addresses.map(v => addressToScript(v).args)
           })
         ]
       }
@@ -884,17 +873,7 @@ describe('TransactionSender Test', () => {
       })
 
       describe('m is 2', () => {
-        const addresses = [
-          'ckt1qyq89x5ggpt0a5epm2k2gyxeffwkgfdxeg0s543mh4',
-          'ckt1qyqql0vgjyxjxjxknkj6nq8jxa485xsyl66sy7c5f6',
-          'ckt1qyqt9wqszk2lurw7h86wrt826cg8zx2f0lnq6e4vpl'
-        ]
-        const multisigPrefix = {
-          S: '0x00',
-          R: '0x01',
-          M: '0x02',
-          N: '0x03'
-        }
+        const addresses = ['ckt1qyq89x5ggpt0a5epm2k2gyxeffwkgfdxeg0s543mh4', 'ckt1qyqql0vgjyxjxjxknkj6nq8jxa485xsyl66sy7c5f6', 'ckt1qyqt9wqszk2lurw7h86wrt826cg8zx2f0lnq6e4vpl']
         const [multiArgs, multisigConfig] = createMultisigConfig(1, 2, addresses)
         const addr = {
           walletId: fakeWallet.id,
@@ -914,10 +893,7 @@ describe('TransactionSender Test', () => {
           tx.inputs[0]!.setLock(SystemScriptInfo.generateMultiSignScript(multiArgs))
           tx = await transactionSender.signMultisig(fakeWallet.id, tx, '1234', [multisigConfig])
           const lock = (tx.witnesses[0] as WitnessArgs).lock!
-          const serializedMultiSign: string = new MultiSign().serialize(
-            addresses.map(v => addressToScript(v).args),
-            multisigPrefix
-          )
+          const serializedMultiSign: string = Multisig.serialize(addresses.map(v => addressToScript(v).args), 1, 2, 3)
           expect(lock.startsWith(serializedMultiSign)).toBeTruthy()
           transactionSender.getAddressInfos = getAddressInfos
         })
@@ -1002,16 +978,7 @@ describe('TransactionSender Test', () => {
           const expectedValue = serializeWitnessArgs({
             inputType: undefined,
             outputType: undefined,
-            lock:
-              new MultiSign().serialize(
-                addresses.map(v => addressToScript(v).args),
-                {
-                  S: '0x00',
-                  R: `0x01`,
-                  M: `0x01`,
-                  N: `0x02`
-                }
-              ) + witnessLock
+            lock: Multisig.serialize(addresses.map(v => addressToScript(v).args), 1, 1, 2) + witnessLock
           })
           expect(res.witnesses[0]).toBe(expectedValue)
         })
diff --git a/packages/neuron-wallet/tests/utils/multisig.test.ts b/packages/neuron-wallet/tests/utils/multisig.test.ts
index adf275faed..0131c54ee1 100644
--- a/packages/neuron-wallet/tests/utils/multisig.test.ts
+++ b/packages/neuron-wallet/tests/utils/multisig.test.ts
@@ -15,8 +15,7 @@ describe('getMultisigStatus test', () => {
       r: 1,
       m: 2,
       n: 3,
-      addresses: Object.keys(addressesToArgs),
-      fullPayload: 'ckt1qpw9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sqv94200sn94mc90xxe4lawp0d7ywg4epzcajyg9d'
+      blake160s: Object.values(addressesToArgs),
     })
     it('Unsigned', () => {
       expect(getMultisigStatus(multisigConfig, {})).toBe(SignStatus.Unsigned)

From e979d730e4cec86295e9102ed3b6674618db6485 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Wed, 11 May 2022 10:38:00 +0800
Subject: [PATCH 2/5] fix: Fix export with filter.

---
 .../src/components/MultisigAddress/hooks.ts   | 59 ++++++++++++-------
 .../src/components/MultisigAddress/index.tsx  | 24 ++++----
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index 08bd5ba271..90594a64d9 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -16,9 +16,8 @@ import {
 } from 'services/remote'
 import { addressToScript, scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
 
-export const useSearch = (clearSelected: () => void) => {
+export const useSearch = (clearSelected: () => void, onFilterConfig: (searchKey: string) => void) => {
   const [keywords, setKeywords] = useState('')
-  const [searchKeywords, setSearchKeywords] = useState('')
 
   const onKeywordsChange = (_e?: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>, newValue?: string) => {
     if (undefined !== newValue) {
@@ -28,16 +27,16 @@ export const useSearch = (clearSelected: () => void) => {
 
   const onSearch = useCallback(
     value => {
-      setSearchKeywords(value)
+      onFilterConfig(value)
       clearSelected()
     },
-    [setSearchKeywords, clearSelected]
+    [onFilterConfig, clearSelected]
   )
 
   const onClear = useCallback(() => {
     onSearch('')
   }, [onSearch])
-  return { keywords, onKeywordsChange, setKeywords, onSearch, searchKeywords, onClear }
+  return { keywords, onKeywordsChange, setKeywords, onSearch, onClear }
 }
 
 export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isMainnet: boolean }) => {
@@ -77,7 +76,30 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
     },
     [setEntities]
   )
-  const configs = useMemo<MultisigConfig[]>(
+  const deleteConfigById = useCallback(
+    (id: number) => {
+      setEntities(v => v.filter(config => config.id !== id))
+    },
+    [setEntities]
+  )
+  const onImportConfig = useCallback(() => {
+    importMultisigConfig(walletId).then(res => {
+      if (isSuccessResponse(res) && res.result) {
+        const { result } = res
+        if (result) {
+          setEntities(v => [...result, ...v])
+        }
+      }
+    })
+  }, [walletId])
+  const [searchKeywords, setSearchKeywords] = useState('')
+  const onFilterConfig = useCallback(
+    (v: string) => {
+      setSearchKeywords(v)
+    },
+    [setSearchKeywords]
+  )
+  const allConfigs = useMemo<MultisigConfig[]>(
     () =>
       entities.map(entity => ({
         ...entity,
@@ -95,28 +117,21 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
       })),
     [entities, isMainnet]
   )
-  const deleteConfigById = useCallback(
-    (id: number) => {
-      setEntities(v => v.filter(config => config.id !== id))
-    },
-    [setEntities]
+  const configs = useMemo<MultisigConfig[]>(
+    () =>
+      searchKeywords
+        ? allConfigs.filter(v => v.alias?.includes(searchKeywords) || v.fullPayload === searchKeywords)
+        : allConfigs,
+    [allConfigs, searchKeywords]
   )
-  const onImportConfig = useCallback(() => {
-    importMultisigConfig(walletId).then(res => {
-      if (isSuccessResponse(res) && res.result) {
-        const { result } = res
-        if (result) {
-          setEntities(v => [...result, ...v])
-        }
-      }
-    })
-  }, [walletId])
   return {
     saveConfig,
-    allConfigs: configs,
+    allConfigs,
     updateConfig,
     deleteConfigById,
     onImportConfig,
+    configs,
+    onFilterConfig,
   }
 }
 
diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index c803c1bf5b..68e95209ea 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -53,7 +53,15 @@ const MultisigAddress = () => {
   }, [i18n.language])
   const isMainnet = isMainnetUtil(networks, networkID)
   const { openDialog, closeDialog, dialogRef, isDialogOpen } = useDialogWrapper()
-  const { allConfigs, saveConfig, updateConfig, deleteConfigById, onImportConfig } = useConfigManage({
+  const {
+    allConfigs,
+    saveConfig,
+    updateConfig,
+    deleteConfigById,
+    onImportConfig,
+    configs,
+    onFilterConfig,
+  } = useConfigManage({
     walletId,
     isMainnet,
   })
@@ -96,17 +104,8 @@ const MultisigAddress = () => {
     onChangeCheckedAll,
     exportConfig,
     clearSelected,
-  } = useExportConfig(allConfigs)
-  const { keywords, onKeywordsChange, onSearch, searchKeywords, onClear } = useSearch(clearSelected)
-  const configs = useMemo(
-    () =>
-      searchKeywords
-        ? allConfigs.filter(v => {
-            return v.alias?.includes(searchKeywords) || v.fullPayload === searchKeywords
-          })
-        : allConfigs,
-    [allConfigs, searchKeywords]
-  )
+  } = useExportConfig(configs)
+  const { keywords, onKeywordsChange, onSearch, onClear } = useSearch(clearSelected, onFilterConfig)
   const sendTotalBalance = useMemo(() => {
     if (sendAction.sendFromMultisig?.fullPayload) {
       return multisigBanlances[sendAction.sendFromMultisig.fullPayload]
@@ -117,7 +116,6 @@ const MultisigAddress = () => {
     <div>
       <div className={styles.head}>
         <SearchBox
-          data-
           value={keywords}
           className={styles.searchBox}
           styles={searchBoxStyles}

From 1e597368388123f90ad4f95d2ef578a6f74dab1a Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Wed, 18 May 2022 14:24:45 +0800
Subject: [PATCH 3/5] fix: Fix types

---
 packages/neuron-ui/src/components/History/index.tsx  |  4 ----
 packages/neuron-ui/src/services/remote/offline.ts    |  4 ++--
 .../src/tests/getMultisigSignStatus/index.test.ts    | 12 +++++++-----
 packages/neuron-ui/src/types/Controller/index.d.ts   |  3 +--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index 6ae473f369..378799d76a 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -17,9 +17,6 @@ import styles from './history.module.scss'
 
 const History = () => {
   const {
-    app: {
-      loadings: { transactionList: isLoading },
-    },
     wallet: { id, name: walletName },
     chain: {
       networkID,
@@ -111,7 +108,6 @@ const History = () => {
     keywords,
     onKeywordsChange,
     onSearch,
-    isLoading,
     id,
     walletName,
     items,
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index c349a61757..ac362476d3 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import { remoteApi } from './remoteApiWrapper'
-import { MultisigConfig } from './multisig'
+import { MultisigEntity } from './multisig'
 
 export enum OfflineSignStatus {
   Signed = 'Signed',
@@ -41,7 +41,7 @@ export interface OfflineSignJSON {
   multisig_configs?: MultisigConfigs
 }
 
-export type SignProps = OfflineSignJSON & { walletID: string; password: string; multisigConfig?: MultisigConfig }
+export type SignProps = OfflineSignJSON & { walletID: string; password: string; multisigConfig?: MultisigEntity }
 
 export type BroadcastProps = OfflineSignJSON & { walletID: string }
 
diff --git a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
index 4dc96e5f3a..8385cde682 100644
--- a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
@@ -2,17 +2,19 @@ import { MultisigConfig } from 'services/remote'
 import getMultisigSignStatus from 'utils/getMultisigSignStatus'
 import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
 
+const addresses = [
+  'ckt1qyqwh5hmt8j59njztrfz6z0s9wug3nv5qysqrnfm2h',
+  'ckt1qyqwjt5p4axvmx9tl4lrrnqd0ld9pr9wjqsqv87474',
+  'ckt1qyqql0vgjyxjxjxknkj6nq8jxa485xsyl66sy7c5f6',
+]
 const multisigConfig: MultisigConfig = {
   id: 1,
   walletId: 'walletId',
   r: 1,
   m: 2,
   n: 3,
-  addresses: [
-    'ckt1qyqwh5hmt8j59njztrfz6z0s9wug3nv5qysqrnfm2h',
-    'ckt1qyqwjt5p4axvmx9tl4lrrnqd0ld9pr9wjqsqv87474',
-    'ckt1qyqql0vgjyxjxjxknkj6nq8jxa485xsyl66sy7c5f6',
-  ],
+  addresses,
+  blake160s: addresses.map(v => addressToScript(v).args),
   fullPayload: 'ckt1qpw9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sq2f2scddm0lvmq36hmzx8nfhw8ucxzslhqussgky',
 }
 const fullPayloadHash = scriptToHash(addressToScript(multisigConfig.fullPayload))
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 58f447835f..e7537ab176 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -65,9 +65,8 @@ declare namespace Controller {
       r: number
       m: number
       n: number
-      addresses: string[]
+      blake160s: string[]
       alias?: string
-      fullPayload: string
     }
   }
 

From a2367d119b8863aa9a5806ade186af217b921761 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Mon, 23 May 2022 15:12:40 +0800
Subject: [PATCH 4/5] fix: Fix conversations.

1. Rename `MultiSign` to `Multisig`
2. Remove unnecessary dependency.
3. Better transactions.
---
 .../src/components/MultisigAddress/hooks.ts      |  2 +-
 packages/neuron-ui/src/locales/en.json           |  2 +-
 packages/neuron-ui/src/locales/zh-tw.json        |  2 +-
 packages/neuron-ui/src/locales/zh.json           |  2 +-
 packages/neuron-ui/src/utils/multisig.ts         |  4 +++-
 ...651820157092-RemoveAddressesMultisigConfig.ts | 16 ----------------
 ...51820157100-RemoveAddressesMultisigConfig.ts} |  0
 .../src/database/chain/ormconfig.ts              |  2 +-
 packages/neuron-wallet/src/models/multisig.ts    |  4 ++--
 .../src/services/hardware/hardware.ts            |  6 +++---
 .../src/services/transaction-sender.ts           | 12 ++++++------
 11 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
 rename packages/neuron-wallet/src/database/chain/migrations/{1651820157094-RemoveAddressesMultisigConfig.ts => 1651820157100-RemoveAddressesMultisigConfig.ts} (100%)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index 90594a64d9..ca64a4709b 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -65,7 +65,7 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
         setEntities(res.result)
       }
     })
-  }, [setEntities, walletId, isMainnet])
+  }, [setEntities, walletId])
   const updateConfig = useCallback(
     (id: number) => (alias: string | undefined) => {
       updateMultisigConfig({ id, alias: alias || '' }).then(res => {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 8d77adc683..d68002b873 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -918,7 +918,7 @@
           "title": "Please choose the multisig address configuration in the m-of-n type where any m private keys out of a possible n are required to move the asset.",
           "m-less-equal-n": "For m-of-n multisig address, m shouldn't be greater than n",
           "m-n-required": "Please input or choose m/n",
-          "m-n-between-0-256": "m/n should between 0 and 256"
+          "m-n-between-0-256": "m/n should be between 0 and 256"
         },
         "multi-address-info": {
           "title": "Please input the signers for the {{m}}-of-{{n}} multisig address",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 823c59d0e7..9d1850e725 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -909,7 +909,7 @@
         "m-n": {
           "title": "請選擇 m-of-n 類型的多重簽名地址配置，從 n 個密鑰中通過 m 個確認來轉移資產。",
           "m-less-equal-n": "對於 m-of-n 多重簽名地址，m 不應大於 n",
-          "m-n-required": "請輸入/選擇 m/n",
+          "m-n-required": "請輸入或選擇 m/n",
           "m-n-between-0-256": "m/n 應該在 0-256 之間"
         },
         "multi-address-info": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 46a427202f..17f7ddf7cd 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -909,7 +909,7 @@
         "m-n": {
           "title": "请选择 m-of-n 类型的多重签名地址配置，从 n 个密钥中通过 m 个确认来转移资产。",
           "m-less-equal-n": "对于 m-of-n 多重签名地址，m 不应大于 n",
-          "m-n-required": "请输入/选择 m/n",
+          "m-n-required": "请输入或选择 m/n",
           "m-n-between-0-256": "m/n 应该在 0-256 之间"
         },
         "multi-address-info": {
diff --git a/packages/neuron-ui/src/utils/multisig.ts b/packages/neuron-ui/src/utils/multisig.ts
index 44b13556f5..cada54220e 100644
--- a/packages/neuron-ui/src/utils/multisig.ts
+++ b/packages/neuron-ui/src/utils/multisig.ts
@@ -8,11 +8,13 @@ function getMultisigParamsHex(v: number) {
   return v.toString(16).padStart(2, '0')
 }
 
+const MULTI_DEFAULT_S = '00'
+
 function multisigSerialize(blake160s: string[], r: number = 0, m: number = 1, n: number = 1) {
   const hexR = getMultisigParamsHex(r)
   const hexM = getMultisigParamsHex(m)
   const hexN = getMultisigParamsHex(n)
-  return `0x00${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
+  return `0x${MULTI_DEFAULT_S}${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
 }
 
 function multisigHash(blake160s: string[], r: number = 0, m: number = 1, n: number = 1): string {
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
deleted file mode 100644
index 46fcbf1d08..0000000000
--- a/packages/neuron-wallet/src/database/chain/migrations/1651820157092-RemoveAddressesMultisigConfig.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class RemoveAddressesMultisigConfig1651820157092 implements MigrationInterface {
-    name = 'RemoveAddressesMultisigConfig1651820157092'
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-      const configList = await queryRunner.query('select * from multisig_config')
-      console.log(configList)
-      console.log(configList.length)
-    }
-
-    public async down(): Promise<void> {
-      // do nothing
-    }
-
-}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
similarity index 100%
rename from packages/neuron-wallet/src/database/chain/migrations/1651820157094-RemoveAddressesMultisigConfig.ts
rename to packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 196fadf17d..29a44d6b8e 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -46,7 +46,7 @@ import { AddMultisigConfig1646817547204 } from './migrations/1646817547204-AddMu
 import { AddMultisigOutput1649729996969 } from './migrations/1649729996969-AddMultisigOutput'
 import { UpdateAddressDescription1650984779265 } from './migrations/1650984779265-UpdateAddressDescription'
 import { RemoveDuplicateBlake160s1651133703535 } from './migrations/1651133703535-RemoveDuplicateBlake160s'
-import { RemoveAddressesMultisigConfig1651820157100 } from './migrations/1651820157094-RemoveAddressesMultisigConfig'
+import { RemoveAddressesMultisigConfig1651820157100 } from './migrations/1651820157100-RemoveAddressesMultisigConfig'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
diff --git a/packages/neuron-wallet/src/models/multisig.ts b/packages/neuron-wallet/src/models/multisig.ts
index d9429ec5a4..1e9d21c9d9 100644
--- a/packages/neuron-wallet/src/models/multisig.ts
+++ b/packages/neuron-wallet/src/models/multisig.ts
@@ -13,13 +13,13 @@ export default class Multisig {
   // 1 epoch = 4h = 240min
   EPOCH_MINUTES = 240
 
-  static defaultS: string = '0x00'
+  static defaultS: string = '00'
 
   static serialize(blake160s: string[], r: number = 0, m: number = 1, n: number = 1) {
     const hexR = Multisig.getMultisigParamsHex(r)
     const hexM = Multisig.getMultisigParamsHex(m)
     const hexN = Multisig.getMultisigParamsHex(n)
-    return `0x00${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
+    return `0x${Multisig.defaultS}${hexR}${hexM}${hexN}${blake160s.reduce((pre, cur) => pre + cur.slice(2), '')}`
   }
 
   static hash(blake160s: string[], r: number = 0, m: number = 1, n: number = 1): string {
diff --git a/packages/neuron-wallet/src/services/hardware/hardware.ts b/packages/neuron-wallet/src/services/hardware/hardware.ts
index d2421f0931..0aa3de6821 100644
--- a/packages/neuron-wallet/src/services/hardware/hardware.ts
+++ b/packages/neuron-wallet/src/services/hardware/hardware.ts
@@ -37,10 +37,10 @@ export abstract class Hardware {
       }
     })
 
-    const isMultiSign = tx.inputs.length === 1 &&
+    const isMultisig = tx.inputs.length === 1 &&
       tx.inputs[0].lock!.args.length === TransactionSender.MULTI_SIGN_ARGS_LENGTH
 
-    const multiSignBlake160s = isMultiSign ? addressInfos.map(i => {
+    const multiSignBlake160s = isMultisig ? addressInfos.map(i => {
       return {
         multiSignBlake160: Multisig.hash([i.blake160]),
         path: i.path
@@ -70,7 +70,7 @@ export abstract class Hardware {
 
       const path = findPath(witnessesArgs[0].lockArgs)
 
-      if (isMultiSign) {
+      if (isMultisig) {
         const serializedWitnesses = witnessesArgs.map(value => {
           const args = value.witnessArgs
           if (index === 0) {
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index dc144d825a..756ee70a78 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -128,11 +128,11 @@ export default class TransactionSender {
     }
 
     // Only one multi sign input now.
-    const isMultiSign =
+    const isMultisig =
       tx.inputs.length === 1 && tx.inputs[0].lock!.args.length === TransactionSender.MULTI_SIGN_ARGS_LENGTH
 
     const addressInfos = await this.getAddressInfos(walletID)
-    const multiSignBlake160s = isMultiSign
+    const multiSignBlake160s = isMultisig
       ? addressInfos.map(i => {
           return {
             multiSignBlake160: Multisig.hash([i.blake160]),
@@ -196,19 +196,19 @@ export default class TransactionSender {
       })
       let signed: (string | CKBComponents.WitnessArgs | WitnessArgs)[] = []
 
-      if (isMultiSign) {
+      if (isMultisig) {
         const blake160 = addressInfos.find(i => witnessesArgs[0].lockArgs.slice(0, 42) === Multisig.hash([i.blake160]))!
           .blake160
-        const serializedMultiSign: string = Multisig.serialize([blake160])
+        const serializedMultisig: string = Multisig.serialize([blake160])
         signed = await TransactionSender.signSingleMultiSignScript(
           privateKey,
           serializedWitnesses,
           txHash,
-          serializedMultiSign,
+          serializedMultisig,
           wallet
         )
         const wit = signed[0] as WitnessArgs
-        wit.lock = serializedMultiSign + wit.lock!.slice(2)
+        wit.lock = serializedMultisig + wit.lock!.slice(2)
         signed[0] = serializeWitnessArgs(wit.toSDK())
       } else {
         signed = ckb.signWitnesses(privateKey)({

From 7f4a0c0c062ffa1e56481feb39d327facd7ff043 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Mon, 23 May 2022 15:29:25 +0800
Subject: [PATCH 5/5] fix: validate import multisig config

---
 .../neuron-wallet/src/controllers/multisig.ts |  8 +++-
 .../tests/controllers/multisig.test.ts        | 46 +++++++++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index 81317b2c9d..6dc47f5465 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -10,6 +10,7 @@ import MultisigService from 'services/multisig'
 import CellsService from 'services/cells'
 import OfflineSignService from 'services/offline-sign'
 
+const SPEC256_BLAKE160_LEN = 42
 export default class MultisigController {
   // eslint-disable-next-line prettier/prettier
   #multisigService: MultisigService;
@@ -111,7 +112,12 @@ export default class MultisigController {
         configs.some(config => config.r === undefined
           || config.m === undefined
           || config.n === undefined
-          || config.blake160s === undefined)
+          || config.blake160s === undefined
+          || config.r > config.n
+          || config.m > config.n
+          || !config.blake160s.length
+          || config.blake160s.some(v => v.length !== SPEC256_BLAKE160_LEN)
+        )
       ) {
         dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
         return
diff --git a/packages/neuron-wallet/tests/controllers/multisig.test.ts b/packages/neuron-wallet/tests/controllers/multisig.test.ts
index e03528e78c..8aa8af7e96 100644
--- a/packages/neuron-wallet/tests/controllers/multisig.test.ts
+++ b/packages/neuron-wallet/tests/controllers/multisig.test.ts
@@ -5,12 +5,13 @@ import CellsService from '../../src/services/cells'
 
 let response = 0
 let dialogRes = { canceled: false, filePaths: ['./'], filePath: './' }
+const showErrorBoxMock = jest.fn()
 jest.mock('electron', () => ({
   dialog: {
     showMessageBox: jest.fn().mockImplementation(() => ({ response })),
     showOpenDialog: jest.fn().mockImplementation(() => dialogRes),
     showSaveDialog: jest.fn().mockImplementation(() => dialogRes),
-    showErrorBox: jest.fn()
+    showErrorBox: () => showErrorBoxMock()
   },
   BrowserWindow: {
     getFocusedWindow: jest.fn()
@@ -24,17 +25,17 @@ let fileContent: {
   r?: number
   m?: number
   n?: number
-  addresses?: string[]
+  blake160s?: string[]
 } | {
   r?: number
   m?: number
   n?: number
-  addresses?: string[]
+  blake160s?: string[]
 }[] = [{
   r: 1,
   m: 2,
   n: 3,
-  addresses: ['ckt1qyqvmm64mjmcwftjx6a73kxr8z23ks5sef5sv2702w', 'ckt1qyqrgqluh0v7yrarreezawvcrv3q8t28tyzqveg4zl']
+  blake160s: ['0xcdef55dcb787257236bbe8d8c338951b4290ca69', '0x3403fcbbd9e20fa31e722eb9981b2203ad475904']
 }]
 
 jest.mock('fs', () => {
@@ -164,6 +165,43 @@ describe('test for multisig controller', () => {
       }]
       const res = await multisigController.importConfig('1234')
       expect(res).toBeUndefined()
+      expect(showErrorBoxMock).toHaveBeenCalledWith()
+    })
+    it('import data is invalidation r > n', async () => {
+      fileContent = [{
+        ...multisigConfig.testnet.params,
+        r: 4
+      }]
+      const res = await multisigController.importConfig('1234')
+      expect(res).toBeUndefined()
+      expect(showErrorBoxMock).toHaveBeenCalledWith()
+    })
+    it('import data is invalidation m > n', async () => {
+      fileContent = [{
+        ...multisigConfig.testnet.params,
+        m: 4
+      }]
+      const res = await multisigController.importConfig('1234')
+      expect(res).toBeUndefined()
+      expect(showErrorBoxMock).toHaveBeenCalledWith()
+    })
+    it('import data is invalidation blake160s empty', async () => {
+      fileContent = [{
+        ...multisigConfig.testnet.params,
+        blake160s: []
+      }]
+      const res = await multisigController.importConfig('1234')
+      expect(res).toBeUndefined()
+      expect(showErrorBoxMock).toHaveBeenCalledWith()
+    })
+    it('import data is invalidation blake160 length not 42', async () => {
+      fileContent = [{
+        ...multisigConfig.testnet.params,
+        blake160s: ['0xcdef55dcb787257236bbe8d8c338951b4290ca6911']
+      }]
+      const res = await multisigController.importConfig('1234')
+      expect(res).toBeUndefined()
+      expect(showErrorBoxMock).toHaveBeenCalledWith()
     })
     it('import object success', async () => {
       fileContent = multisigConfig.testnet.params