fix

Author: devchenyan

packages/neuron-wallet/src/services/sync-progress.ts

@@ -72,11 +72,6 @@ export default class SyncProgressService {
     return res
   }
 
-  static async getExistingSyncArgses() {
-    const syncProgresses = await getConnection().getRepository(SyncProgress).createQueryBuilder().getMany()
-    return new Set(syncProgresses.map(v => v.args))
-  }
-
   static async getExistingSyncScripts() {
     const syncProgresses = await getConnection().getRepository(SyncProgress).createQueryBuilder().getMany()
     return new Set(syncProgresses.map(v => Script.fromObject(v).computeHash()))

packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts

@@ -1,6 +1,7 @@
 import type { Script } from '@ckb-lumos/lumos'
 import LightSynchronizer from '../../src/block-sync-renderer/sync/light-synchronizer'
 import AddressMeta from '../../src/database/address/meta'
+import { computeScriptHash } from '@ckb-lumos/lumos/utils'
 
 const getSyncStatusMock = jest.fn()
 const getCurrentWalletMinSyncedBlockNumberMock = jest.fn()
@@ -12,7 +13,7 @@ const getWalletMinLocalSavedBlockNumberMock = jest.fn()
 const removeByHashesAndAddressType = jest.fn()
 const getOtherTypeSyncProgressMock = jest.fn()
 const getOtherTypeSyncBlockNumberMock = jest.fn()
-const getExistingSyncArgsesMock = jest.fn()
+const getExistingSyncScriptsMock = jest.fn()
 
 const setScriptsMock = jest.fn()
 const getScriptsMock = jest.fn()
@@ -65,7 +66,7 @@ jest.mock('../../src/services/sync-progress', () => {
 
     static getOtherTypeSyncProgress: any = () => getOtherTypeSyncProgressMock()
     static getOtherTypeSyncBlockNumber: any = () => getOtherTypeSyncBlockNumberMock()
-    static getExistingSyncArgses: any = () => getExistingSyncArgsesMock()
+    static getExistingSyncScripts: any = () => getExistingSyncScriptsMock()
   }
 })
 
@@ -145,7 +146,7 @@ describe('test light synchronizer', () => {
     it('when syncing script in the local DB', async () => {
       getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
       walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
-      getExistingSyncArgsesMock.mockResolvedValue(new Set([script.args]))
+      getExistingSyncScriptsMock.mockResolvedValue(new Set([computeScriptHash(script)]))
       const addressMeta = AddressMeta.fromObject({
         walletId: 'walletId',
         address,
@@ -195,7 +196,7 @@ describe('test light synchronizer', () => {
     it('when syncing script not in the local DB', async () => {
       getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
       walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
-      getExistingSyncArgsesMock.mockResolvedValue(new Set())
+      getExistingSyncScriptsMock.mockResolvedValue(new Set())
       const addressMeta = AddressMeta.fromObject({
         walletId: 'walletId',
         address,
@@ -397,7 +398,7 @@ describe('test light synchronizer', () => {
       }
       const getScriptsResult = [{ script: script2, blockNumber: '0xaa', scriptType: 'lock' }]
       getScriptsMock.mockResolvedValue(getScriptsResult)
-      getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+      getExistingSyncScriptsMock.mockResolvedValue(new Set([computeScriptHash(script2)]))
       const addressMeta2 = AddressMeta.fromObject({
         walletId: 'walletId2',
         address,
@@ -481,7 +482,7 @@ describe('test light synchronizer', () => {
       }
       const getScriptsResult = [{ script: script2, blockNumber: '0xab', scriptType: 'lock' }]
       getScriptsMock.mockResolvedValue(getScriptsResult)
-      getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+      getExistingSyncScriptsMock.mockResolvedValue(new Set([computeScriptHash(script2)]))
       const addressMeta2 = AddressMeta.fromObject({
         walletId: 'walletId2',
         address,

packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts

@@ -699,7 +699,7 @@ describe('TransactionSender Test', () => {
           walletID: '',
           targetOutputs,
           fee: '0',
-          feeRate: '1000',
+          feeRate: '2000',
           multisigConfig,
         })
       })