@cityofzion/bs-neo-legacy 1.10.0 → 1.10.2

package/dist/services/BSNeoLegacy.d.ts

@@ -35,6 +35,6 @@ export declare class BSNeoLegacy<BSName extends string = string> implements Bloc
      * Reference: https://github.com/CityOfZion/legacy-n3-swap-service/blob/master/policy/policy.go
      */
     calculateToMigrateToNeo3Values(params: CalculateToMigrateToNeo3ValuesParams<BSName>): Promise<CalculateToMigrateToNeo3ValuesResponse>;
-    migrateToNeo3({ account, address }: MigrateToNeo3Params<BSName>): Promise<string[]>;
+    migrateToNeo3({ account, address }: MigrateToNeo3Params<BSName>): Promise<string>;
     private getMigrationNeo3ValidatedData;
 }

package/dist/services/BSNeoLegacy.js

@@ -246,7 +246,7 @@ class BSNeoLegacy {
             });
             if (!response.tx)
                 throw new Error('Migration failed on send');
-            return intents.map(() => response.tx.hash);
+            return response.tx.hash;
         });
     }
     getMigrationNeo3ValidatedData({ account }) {
@@ -257,10 +257,16 @@ class BSNeoLegacy {
             const balances = yield this.blockchainDataService.getBalance(account.address);
             const gasAmount = (_a = balances.find(({ token }) => (0, blockchain_service_1.normalizeHash)(token.hash) === this.GAS_ASSET.hash)) === null || _a === void 0 ? void 0 : _a.amount;
             const neoAmount = (_b = balances.find(({ token }) => (0, blockchain_service_1.normalizeHash)(token.hash) === this.NEO_ASSET.hash)) === null || _b === void 0 ? void 0 : _b.amount;
-            const gasAmountNumber = Number(gasAmount) || 0;
-            const neoAmountNumber = Number(neoAmount) || 0;
-            if (gasAmountNumber < 0.1 && neoAmountNumber < 2)
+            let gasAmountNumber = Number(gasAmount) || 0;
+            let neoAmountNumber = Number(neoAmount) || 0;
+            const hasNotGasAmountEnough = gasAmountNumber < 0.1;
+            const hasNotNeoAmountEnough = neoAmountNumber < 2;
+            if (hasNotGasAmountEnough && hasNotNeoAmountEnough)
                 throw new Error('Must have at least 0.1 GAS or 2 NEO');
+            if (hasNotGasAmountEnough)
+                gasAmountNumber = 0;
+            if (hasNotNeoAmountEnough)
+                neoAmountNumber = 0;
             return { gasAmountNumber, neoAmountNumber };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -12,7 +12,7 @@
     "@cityofzion/dora-ts": "0.0.11",
     "@cityofzion/neon-js": "4.8.3",
     "@ledgerhq/hw-transport": "~6.30.5",
-    "@cityofzion/blockchain-service": "1.15.2",
+    "@cityofzion/blockchain-service": "1.15.3",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {