fix: check whether the entity exists before insert.

nervosnetwork · Jun 9, 2023 · 9299615 · 9299615
1 parent f32c818
commit 9299615
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/packages/neuron-wallet/src/database/chain/entities/asset-account.ts b/packages/neuron-wallet/src/database/chain/entities/asset-account.ts
@@ -6,7 +6,7 @@ import SudtTokenInfo from './sudt-token-info'
 @Index(['tokenID', 'blake160'], { unique: true })
 export default class AssetAccount {
   @PrimaryGeneratedColumn()
-  id: number | null = null
+  id!: number
 
   @Column({
     type: 'varchar',

diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -256,14 +256,23 @@ export default class AssetAccountService {
       .values(sudtTokenInfoEntity)
       .onConflict(`("tokenID") DO NOTHING`)
       .execute()
-
-    await getConnection()
+    const existAccountAcount = await getConnection()
+      .getRepository(AssetAccountEntity)
       .createQueryBuilder()
-      .insert()
-      .into(AssetAccountEntity)
-      .values(assetAccountEntity)
-      .onConflict(`("tokenID", "blake160") DO NOTHING`)
-      .execute()
+      .where({
+        tokenID,
+        blake160
+      })
+      .getCount()
+    // check whether the entity exists before insert. Reason: https://github.com/Magickbase/neuron-public-issues/issues/184#issue-1749746997
+    if (!existAccountAcount) {
+      await getConnection()
+        .createQueryBuilder()
+        .insert()
+        .into(AssetAccountEntity)
+        .values(assetAccountEntity)
+        .execute()
+    }
   }
 
   public static async checkAndDeleteWhenFork(startBlockNumber: string, anyoneCanPayLockHashes: string[]) {