fix

Author: devchenyan

packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss

@@ -15,11 +15,13 @@
     height: 44px;
     border-bottom: 1px solid var(--warn-border-color);
     padding: 0 16px;
-    max-width: 780px;
     & > svg {
       width: 16px;
       flex-shrink: 0;
     }
+    & > div {
+      max-width: 90%;
+    }
     button {
       color: var(--warn-text-color);
       font-size: 12px;

packages/neuron-ui/src/components/ScriptTag/index.tsx

@@ -51,7 +51,7 @@ const ScriptTag = ({
   if (LegacyMultiSigLockInfo.TagName === foundLock.TagName || MultiSigLockInfo.TagName === foundLock.TagName) {
     const isLegacy = LegacyMultiSigLockInfo.TagName === foundLock.TagName
     return (
-      <div className={clsx(styles.tagWrap, className)}>
+      <div className={styles.tagWrap}>
         <Tooltip
           tip={
             <div>
@@ -68,9 +68,8 @@ const ScriptTag = ({
             </div>
           }
           showTriangle
-          placement="top"
         >
-          <button type="button" className={styles.tag} onClick={onClick}>
+          <button type="button" className={clsx(styles.tag, className)} onClick={onClick}>
             Multisig
             <span className={clsx(!isLegacy && styles.highlight)}>(@{foundLock.CodeHash.slice(0, 8)})</span>
           </button>

packages/neuron-ui/src/components/ScriptTag/scriptTag.module.scss

@@ -42,5 +42,6 @@
 
   .highlight {
     color: var(--primary-color);
+    margin-left: 2px;
   }
 }

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

@@ -193,9 +193,9 @@ export default class LightSynchronizer extends Synchronizer {
     if (!this.addressMetas.length) {
       return
     }
-    const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
+    const existSyncProgressScripts = await SyncProgressService.getExistingSyncScripts()
     const syncScripts = await this.lightRpc.getScripts()
-    const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+    const retainedSyncScripts = syncScripts.filter(v => existSyncProgressScripts.has(scriptToHash(v.script)))
     const existSyncScripts: Record<string, LightScriptFilter> = {}
     retainedSyncScripts.forEach(v => {
       existSyncScripts[scriptToHash(v.script)] = v
@@ -251,9 +251,9 @@ export default class LightSynchronizer extends Synchronizer {
     if (!multisigScripts.length) {
       return
     }
-    const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
+    const existSyncProgressScripts = await SyncProgressService.getExistingSyncScripts()
     const syncScripts = await this.lightRpc.getScripts()
-    const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+    const retainedSyncScripts = syncScripts.filter(v => existSyncProgressScripts.has(scriptToHash(v.script)))
     const existSyncScripts: Record<string, LightScriptFilter> = {}
     retainedSyncScripts.forEach(v => {
       existSyncScripts[scriptToHash(v.script)] = v

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

@@ -2,6 +2,7 @@ import { In, LessThan, Not } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
 import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
 import WalletService from './wallets'
+import Script from '../models/chain/script'
 import { getConnection } from '../database/chain/connection'
 
 export default class SyncProgressService {
@@ -76,6 +77,11 @@ export default class SyncProgressService {
     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()))
+  }
+
   static async getAllSyncStatusToMap() {
     const result: Map<CKBComponents.Hash, SyncProgress> = new Map()
     const syncProgresses = await getConnection()

packages/neuron-wallet/src/services/transaction-sender.ts

@@ -562,7 +562,7 @@ export default class TransactionSender {
       walletID: '',
       targetOutputs,
       fee: '0',
-      feeRate: '1000',
+      feeRate: '2000',
       multisigConfig,
     })
 
@@ -592,7 +592,7 @@ export default class TransactionSender {
         targetOutputs,
         changeAddress: multisigAddresses,
         fee: '0',
-        feeRate: '1000',
+        feeRate: '2000',
         lockClass: {
           lockArgs: [lockScript.args],
           codeHash: lockScript.codeHash,