@cityofzion/bs-neo3 1.4.1 → 1.4.2

package/dist/builder/invocation/FlamingoSwapInvocationBuilderNeo3.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _a, _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToReceiveInvocation, _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToUseInvocation, _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs, _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts, _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation;
+var _a, _FlamingoSwapInvocationBuilderNeo3_swapTokenToReceiveInvocation, _FlamingoSwapInvocationBuilderNeo3_swapTokenToUseInvocation, _FlamingoSwapInvocationBuilderNeo3_swapUnwrappingNeoInvocation, _FlamingoSwapInvocationBuilderNeo3_unwrapNeoInvocation, _FlamingoSwapInvocationBuilderNeo3_swapReceiveInvocation, _FlamingoSwapInvocationBuilderNeo3_swapWrappingNeoInvocation, _FlamingoSwapInvocationBuilderNeo3_wrapNeoInvocation, _FlamingoSwapInvocationBuilderNeo3_swapToUseInvocation, _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlamingoSwapInvocationBuilderNeo3 = void 0;
 const neon_core_1 = require("@cityofzion/neon-core");
@@ -13,22 +13,56 @@ const FlamingoSwapHelper_1 = require("../../helpers/FlamingoSwapHelper");
 const NeonDappKitInvocationBuilderNeo3_1 = require("./NeonDappKitInvocationBuilderNeo3");
 class FlamingoSwapInvocationBuilderNeo3 {
     static swapInvocation(data) {
-        return data.type === 'swapTokenToReceive'
-            ? __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToReceiveInvocation).call(this, data)
-            : __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToUseInvocation).call(this, data);
+        const { routePath, network, type } = data;
+        const [tokenToUse] = routePath;
+        const tokenToReceive = routePath[routePath.length - 1];
+        const scriptHashes = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapScriptHashes(network);
+        const swapParams = {
+            scriptHashes,
+            tokenToUse,
+            tokenToReceive,
+        };
+        if (type === 'swapTokenToReceive') {
+            return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapTokenToReceiveInvocation).call(this, Object.assign(Object.assign({}, data), swapParams));
+        }
+        return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapTokenToUseInvocation).call(this, Object.assign(Object.assign({}, data), swapParams));
     }
 }
 exports.FlamingoSwapInvocationBuilderNeo3 = FlamingoSwapInvocationBuilderNeo3;
-_a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToReceiveInvocation = function _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToReceiveInvocation({ address, amountToReceive, deadline, maximumSelling, network, routePath, }) {
-    const [tokenToUse] = routePath;
-    const tokenToReceive = routePath[routePath.length - 1];
-    const scriptHashes = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapScriptHashes(network);
-    const invocations = [];
-    const allowedContracts = [];
+_a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_swapTokenToReceiveInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapTokenToReceiveInvocation(data) {
+    const { network, routePath } = data;
+    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isSwapUnwrappingNeo(network, routePath)) {
+        return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapUnwrappingNeoInvocation).call(this, data);
+    }
+    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isUnwrapNeo(network, routePath)) {
+        return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_unwrapNeoInvocation).call(this, data);
+    }
+    return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapReceiveInvocation).call(this, data);
+}, _FlamingoSwapInvocationBuilderNeo3_swapTokenToUseInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapTokenToUseInvocation(data) {
+    const { network, routePath } = data;
+    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isSwapWrappingNeo(network, routePath)) {
+        return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapWrappingNeoInvocation).call(this, data);
+    }
+    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isWrapNeo(network, routePath)) {
+        return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_wrapNeoInvocation).call(this, data);
+    }
+    return __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_swapToUseInvocation).call(this, data);
+}, _FlamingoSwapInvocationBuilderNeo3_swapUnwrappingNeoInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapUnwrappingNeoInvocation(data) {
+    const { address, amountToReceive, deadline, maximumSelling, network, routePath, scriptHashes, tokenToReceive, tokenToUse, } = data;
     const tokenToReceiveOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToReceive);
     const routePathOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideRoutePath(network, routePath);
     const amountToReceiveFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToReceive, tokenToReceiveOverrode.decimals);
     const maximumSellingFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(maximumSelling, tokenToUse.decimals);
+    const amountToReceiveTransfer = neon_core_1.u.BigInteger.fromNumber(Number(amountToReceiveFormatted) * FlamingoSwapConstants_1.FlamingoSwapConstants.UNWRAPPING_FEE).toString();
+    const GAS = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'GAS');
+    const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
+    const unwrapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
+        contractHash: GAS.hash,
+        tokenHash: bNEO.hash,
+        senderAddress: address,
+        amount: amountToReceiveTransfer,
+    });
+    const unwrapAllowedContracts = [GAS.hash, bNEO.hash];
     const swapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.swapTokenOutForTokenInContractInvocation({
         routerScriptHash: scriptHashes.flamingoSwapRouter,
         senderAddress: address,
@@ -37,31 +71,122 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         deadline,
         args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePathOverrode),
     });
-    invocations.push(swapInvocation);
-    allowedContracts.push(...__classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts).call(this, scriptHashes, routePath));
-    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isNeoToken(network, tokenToReceive)) {
-        const amountToReceiveTransfer = neon_core_1.u.BigInteger.fromNumber(Number(amountToReceiveFormatted) * FlamingoSwapConstants_1.FlamingoSwapConstants.GAS_PER_NEO).toString();
-        const gasHash = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'GAS').hash;
-        const neoTransferInvocation = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation).call(this, address, gasHash, amountToReceiveTransfer, network);
-        invocations.push(neoTransferInvocation);
-        allowedContracts.push(FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapPool(network, 'FLP-bNEO-GAS').hash);
-    }
+    const swapAllowedContracts = [
+        scriptHashes.flamingoSwapRouter,
+        scriptHashes.flamingoFactory,
+        scriptHashes.flamingoPairWhiteList,
+    ];
+    const allowedContracts = [
+        ...new Set([...swapAllowedContracts, ...unwrapAllowedContracts, ...routePath.map(token => token.hash)]),
+    ];
     return {
-        invocations,
+        invocations: [swapInvocation, unwrapInvocation],
+        signers: [
+            {
+                scopes: neon_core_1.tx.WitnessScope.CustomContracts,
+                allowedContracts,
+            },
+        ],
+    };
+}, _FlamingoSwapInvocationBuilderNeo3_unwrapNeoInvocation = function _FlamingoSwapInvocationBuilderNeo3_unwrapNeoInvocation(data) {
+    const { address, amountToReceive, network, tokenToReceive } = data;
+    const tokenToReceiveOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToReceive);
+    const amountToReceiveFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToReceive, tokenToReceiveOverrode.decimals);
+    const GAS = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'GAS');
+    const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
+    const unwrappedAmount = FlamingoSwapHelper_1.FlamingoSwapHelper.getUnwrappedAmount(amountToReceiveFormatted);
+    const unwrapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
+        contractHash: GAS.hash,
+        tokenHash: bNEO.hash,
+        senderAddress: address,
+        amount: unwrappedAmount,
+    });
+    const unwrapAllowedContracts = [GAS.hash, bNEO.hash];
+    return {
+        invocations: [unwrapInvocation],
+        signers: [{ scopes: neon_core_1.tx.WitnessScope.CustomContracts, allowedContracts: unwrapAllowedContracts }],
+    };
+}, _FlamingoSwapInvocationBuilderNeo3_swapReceiveInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapReceiveInvocation(data) {
+    const { address, amountToReceive, deadline, maximumSelling, network, routePath, scriptHashes, tokenToReceive, tokenToUse, } = data;
+    const tokenToReceiveOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToReceive);
+    const routePathOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideRoutePath(network, routePath);
+    const amountToReceiveFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToReceive, tokenToReceiveOverrode.decimals);
+    const maximumSellingFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(maximumSelling, tokenToUse.decimals);
+    const swapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.swapTokenOutForTokenInContractInvocation({
+        routerScriptHash: scriptHashes.flamingoSwapRouter,
+        senderAddress: address,
+        amountToReceive: amountToReceiveFormatted,
+        maximumSelling: maximumSellingFormatted,
+        deadline,
+        args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePathOverrode),
+    });
+    const swapAllowedContracts = [
+        scriptHashes.flamingoSwapRouter,
+        scriptHashes.flamingoFactory,
+        scriptHashes.flamingoPairWhiteList,
+    ];
+    const allowedContracts = [...new Set([...swapAllowedContracts, ...routePath.map(token => token.hash)])];
+    return {
+        invocations: [swapInvocation],
         signers: [{ scopes: neon_core_1.tx.WitnessScope.CustomContracts, allowedContracts }],
     };
-}, _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToUseInvocation = function _FlamingoSwapInvocationBuilderNeo3_buildSwapTokenToUseInvocation({ address, amountToUse, deadline, minimumReceived, network, routePath, }) {
-    const [tokenToUse] = routePath;
-    const tokenToReceive = routePath[routePath.length - 1];
-    const scriptHashes = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapScriptHashes(network);
-    const invocations = [];
-    const allowedContracts = [];
-    if (FlamingoSwapHelper_1.FlamingoSwapHelper.isNeoToken(network, tokenToUse)) {
-        const neoHash = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'NEO').hash;
-        const neoTransferInvocation = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation).call(this, address, neoHash, amountToUse, network);
-        invocations.push(neoTransferInvocation);
-        allowedContracts.push(FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapPool(network, 'FLP-bNEO-GAS').hash);
-    }
+}, _FlamingoSwapInvocationBuilderNeo3_swapWrappingNeoInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapWrappingNeoInvocation(data) {
+    const { address, amountToUse, network, deadline, minimumReceived, routePath, scriptHashes, tokenToReceive, tokenToUse, } = data;
+    const tokenToUseOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToUse);
+    const routePathOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideRoutePath(network, routePath);
+    const amountToUseFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToUse, tokenToUseOverrode.decimals);
+    const minimumReceivedFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(minimumReceived, tokenToReceive.decimals);
+    const NEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'NEO');
+    const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
+    const wrapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
+        contractHash: NEO.hash,
+        tokenHash: bNEO.hash,
+        senderAddress: address,
+        amount: amountToUse,
+    });
+    const wrapAllowedContracts = [NEO.hash, bNEO.hash];
+    const swapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.swapTokenInForTokenOutContractInvocation({
+        routerScriptHash: scriptHashes.flamingoSwapRouter,
+        amountToUse: amountToUseFormatted,
+        minimumReceived: minimumReceivedFormatted,
+        senderAddress: address,
+        deadline,
+        args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePathOverrode),
+    });
+    const swapAllowedContracts = [
+        scriptHashes.flamingoSwapRouter,
+        scriptHashes.flamingoFactory,
+        scriptHashes.flamingoPairWhiteList,
+    ];
+    const allowedContracts = [
+        ...new Set([...swapAllowedContracts, ...wrapAllowedContracts, ...routePath.map(token => token.hash)]),
+    ];
+    return {
+        invocations: [wrapInvocation, swapInvocation],
+        signers: [
+            {
+                scopes: neon_core_1.tx.WitnessScope.CustomContracts,
+                allowedContracts,
+            },
+        ],
+    };
+}, _FlamingoSwapInvocationBuilderNeo3_wrapNeoInvocation = function _FlamingoSwapInvocationBuilderNeo3_wrapNeoInvocation(data) {
+    const { address, amountToUse, network } = data;
+    const NEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'NEO');
+    const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
+    const wrapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
+        contractHash: NEO.hash,
+        tokenHash: bNEO.hash,
+        senderAddress: address,
+        amount: amountToUse,
+    });
+    const wrapAllowedContracts = [NEO.hash, bNEO.hash];
+    return {
+        invocations: [wrapInvocation],
+        signers: [{ scopes: neon_core_1.tx.WitnessScope.CustomContracts, allowedContracts: wrapAllowedContracts }],
+    };
+}, _FlamingoSwapInvocationBuilderNeo3_swapToUseInvocation = function _FlamingoSwapInvocationBuilderNeo3_swapToUseInvocation(data) {
+    const { address, amountToUse, deadline, minimumReceived, network, routePath, scriptHashes, tokenToReceive, tokenToUse, } = data;
     const tokenToUseOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToUse);
     const routePathOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideRoutePath(network, routePath);
     const amountToUseFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToUse, tokenToUseOverrode.decimals);
@@ -74,10 +199,14 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         deadline,
         args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePathOverrode),
     });
-    invocations.push(swapInvocation);
-    allowedContracts.push(...__classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts).call(this, scriptHashes, routePath));
+    const swapAllowedContracts = [
+        scriptHashes.flamingoSwapRouter,
+        scriptHashes.flamingoFactory,
+        scriptHashes.flamingoPairWhiteList,
+    ];
+    const allowedContracts = [...new Set([...swapAllowedContracts, ...routePath.map(token => token.hash)])];
     return {
-        invocations,
+        invocations: [swapInvocation],
         signers: [{ scopes: neon_core_1.tx.WitnessScope.CustomContracts, allowedContracts }],
     };
 }, _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs = function _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs(routePath) {
@@ -85,19 +214,4 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         type: 'Hash160',
         value: token.hash,
     }));
-}, _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts = function _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts(scriptHashes, routePath) {
-    return [
-        scriptHashes.flamingoSwapRouter,
-        scriptHashes.flamingoFactory,
-        scriptHashes.flamingoPairWhiteList,
-        ...routePath.map(token => token.hash),
-    ];
-}, _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation = function _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation(senderAddress, contractHash, amount, network) {
-    const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
-    return NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
-        contractHash,
-        tokenHash: bNEO.hash,
-        senderAddress,
-        amount,
-    });
 };

package/dist/constants/FlamingoSwapConstants.d.ts

@@ -25,7 +25,7 @@ export declare class FlamingoSwapConstants {
     static readonly BN_997: BigNumber;
     static readonly BN_1000: BigNumber;
     static readonly FEE_RATE: BigNumber;
-    static readonly GAS_PER_NEO = 0.001;
+    static readonly UNWRAPPING_FEE = 0.001;
     static readonly TESTNET_FLAMINGO_SWAP_TOKENS: FlamingoSwapTokens;
     static readonly MAINNET_FLAMINGO_SWAP_TOKENS: FlamingoSwapTokens;
     static readonly FLAMINGO_SWAP_TOKENS: Record<BSNeo3NetworkId, FlamingoSwapTokens>;

package/dist/constants/FlamingoSwapConstants.js

@@ -16,7 +16,7 @@ FlamingoSwapConstants.BN_1 = new bignumber_js_1.default(1);
 FlamingoSwapConstants.BN_997 = new bignumber_js_1.default(997);
 FlamingoSwapConstants.BN_1000 = new bignumber_js_1.default(1000);
 FlamingoSwapConstants.FEE_RATE = new bignumber_js_1.default(0.003);
-FlamingoSwapConstants.GAS_PER_NEO = 0.001;
+FlamingoSwapConstants.UNWRAPPING_FEE = 0.001;
 FlamingoSwapConstants.TESTNET_FLAMINGO_SWAP_TOKENS = {
     // ============ Neo Assets ============ //
     FLM: {

package/dist/helpers/FlamingoSwapHelper.d.ts

@@ -1,7 +1,7 @@
 import { Network, SwapRoute, Token } from '@cityofzion/blockchain-service';
 import BigNumber from 'bignumber.js';
-import { FlamingoSwapPoolInfo, FlamingoSwapPools, FlamingoSwapScriptHashes, FlamingoSwapTokens } from '../constants/FlamingoSwapConstants';
 import { BSNeo3NetworkId } from '../constants/BSNeo3Constants';
+import { FlamingoSwapPoolInfo, FlamingoSwapPools, FlamingoSwapScriptHashes, FlamingoSwapTokens } from '../constants/FlamingoSwapConstants';
 export declare class FlamingoSwapHelper {
     static listSwappableTokensSymbol(network: Network<BSNeo3NetworkId>): string[];
     static getFlamingoSwapPools(network: Network<BSNeo3NetworkId>): FlamingoSwapPools;
@@ -17,5 +17,11 @@ export declare class FlamingoSwapHelper {
     static overrideRoutePath(network: Network<BSNeo3NetworkId>, routePath: Token[]): Token[];
     static normalizeHash(hash: string): string;
     static isNeoToken(network: Network<BSNeo3NetworkId>, token: Token): boolean;
+    static isBneoToken(network: Network<BSNeo3NetworkId>, token: Token): boolean;
     static formatAmount(amount: string, decimals: number): string;
+    static isSwapUnwrappingNeo(network: Network<BSNeo3NetworkId>, route: Token[]): boolean;
+    static isSwapWrappingNeo(network: Network<BSNeo3NetworkId>, route: Token[]): boolean;
+    static isWrapNeo(network: Network<BSNeo3NetworkId>, route: Token[]): boolean;
+    static isUnwrapNeo(network: Network<BSNeo3NetworkId>, route: Token[]): boolean;
+    static getUnwrappedAmount(amount: string): string;
 }

package/dist/helpers/FlamingoSwapHelper.js

@@ -85,8 +85,45 @@ class FlamingoSwapHelper {
         const NEO = this.getFlamingoSwapToken(network, 'NEO');
         return this.normalizeHash(token.hash) === this.normalizeHash(NEO.hash);
     }
+    static isBneoToken(network, token) {
+        const bNEO = this.getFlamingoSwapToken(network, 'bNEO');
+        return this.normalizeHash(token.hash) === this.normalizeHash(bNEO.hash);
+    }
     static formatAmount(amount, decimals) {
         return neon_core_1.u.BigInteger.fromDecimal(Number(amount), decimals).toString();
     }
+    static isSwapUnwrappingNeo(network, route) {
+        if (route.length < 3) {
+            return false;
+        }
+        const lastToken = route[route.length - 1];
+        return this.isNeoToken(network, lastToken);
+    }
+    static isSwapWrappingNeo(network, route) {
+        if (route.length < 3) {
+            return false;
+        }
+        const firstToken = route[0];
+        return this.isNeoToken(network, firstToken);
+    }
+    static isWrapNeo(network, route) {
+        if (route.length !== 2) {
+            return false;
+        }
+        const firstToken = route[0];
+        const lastToken = route[1];
+        return this.isNeoToken(network, firstToken) && this.isBneoToken(network, lastToken);
+    }
+    static isUnwrapNeo(network, route) {
+        if (route.length !== 2) {
+            return false;
+        }
+        const firstToken = route[0];
+        const lastToken = route[1];
+        return this.isBneoToken(network, firstToken) && this.isNeoToken(network, lastToken);
+    }
+    static getUnwrappedAmount(amount) {
+        return neon_core_1.u.BigInteger.fromNumber(Number(amount) * FlamingoSwapConstants_1.FlamingoSwapConstants.UNWRAPPING_FEE).toString();
+    }
 }
 exports.FlamingoSwapHelper = FlamingoSwapHelper;

package/dist/services/blockchain-data/DoraBDSNeo3.d.ts

@@ -1,6 +1,6 @@
 import { BalanceResponse, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
-import { RpcBDSNeo3 } from './RpcBDSNeo3';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
+import { RpcBDSNeo3 } from './RpcBDSNeo3';
 export declare class DoraBDSNeo3 extends RpcBDSNeo3 {
     constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[]);
     getTransaction(hash: string): Promise<TransactionResponse>;

package/dist/services/nft-data/GhostMarketNDSNeo3.d.ts

@@ -1,6 +1,6 @@
 import { GetNftParam, GetNftsByAddressParams, Network, NftResponse, NftsResponse } from '@cityofzion/blockchain-service';
-import { RpcNDSNeo3 } from './RpcNDSNeo3';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
+import { RpcNDSNeo3 } from './RpcNDSNeo3';
 export declare class GhostMarketNDSNeo3 extends RpcNDSNeo3 {
     #private;
     static CONFIG_BY_NETWORK_ID: Partial<Record<BSNeo3NetworkId, {

package/dist/services/swap/FlamingoSwapServiceNeo3.js

@@ -160,6 +160,27 @@ _FlamingoSwapServiceNeo3_blockchainService = new WeakMap(), _FlamingoSwapService
         (__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_lastAmountChanged_get) === 'amountToUse' && __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_amountToUse_get))) {
         const amountToReceive = __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_lastAmountChanged_get) === 'amountToReceive' ? __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_amountToReceive_get) : null;
         const amountToUse = __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_lastAmountChanged_get) === 'amountToUse' ? __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_amountToUse_get) : null;
+        const initialRoutePath = [__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_tokenToReceive_get), __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_tokenToUse_get)];
+        if (FlamingoSwapHelper_1.FlamingoSwapHelper.isWrapNeo(__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_network, "f"), initialRoutePath) ||
+            FlamingoSwapHelper_1.FlamingoSwapHelper.isUnwrapNeo(__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_network, "f"), initialRoutePath)) {
+            const amount = amountToUse !== null && amountToUse !== void 0 ? amountToUse : amountToReceive;
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, amount, "a", _FlamingoSwapServiceNeo3_amountToUse_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, amount, "a", _FlamingoSwapServiceNeo3_amountToReceive_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, amount, "a", _FlamingoSwapServiceNeo3_maximumSelling_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, amount, "a", _FlamingoSwapServiceNeo3_minimumReceived_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, null, "a", _FlamingoSwapServiceNeo3_liquidityProviderFee_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, null, "a", _FlamingoSwapServiceNeo3_priceImpact_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, null, "a", _FlamingoSwapServiceNeo3_priceInverse_set);
+            __classPrivateFieldSet(this, _FlamingoSwapServiceNeo3_instances, [
+                {
+                    reserveTokenToReceive: '0',
+                    reserveTokenToUse: '0',
+                    tokenToReceive: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_tokenToReceive_get),
+                    tokenToUse: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_tokenToUse_get),
+                },
+            ], "a", _FlamingoSwapServiceNeo3_route_set);
+            return;
+        }
         const { amountToUseToDisplay, amountToReceiveToDisplay, maximumSelling, minimumReceived, liquidityProviderFee, priceImpact, priceInverse, } = handlers_1.FlamingoSwapDetailsHandler.calculateSwapDetails({
             network: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_network, "f"),
             amountToReceive,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -20,8 +20,8 @@
     "bignumber.js": "^9.1.2",
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
-    "@cityofzion/blockchain-service": "1.4.0",
-    "@cityofzion/bs-asteroid-sdk": "0.9.0"
+    "@cityofzion/bs-asteroid-sdk": "0.9.0",
+    "@cityofzion/blockchain-service": "1.4.0"
   },
   "devDependencies": {
     "@cityofzion/neon-dappkit-types": "~0.3.1",