@cityofzion/bs-neo-legacy 1.12.5 → 1.12.7

package/dist/services/BSNeoLegacy.js

@@ -24,7 +24,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _BSNeoLegacy_instances, _BSNeoLegacy_generateSigningCallback, _BSNeoLegacy_setTokens, _BSNeoLegacy_hasTransactionMoreThanMaxSize, _BSNeoLegacy_signTransfer, _BSNeoLegacy_sendTransfer, _BSNeoLegacy_signClaim, _BSNeoLegacy_sendClaim;
+var _BSNeoLegacy_instances, _BSNeoLegacy_generateSigningCallback, _BSNeoLegacy_setTokens, _BSNeoLegacy_hasTransactionMoreThanMaxSize, _BSNeoLegacy_getRequiredTransactionFeeConfig, _BSNeoLegacy_signTransfer, _BSNeoLegacy_sendTransfer, _BSNeoLegacy_signClaim, _BSNeoLegacy_sendClaim;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoLegacy = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -160,15 +160,16 @@ class BSNeoLegacy {
             if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(this.network)) {
                 throw new Error('Must use Mainnet network');
             }
-            if (!neoLegacyMigrationAmounts.hasEnoughGasBalance && !neoLegacyMigrationAmounts.hasEnoughNeoBalance) {
+            if ((!neoLegacyMigrationAmounts.hasEnoughGasBalance && !neoLegacyMigrationAmounts.hasEnoughNeoBalance) ||
+                (!neoLegacyMigrationAmounts.gasBalance && !neoLegacyMigrationAmounts.neoBalance)) {
                 throw new Error('Must have at least 0.1 GAS or 2 NEO');
             }
             const { neonJsAccount, signingCallback } = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_generateSigningCallback).call(this, account);
             const provider = new neon_js_1.api.neoCli.instance(this.network.url);
             const intents = [];
-            if (neoLegacyMigrationAmounts.gasBalance)
+            if (neoLegacyMigrationAmounts.hasEnoughGasBalance && neoLegacyMigrationAmounts.gasBalance)
                 intents.push(...neon_js_1.api.makeIntent({ [BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET.symbol]: Number(neoLegacyMigrationAmounts.gasBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_LEGACY_ADDRESS));
-            if (neoLegacyMigrationAmounts.neoBalance)
+            if (neoLegacyMigrationAmounts.hasEnoughNeoBalance && neoLegacyMigrationAmounts.neoBalance)
                 intents.push(...neon_js_1.api.makeIntent({ [BSNeoLegacyConstants_1.BSNeoLegacyConstants.NEO_ASSET.symbol]: Number(neoLegacyMigrationAmounts.neoBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_LEGACY_ADDRESS));
             return yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_sendTransfer).call(this, {
                 url: this.network.url,
@@ -284,6 +285,14 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
         }
     }
     return false;
+}, _BSNeoLegacy_getRequiredTransactionFeeConfig = function _BSNeoLegacy_getRequiredTransactionFeeConfig(config) {
+    var _a, _b, _c;
+    config.fees = BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION;
+    const gasIntent = (_c = (_b = (_a = config.intents) === null || _a === void 0 ? void 0 : _a.filter((intent) => blockchain_service_1.BSTokenHelper.normalizeHash(intent.assetId) === BSNeoLegacyConstants_1.BSNeoLegacyConstants.GAS_ASSET.hash)) === null || _b === void 0 ? void 0 : _b.sort((a, b) => { var _a; return (_a = b.value.comparedTo(a.value)) !== null && _a !== void 0 ? _a : 0; })) === null || _c === void 0 ? void 0 : _c[0];
+    if (gasIntent === null || gasIntent === void 0 ? void 0 : gasIntent.value) {
+        gasIntent.value = gasIntent.value.sub(BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION);
+    }
+    return config;
 }, _BSNeoLegacy_signTransfer = function _BSNeoLegacy_signTransfer(config, nep5ScriptBuilder) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!nep5ScriptBuilder || nep5ScriptBuilder.isEmpty()) {
@@ -304,7 +313,7 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
         const sharedConfig = yield neon_js_1.api.fillBalance(config);
         let signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signTransfer).call(this, Object.assign({}, sharedConfig), nep5ScriptBuilder);
         if (__classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_hasTransactionMoreThanMaxSize).call(this, signedConfig)) {
-            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signTransfer).call(this, Object.assign(Object.assign({}, sharedConfig), { fees: BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION }), nep5ScriptBuilder);
+            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signTransfer).call(this, __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_getRequiredTransactionFeeConfig).call(this, sharedConfig), nep5ScriptBuilder);
         }
         signedConfig = yield neon_js_1.api.sendTx(signedConfig);
         return signedConfig.response.txid;
@@ -322,7 +331,7 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
         const sharedConfig = yield neon_js_1.api.fillClaims(config);
         let signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signClaim).call(this, Object.assign({}, sharedConfig));
         if (__classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_hasTransactionMoreThanMaxSize).call(this, signedConfig)) {
-            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signClaim).call(this, Object.assign(Object.assign({}, sharedConfig), { fees: BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION }));
+            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signClaim).call(this, __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_getRequiredTransactionFeeConfig).call(this, sharedConfig));
         }
         signedConfig = yield neon_js_1.api.sendTx(signedConfig);
         return signedConfig.response.txid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.12.5",
+  "version": "1.12.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -14,7 +14,7 @@
     "@ledgerhq/hw-transport": "~6.31.8",
     "axios": "~1.8.2",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.2",
+    "@cityofzion/blockchain-service": "1.19.3",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {
@@ -25,8 +25,8 @@
     "dotenv": "16.3.1",
     "eslint": "^8.48.0",
     "jest": "29.6.2",
-    "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
+    "ts-jest": "~29.4.0",
+    "ts-node": "~10.9.2",
     "typescript": "4.9.5"
   },
   "scripts": {