@cityofzion/bs-neo-legacy 1.10.4 → 1.10.6

package/dist/constants/BSNeoLegacyConstants.d.ts

@@ -18,7 +18,10 @@ export declare class BSNeoLegacyConstants {
     static ALL_NETWORKS: Network<BSNeoLegacyNetworkId>[];
     static DEFAULT_BIP44_DERIVATION_PATH: string;
     static DEFAULT_NETWORK: Network<BSNeoLegacyNetworkId>;
-    static readonly MIGRATION_NEO3_COZ_ADDRESS = "AaT27thuyPaqERPwERhk7QhfKrbj4xoyAV";
-    static readonly MIGRATION_NEO3_COZ_FEE = 0.01;
-    static readonly MIGRATION_NEO3_NEP_17_TRANSFER_FEE = 0.0112143;
+    static readonly MIGRATION_COZ_LEGACY_ADDRESS = "AaT27thuyPaqERPwERhk7QhfKrbj4xoyAV";
+    static readonly MIGRATION_COZ_FEE = 0.01;
+    static readonly MIGRATION_NEP_17_TRANSFER_FEE = 0.0112143;
+    static readonly MIGRATION_MIN_GAS = 0.1;
+    static readonly MIGRATION_MIN_NEO = 2;
+    static readonly MIGRATION_COZ_NEO3_ADDRESS = "NLMsicDapULKFDmAzTsbhwrZjYZ83j53Ty";
 }

package/dist/constants/BSNeoLegacyConstants.js

@@ -58,6 +58,9 @@ BSNeoLegacyConstants.TESTNET_NETWORKS = [
 BSNeoLegacyConstants.ALL_NETWORKS = [..._a.MAINNET_NETWORKS, ..._a.TESTNET_NETWORKS];
 BSNeoLegacyConstants.DEFAULT_BIP44_DERIVATION_PATH = "m/44'/888'/0'/0/?";
 BSNeoLegacyConstants.DEFAULT_NETWORK = _a.MAINNET_NETWORKS[0];
-BSNeoLegacyConstants.MIGRATION_NEO3_COZ_ADDRESS = 'AaT27thuyPaqERPwERhk7QhfKrbj4xoyAV';
-BSNeoLegacyConstants.MIGRATION_NEO3_COZ_FEE = 0.01; // 1%
-BSNeoLegacyConstants.MIGRATION_NEO3_NEP_17_TRANSFER_FEE = 0.0112143;
+BSNeoLegacyConstants.MIGRATION_COZ_LEGACY_ADDRESS = 'AaT27thuyPaqERPwERhk7QhfKrbj4xoyAV';
+BSNeoLegacyConstants.MIGRATION_COZ_FEE = 0.01; // 1%
+BSNeoLegacyConstants.MIGRATION_NEP_17_TRANSFER_FEE = 0.0112143;
+BSNeoLegacyConstants.MIGRATION_MIN_GAS = 0.1;
+BSNeoLegacyConstants.MIGRATION_MIN_NEO = 2;
+BSNeoLegacyConstants.MIGRATION_COZ_NEO3_ADDRESS = 'NLMsicDapULKFDmAzTsbhwrZjYZ83j53Ty';

package/dist/helpers/BSNeoLegacyHelper.d.ts

@@ -1,5 +1,11 @@
-import { Network } from '@cityofzion/blockchain-service';
+import { BlockchainService, Network } from '@cityofzion/blockchain-service';
 import { BSNeoLegacyNetworkId } from '../constants/BSNeoLegacyConstants';
+export type WaitForMigrationParams = {
+    transactionHash: string;
+    neo3Address: string;
+    neo3Service: BlockchainService;
+    neoLegacyService: BlockchainService;
+};
 export declare class BSNeoLegacyHelper {
     static getLegacyNetwork(network: Network<BSNeoLegacyNetworkId>): string;
     static getTokens(network: Network<BSNeoLegacyNetworkId>): {
@@ -11,4 +17,8 @@ export declare class BSNeoLegacyHelper {
     static getRpcList(network: Network<BSNeoLegacyNetworkId>): string[];
     static isMainnet(network: Network<BSNeoLegacyNetworkId>): boolean;
     static normalizeHash(hash: string): string;
+    static waitForMigration(params: WaitForMigrationParams): Promise<{
+        isTransactionConfirmed: boolean;
+        isNeo3TransactionConfirmed: boolean;
+    }>;
 }

package/dist/helpers/BSNeoLegacyHelper.js

@@ -1,9 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoLegacyHelper = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const native_json_1 = __importDefault(require("../assets/tokens/native.json"));
 const BSNeoLegacyConstants_1 = require("../constants/BSNeoLegacyConstants");
 class BSNeoLegacyHelper {
@@ -28,5 +38,48 @@ class BSNeoLegacyHelper {
     static normalizeHash(hash) {
         return hash.startsWith('0x') ? hash.slice(2) : hash;
     }
+    static waitForMigration(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { neo3Address, neo3Service, transactionHash, neoLegacyService } = params;
+            const MAX_ATTEMPTS = 10;
+            const NEO3_MAX_ATTEMPTS = 20;
+            const response = {
+                isTransactionConfirmed: false,
+                isNeo3TransactionConfirmed: false,
+            };
+            let transactionResponse;
+            for (let i = 0; i < MAX_ATTEMPTS; i++) {
+                yield (0, blockchain_service_1.wait)(30000);
+                try {
+                    transactionResponse = yield neoLegacyService.blockchainDataService.getTransaction(transactionHash);
+                    response.isTransactionConfirmed = true;
+                    break;
+                }
+                catch (_a) {
+                    // Empty block
+                }
+            }
+            if (!response.isTransactionConfirmed)
+                return response;
+            for (let i = 0; i < NEO3_MAX_ATTEMPTS; i++) {
+                yield (0, blockchain_service_1.wait)(60000);
+                try {
+                    const neo3Response = yield neo3Service.blockchainDataService.getTransactionsByAddress({
+                        address: neo3Address,
+                    });
+                    const isTransactionConfirmed = neo3Response.transactions.some(transaction => transaction.time > transactionResponse.time &&
+                        transaction.transfers.some(transfer => transfer.from === BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_NEO3_ADDRESS));
+                    if (isTransactionConfirmed) {
+                        response.isNeo3TransactionConfirmed = true;
+                        break;
+                    }
+                }
+                catch (_b) {
+                    // Empty block
+                }
+            }
+            return response;
+        });
+    }
 }
 exports.BSNeoLegacyHelper = BSNeoLegacyHelper;

package/dist/services/BSNeoLegacy.d.ts

@@ -1,11 +1,43 @@
-import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSClaimable, ExchangeDataService, Token, Network, TransferParam, BSWithExplorerService, ExplorerService, BSWithLedger, GetLedgerTransport, BSMigrationNeo3, MigrateToNeo3Params, CalculateToMigrateToNeo3ValuesResponse, CalculateToMigrateToNeo3ValuesParams } from '@cityofzion/blockchain-service';
+import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSClaimable, ExchangeDataService, Token, Network, TransferParam, BSWithExplorerService, ExplorerService, BSWithLedger, GetLedgerTransport, BalanceResponse } from '@cityofzion/blockchain-service';
 import { BSNeoLegacyNetworkId } from '../constants/BSNeoLegacyConstants';
 import { NeonJsLedgerServiceNeoLegacy } from './ledger/NeonJsLedgerServiceNeoLegacy';
-export declare class BSNeoLegacy<BSName extends string = string> implements BlockchainService<BSName, BSNeoLegacyNetworkId>, BSClaimable<BSName>, BSWithExplorerService, BSWithLedger<BSName>, BSMigrationNeo3<BSName> {
+export type MigrateParams<BSName extends string = string> = {
+    account: Account<BSName>;
+    neo3Address: string;
+    neoLegacyMigrationAmounts: CalculateNeoLegacyMigrationAmountsResponse;
+};
+export type CalculateNeo3MigrationAmountsResponse = {
+    gasMigrationTotalFees?: string;
+    neoMigrationTotalFees?: string;
+    gasMigrationReceiveAmount?: string;
+    neoMigrationReceiveAmount?: string;
+};
+export type CalculateNeoLegacyMigrationAmountsResponse = {
+    hasEnoughGasBalance: boolean;
+    hasEnoughNeoBalance: boolean;
+    gasBalance?: BalanceResponse;
+    neoBalance?: BalanceResponse;
+};
+export declare class BSNeoLegacy<BSName extends string = string> implements BlockchainService<BSName, BSNeoLegacyNetworkId>, BSClaimable<BSName>, BSWithExplorerService, BSWithLedger<BSName> {
     #private;
-    private readonly NATIVE_ASSETS;
-    private readonly GAS_ASSET;
-    private readonly NEO_ASSET;
+    NATIVE_ASSETS: {
+        hash: string;
+        symbol: string;
+        name: string;
+        decimals: number;
+    }[];
+    GAS_ASSET: {
+        hash: string;
+        symbol: string;
+        name: string;
+        decimals: number;
+    };
+    NEO_ASSET: {
+        hash: string;
+        symbol: string;
+        name: string;
+        decimals: number;
+    };
     readonly name: BSName;
     readonly bip44DerivationPath: string;
     nativeTokens: Token[];
@@ -32,10 +64,10 @@ export declare class BSNeoLegacy<BSName extends string = string> implements Bloc
     encrypt(key: string, password: string): Promise<string>;
     transfer({ intents, senderAccount, tipIntent, ...params }: TransferParam<BSName>): Promise<string[]>;
     claim(account: Account): Promise<string>;
+    migrate({ account, neo3Address, neoLegacyMigrationAmounts }: MigrateParams<BSName>): Promise<string>;
     /**
      * 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>;
-    private getMigrationNeo3ValidatedData;
+    calculateNeo3MigrationAmounts(neoLegacyMigrationAmounts: CalculateNeoLegacyMigrationAmountsResponse): CalculateNeo3MigrationAmountsResponse;
+    calculateNeoLegacyMigrationAmounts(balance: BalanceResponse[]): CalculateNeoLegacyMigrationAmountsResponse;
 }

package/dist/services/BSNeoLegacy.js

@@ -184,46 +184,21 @@ class BSNeoLegacy {
             return response.tx.hash;
         });
     }
-    /**
-     * Reference: https://github.com/CityOfZion/legacy-n3-swap-service/blob/master/policy/policy.go
-     */
-    calculateToMigrateToNeo3Values(params) {
+    migrate({ account, neo3Address, neoLegacyMigrationAmounts }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { gasAmountNumber, neoAmountNumber } = yield this.getMigrationNeo3ValidatedData(params);
-            const response = {};
-            if (gasAmountNumber) {
-                // Two transfers fee and one transfer fee left over
-                const allNep17TransfersFee = BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_NEP_17_TRANSFER_FEE * 3;
-                // Necessary to calculate the COZ fee
-                const gasAmountNumberLessAllNep17TransfersFee = gasAmountNumber - allNep17TransfersFee;
-                // Example: ~0.06635710 * 0.01 = ~0.00066357
-                const cozFee = gasAmountNumberLessAllNep17TransfersFee * BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_COZ_FEE;
-                // Example: ~0.06635710 - ~0.00066357 = ~0.06569352
-                const gasAmountNumberLessCozFee = gasAmountNumberLessAllNep17TransfersFee - cozFee;
-                const allGasFeeNumberThatUserWillPay = cozFee + BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_NEP_17_TRANSFER_FEE * 2;
-                const allGasAmountNumberThatUserWillReceive = gasAmountNumberLessCozFee + BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_NEP_17_TRANSFER_FEE;
-                response.gasMigrationTotalFees = (0, blockchain_service_1.formatNumber)(allGasFeeNumberThatUserWillPay, this.GAS_ASSET.decimals);
-                response.gasMigrationAmount = (0, blockchain_service_1.formatNumber)(allGasAmountNumberThatUserWillReceive, this.GAS_ASSET.decimals);
+            if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(this.network)) {
+                throw new Error('Must use Mainnet network');
             }
-            if (neoAmountNumber) {
-                response.neoMigrationTotalFees = (0, blockchain_service_1.formatNumber)(Math.ceil(neoAmountNumber * BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_COZ_FEE), this.NEO_ASSET.decimals);
-                response.neoMigrationAmount = (0, blockchain_service_1.formatNumber)(neoAmountNumber - Number(response.neoMigrationTotalFees), this.NEO_ASSET.decimals);
+            if (!neoLegacyMigrationAmounts.hasEnoughGasBalance && !neoLegacyMigrationAmounts.hasEnoughNeoBalance) {
+                throw new Error('Must have at least 0.1 GAS or 2 NEO');
             }
-            return response;
-        });
-    }
-    migrateToNeo3({ account, address }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!address)
-                throw new Error('Must have address');
-            const { gasAmountNumber, neoAmountNumber } = yield this.getMigrationNeo3ValidatedData({ account });
             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 (gasAmountNumber)
-                intents.push(...neon_js_1.api.makeIntent({ [this.GAS_ASSET.symbol]: gasAmountNumber }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_COZ_ADDRESS));
-            if (neoAmountNumber)
-                intents.push(...neon_js_1.api.makeIntent({ [this.NEO_ASSET.symbol]: neoAmountNumber }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEO3_COZ_ADDRESS));
+            if (neoLegacyMigrationAmounts.gasBalance)
+                intents.push(...neon_js_1.api.makeIntent({ [this.GAS_ASSET.symbol]: Number(neoLegacyMigrationAmounts.gasBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_NEO3_ADDRESS));
+            if (neoLegacyMigrationAmounts.neoBalance)
+                intents.push(...neon_js_1.api.makeIntent({ [this.NEO_ASSET.symbol]: Number(neoLegacyMigrationAmounts.neoBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_NEO3_ADDRESS));
             const response = yield neon_js_1.api.sendAsset({
                 url: this.network.url,
                 api: provider,
@@ -235,7 +210,7 @@ class BSNeoLegacy {
                     attributes: [
                         new neon_js_1.tx.TransactionAttribute({
                             usage: neon_js_1.tx.TxAttrUsage.Remark14,
-                            data: neon_js_1.u.str2hexstring(address),
+                            data: neon_js_1.u.str2hexstring(neo3Address),
                         }),
                         new neon_js_1.tx.TransactionAttribute({
                             usage: neon_js_1.tx.TxAttrUsage.Remark15,
@@ -249,26 +224,55 @@ class BSNeoLegacy {
             return response.tx.hash;
         });
     }
-    getMigrationNeo3ValidatedData({ account }) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeoLegacyHelper_1.BSNeoLegacyHelper.isMainnet(this.network))
-                throw new Error('Must use Mainnet network');
-            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;
-            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 };
-        });
+    /**
+     * Reference: https://github.com/CityOfZion/legacy-n3-swap-service/blob/master/policy/policy.go
+     */
+    calculateNeo3MigrationAmounts(neoLegacyMigrationAmounts) {
+        const response = {
+            gasMigrationReceiveAmount: undefined,
+            gasMigrationTotalFees: undefined,
+            neoMigrationReceiveAmount: undefined,
+            neoMigrationTotalFees: undefined,
+        };
+        if (neoLegacyMigrationAmounts.gasBalance && neoLegacyMigrationAmounts.hasEnoughGasBalance) {
+            // Two transfers fee and one transfer fee left over
+            const allNep17TransfersFee = BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEP_17_TRANSFER_FEE * 3;
+            const gasMigrationAmountNumber = Number(neoLegacyMigrationAmounts.gasBalance.amount);
+            // Necessary to calculate the COZ fee
+            const gasAmountNumberLessAllNep17TransfersFee = gasMigrationAmountNumber - allNep17TransfersFee;
+            // Example: ~0.06635710 * 0.01 = ~0.00066357
+            const cozFee = gasAmountNumberLessAllNep17TransfersFee * BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_FEE;
+            // Example: ~0.06635710 - ~0.00066357 = ~0.06569352
+            const gasAmountNumberLessCozFee = gasAmountNumberLessAllNep17TransfersFee - cozFee;
+            const allGasFeeNumberThatUserWillPay = cozFee + BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEP_17_TRANSFER_FEE * 2;
+            const allGasAmountNumberThatUserWillReceive = gasAmountNumberLessCozFee + BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_NEP_17_TRANSFER_FEE;
+            response.gasMigrationTotalFees = (0, blockchain_service_1.formatNumber)(allGasFeeNumberThatUserWillPay, this.GAS_ASSET.decimals);
+            response.gasMigrationReceiveAmount = (0, blockchain_service_1.formatNumber)(allGasAmountNumberThatUserWillReceive, this.GAS_ASSET.decimals);
+        }
+        if (neoLegacyMigrationAmounts.neoBalance && neoLegacyMigrationAmounts.hasEnoughNeoBalance) {
+            const neoMigrationAmountNumber = Number(neoLegacyMigrationAmounts.neoBalance.amount);
+            response.neoMigrationTotalFees = (0, blockchain_service_1.formatNumber)(Math.ceil(neoMigrationAmountNumber * BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_FEE), this.NEO_ASSET.decimals);
+            response.neoMigrationReceiveAmount = (0, blockchain_service_1.formatNumber)(neoMigrationAmountNumber - Number(response.neoMigrationTotalFees), this.NEO_ASSET.decimals);
+        }
+        return response;
+    }
+    calculateNeoLegacyMigrationAmounts(balance) {
+        const gasBalance = balance.find(({ token }) => (0, blockchain_service_1.normalizeHash)(token.hash) === this.GAS_ASSET.hash);
+        const neoBalance = balance.find(({ token }) => (0, blockchain_service_1.normalizeHash)(token.hash) === this.NEO_ASSET.hash);
+        let hasEnoughGasBalance = false;
+        let hasEnoughNeoBalance = false;
+        if (gasBalance) {
+            hasEnoughGasBalance = Number(gasBalance.amount) >= BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_MIN_GAS;
+        }
+        if (neoBalance) {
+            hasEnoughNeoBalance = Number(neoBalance.amount) >= BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_MIN_NEO;
+        }
+        return {
+            gasBalance,
+            neoBalance,
+            hasEnoughGasBalance,
+            hasEnoughNeoBalance,
+        };
     }
 }
 exports.BSNeoLegacy = BSNeoLegacy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "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.16.1",
+    "@cityofzion/blockchain-service": "1.16.2",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {