fix: Remove duplicate config when get cells. (#2732)

nervosnetwork · Jun 25, 2023 · f2900d6 · f2900d6
1 parent 112af4e
commit f2900d6
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
@@ -91,10 +91,22 @@ export default class MultisigService {
     await getConnection().manager.remove(config)
   }
 
+  private static removeDulpicateConfig(multisigConfigs: MultisigConfig[]) {
+    const existMultisigLockHash: Set<string> = new Set()
+    return multisigConfigs.filter(v => {
+      const multisigLockHash = Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n).computeHash()
+      if (existMultisigLockHash.has(multisigLockHash)) {
+        return false
+      }
+      existMultisigLockHash.add(multisigLockHash)
+      return true
+    })
+  }
+
   static async getLiveCells(multisigConfigs: MultisigConfig[]) {
     const liveCells: MultisigOutput[] = []
     const addressCursorMap: Map<string, string> = new Map()
-    let currentMultisigConfigs = multisigConfigs
+    let currentMultisigConfigs = MultisigService.removeDulpicateConfig(multisigConfigs)
     const network = NetworksService.getInstance().getCurrent()
     while (currentMultisigConfigs.length) {
       const res = await rpcBatchRequest(

diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -193,6 +193,46 @@ describe('multisig service', () => {
     })
   })
 
+  describe('removeDulpicateConfig', () => {
+    it('exist duplicate config', () => {
+      const multisigConfigModel = new MultisigConfigModel(
+        'walletId',
+        1,
+        2,
+        3,
+        [alice.publicKeyInBlake160, bob.publicKeyInBlake160, charlie.publicKeyInBlake160],
+      )
+      const multisigConfigs = [
+        MultisigConfig.fromModel(multisigConfigModel),
+        MultisigConfig.fromModel(multisigConfigModel),
+      ]
+      //@ts-ignore private-method
+      const res = MultisigService.removeDulpicateConfig(multisigConfigs)
+      expect(res.length).toBe(1)
+    })
+    it('non-exist duplicate config', () => {
+      const multisigConfigs = [
+        MultisigConfig.fromModel(new MultisigConfigModel(
+          'walletId',
+          1,
+          2,
+          3,
+          [alice.publicKeyInBlake160, bob.publicKeyInBlake160, charlie.publicKeyInBlake160],
+        )),
+        MultisigConfig.fromModel(new MultisigConfigModel(
+          'walletId',
+          2,
+          2,
+          3,
+          [alice.publicKeyInBlake160, bob.publicKeyInBlake160, charlie.publicKeyInBlake160],
+        )),
+      ]
+      //@ts-ignore private-method
+      const res = MultisigService.removeDulpicateConfig(multisigConfigs)
+      expect(res.length).toBe(2)
+    })
+  })
+
   describe('saveLiveMultisigOutput', () => {
     it('no live cell save', async () => {
       await MultisigService.saveLiveMultisigOutput()