@ercworldio/blockchain-shared 1.0.1-dev.7 → 1.0.1-dev.9

package/build/entities/DepositAddressArchive.js

@@ -62,5 +62,5 @@ __decorate([
 ], DepositAddressArchive.prototype, "archived_reason", void 0);
 exports.DepositAddressArchive = DepositAddressArchive = __decorate([
     (0, typeorm_1.Entity)({ name: "deposit_addresses_archive", schema: "usersmanagement" }),
-    (0, typeorm_1.Unique)(['original_id'])
+    (0, typeorm_1.Unique)(['blockchain', 'address'])
 ], DepositAddressArchive);

package/build/services/BalanceService.js

@@ -227,7 +227,7 @@ class BalanceService extends errors_1.default {
                     (original_id, user_id, blockchain, parent_index, child_index, address, transaction_count, expires_at, archived_at, archived_reason)
                 SELECT id, user_id, blockchain, parent_index, child_index, address, transaction_count, expires_at, now(), 'renewed'
                 FROM old_address
-                ON CONFLICT (original_id) DO NOTHING
+                ON CONFLICT (blockchain,address) DO NOTHING
             ),
             updated_address AS (
                 UPDATE usersmanagement.deposit_addresses
@@ -238,12 +238,7 @@ class BalanceService extends errors_1.default {
                 WHERE user_id = $1 AND blockchain = $2
                 RETURNING id, user_id, blockchain, parent_index, child_index, address, transaction_count, expires_at, created_at, updated_at
             ),
-            deleted_balances AS (
-                DELETE FROM usersmanagement.deposit_wallet_balance
-                WHERE wallet_id = (SELECT id FROM updated_address)
-                  AND blockchain = $2
-            ),
-            inserted_balances AS (
+            upserted_balances AS (
                 INSERT INTO usersmanagement.deposit_wallet_balance
                     (wallet_id, blockchain, chain_id, token, decimals, balance, transaction_count, created_at, updated_at)
                 SELECT
@@ -258,6 +253,11 @@ class BalanceService extends errors_1.default {
                            unnest($7::text[]) AS token,
                            unnest($8::int[])  AS decimals
                 ) AS v
+                ON CONFLICT (blockchain, chain_id, wallet_id, token) DO UPDATE SET
+                    decimals          = EXCLUDED.decimals,
+                    balance           = 0,
+                    transaction_count = 0,
+                    updated_at        = now()
             )
             SELECT * FROM updated_address;
         `, [userId, blockchain, newChildIndex, newAddress, newExpiresAt.toISOString(), chainIds, tokens, decimals]);

package/build/services/DepositAddressArchiveService.js

@@ -55,7 +55,7 @@ class DepositAddressArchiveService {
             INSERT INTO usersmanagement.deposit_addresses_archive
                 (original_id, user_id, blockchain, parent_index, child_index, address, transaction_count, expires_at, archived_at, archived_reason)
             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, now(), $9)
-            ON CONFLICT (original_id) DO NOTHING
+            ON CONFLICT (blockchain, address) DO NOTHING
             RETURNING *
         `, [
                 address.id,
@@ -70,7 +70,7 @@ class DepositAddressArchiveService {
             ]);
             // If conflict (already archived), return the existing record
             if (rows.length === 0) {
-                return repo.findOneOrFail({ where: { original_id: address.id } });
+                return repo.findOneOrFail({ where: { blockchain: address.blockchain, address: address.address } });
             }
             return rows[0];
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercworldio/blockchain-shared",
-  "version": "1.0.1-dev.7",
+  "version": "1.0.1-dev.9",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",