@cityofzion/bs-neo3 1.3.1 → 1.3.3

package/dist/BSNeo3.d.ts

@@ -1,8 +1,8 @@
-import { Account, AccountWithDerivationPath, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam } from '@cityofzion/blockchain-service';
+import { Account, AccountWithDerivationPath, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BSWithSwap, ExchangeDataService, ExplorerService, Network, NftDataService, SwapService, Token, TransferParam } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import { BSNeo3NetworkId } from './helpers/BSNeo3Helper';
 import { NeonDappKitLedgerServiceNeo3 } from './services/ledger/NeonDappKitLedgerServiceNeo3';
-export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSNeo3NetworkId>, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger {
+export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSNeo3NetworkId>, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger, BSWithSwap<BSNeo3NetworkId> {
     #private;
     blockchainName: BSCustomName;
     derivationPath: string;
@@ -17,6 +17,7 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     explorerService: ExplorerService;
     network: Network<BSNeo3NetworkId>;
     constructor(blockchainName: BSCustomName, network?: Network<BSNeo3NetworkId>, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    createSwapService(): SwapService<BSNeo3NetworkId>;
     setNetwork(network: Network<BSNeo3NetworkId>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(encryptedKey: string): boolean;

package/dist/BSNeo3.js

@@ -25,6 +25,7 @@ const FlamingoEDSNeo3_1 = require("./services/exchange-data/FlamingoEDSNeo3");
 const DoraESNeo3_1 = require("./services/explorer/DoraESNeo3");
 const NeonDappKitLedgerServiceNeo3_1 = require("./services/ledger/NeonDappKitLedgerServiceNeo3");
 const GhostMarketNDSNeo3_1 = require("./services/nft-data/GhostMarketNDSNeo3");
+const FlamingoSwapServiceNeo3_1 = require("./services/swap/FlamingoSwapServiceNeo3");
 class BSNeo3 {
     constructor(blockchainName, network, getLedgerTransport) {
         _BSNeo3_instances.add(this);
@@ -34,6 +35,9 @@ class BSNeo3 {
         this.derivationPath = BSNeo3Helper_1.BSNeo3Helper.DERIVATION_PATH;
         this.setNetwork(network);
     }
+    createSwapService() {
+        return new FlamingoSwapServiceNeo3_1.FlamingoSwapServiceNeo3(this.network, this.ledgerService);
+    }
     setNetwork(network) {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;

package/dist/builder/invocation/FlamingoSwapInvocationBuilderNeo3.js

@@ -23,9 +23,10 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
     const [tokenToUse] = routePath;
     const tokenToReceive = routePath[routePath.length - 1];
     const scriptHashes = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapScriptHashes(network);
-    const tokenToReceiveOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToReceive);
     const invocations = [];
-    const allowedContracts = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts).call(this, scriptHashes, routePath);
+    const allowedContracts = [];
+    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({
@@ -34,13 +35,16 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         amountToReceive: amountToReceiveFormatted,
         maximumSelling: maximumSellingFormatted,
         deadline,
-        args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePath),
+        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 neoTransferInvocation = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation).call(this, address, amountToReceiveTransfer, network);
+        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);
     }
     return {
         invocations,
@@ -51,12 +55,16 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
     const tokenToReceive = routePath[routePath.length - 1];
     const scriptHashes = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapScriptHashes(network);
     const invocations = [];
-    const allowedContracts = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_getAllowedContracts).call(this, scriptHashes, routePath);
+    const allowedContracts = [];
     if (FlamingoSwapHelper_1.FlamingoSwapHelper.isNeoToken(network, tokenToUse)) {
-        const neoTransferInvocation = __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation).call(this, address, amountToUse, network);
+        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);
     }
-    const amountToUseFormatted = FlamingoSwapHelper_1.FlamingoSwapHelper.formatAmount(amountToUse, tokenToUse.decimals);
+    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 swapInvocation = NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.swapTokenInForTokenOutContractInvocation({
         routerScriptHash: scriptHashes.flamingoSwapRouter,
@@ -64,9 +72,10 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         minimumReceived: minimumReceivedFormatted,
         senderAddress: address,
         deadline,
-        args: __classPrivateFieldGet(this, _a, "m", _FlamingoSwapInvocationBuilderNeo3_mapRoutePathToArgs).call(this, routePath),
+        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));
     return {
         invocations,
         signers: [{ scopes: neon_core_1.tx.WitnessScope.CustomContracts, allowedContracts }],
@@ -83,13 +92,12 @@ _a = FlamingoSwapInvocationBuilderNeo3, _FlamingoSwapInvocationBuilderNeo3_build
         scriptHashes.flamingoPairWhiteList,
         ...routePath.map(token => token.hash),
     ];
-}, _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation = function _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation(address, amount, network) {
+}, _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation = function _FlamingoSwapInvocationBuilderNeo3_buildNEOTransferInvocation(senderAddress, contractHash, amount, network) {
     const bNEO = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'bNEO');
-    const GAS = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapToken(network, 'GAS');
     return NeonDappKitInvocationBuilderNeo3_1.NeonDappKitInvocationBuilderNeo3.transferContractInvocation({
-        senderAddress: address,
-        amount,
+        contractHash,
         tokenHash: bNEO.hash,
-        contractHash: GAS.hash,
+        senderAddress,
+        amount,
     });
 };

package/dist/helpers/FlamingoSwapHelper.d.ts

@@ -3,6 +3,7 @@ import BigNumber from 'bignumber.js';
 import { FlamingoSwapPoolInfo, FlamingoSwapPools, FlamingoSwapScriptHashes, FlamingoSwapTokens } from '../constants/FlamingoSwapConstants';
 import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare class FlamingoSwapHelper {
+    static listSwappableTokensSymbol(network: Network<BSNeo3NetworkId>): string[];
     static getFlamingoSwapPools(network: Network<BSNeo3NetworkId>): FlamingoSwapPools;
     static getFlamingoSwapPool(network: Network<BSNeo3NetworkId>, name: string): FlamingoSwapPoolInfo;
     static getFlamingoSwapTokens(network: Network<BSNeo3NetworkId>): FlamingoSwapTokens;
@@ -13,6 +14,7 @@ export declare class FlamingoSwapHelper {
     static overrideAmountInput(network: Network<BSNeo3NetworkId>, amount: string, token: Token): BigNumber;
     static overrideAmountToDisplay(network: Network<BSNeo3NetworkId>, amount: string, token: Token): string;
     static overrideRoute(network: Network<BSNeo3NetworkId>, route: SwapRoute[]): SwapRoute[];
+    static overrideRoutePath(network: Network<BSNeo3NetworkId>, routePath: Token[]): Token[];
     static normalizeHash(hash: string): string;
     static isNeoToken(network: Network<BSNeo3NetworkId>, token: Token): boolean;
     static formatAmount(amount: string, decimals: number): string;

package/dist/helpers/FlamingoSwapHelper.js

@@ -7,7 +7,11 @@ exports.FlamingoSwapHelper = void 0;
 const neon_core_1 = require("@cityofzion/neon-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const FlamingoSwapConstants_1 = require("../constants/FlamingoSwapConstants");
+const handlers_1 = require("../services/swap/handlers");
 class FlamingoSwapHelper {
+    static listSwappableTokensSymbol(network) {
+        return Object.keys(handlers_1.FlamingoSwapRouteHandler.createPoolGraph(network));
+    }
     static getFlamingoSwapPools(network) {
         const pools = FlamingoSwapConstants_1.FlamingoSwapConstants.FLAMINGO_SWAP_POOLS[network.id];
         if (!pools) {
@@ -70,6 +74,10 @@ class FlamingoSwapHelper {
         }
         return overrodeRoute;
     }
+    static overrideRoutePath(network, routePath) {
+        const overrodeRoutePath = routePath.map(token => this.overrideToken(network, token));
+        return overrodeRoutePath.filter((item, index, arr) => arr.indexOf(item) === index);
+    }
     static normalizeHash(hash) {
         return hash.startsWith('0x') ? hash.slice(2) : hash;
     }

package/dist/services/swap/FlamingoSwapServiceNeo3.d.ts

@@ -6,9 +6,8 @@ type BuildSwapInvocationArgs = SwapServiceSwapToUseArgs<BSNeo3NetworkId> | SwapS
 export declare class FlamingoSwapServiceNeo3 implements SwapService<BSNeo3NetworkId> {
     #private;
     eventEmitter: TypedEmitter<SwapServiceEvents>;
-    constructor(network: Network<BSNeo3NetworkId>, ledgerService: NeonDappKitLedgerServiceNeo3);
+    constructor(network: Network<BSNeo3NetworkId>, ledgerService?: NeonDappKitLedgerServiceNeo3);
     buildSwapInvocationArgs(): BuildSwapInvocationArgs;
-    listSwappableTokensSymbol(network: Network<BSNeo3NetworkId>): string[];
     swap(isLedger?: boolean): Promise<void>;
     startListeningBlockGeneration(): void;
     stopListeningBlockGeneration(): void;

package/dist/services/swap/FlamingoSwapServiceNeo3.js

@@ -81,24 +81,26 @@ class FlamingoSwapServiceNeo3 {
             throw new Error("minimumReceived is required for 'amountToUse' swap type");
         return Object.assign(Object.assign({}, baseSwapArgs), { amountToUse: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_amountToUse_get), minimumReceived: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_minimumReceived_get), type: 'swapTokenToUse' });
     }
-    listSwappableTokensSymbol(network) {
-        return Object.keys(handlers_1.FlamingoSwapRouteHandler.createPoolGraph(network));
-    }
     swap(isLedger) {
         return __awaiter(this, void 0, void 0, function* () {
             const swapInvocationArgs = this.buildSwapInvocationArgs();
             let ledgerTransport;
+            let signingCallback;
             if (isLedger) {
+                if (!__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_ledgerService, "f")) {
+                    throw new Error('You must provide a ledger service to use Ledger');
+                }
                 if (!__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_ledgerService, "f").getLedgerTransport) {
                     throw new Error('You must provide a getLedgerTransport function to use Ledger');
                 }
                 ledgerTransport = yield __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_ledgerService, "f").getLedgerTransport(__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_accountToUse_get));
+                signingCallback = __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_ledgerService, "f").getSigningCallback(ledgerTransport);
             }
             const account = new neon_core_1.wallet.Account(__classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_instances, "a", _FlamingoSwapServiceNeo3_accountToUse_get).key);
             const invoker = yield neon_dappkit_1.NeonInvoker.init({
                 rpcAddress: __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_network, "f").url,
                 account,
-                signingCallback: ledgerTransport ? __classPrivateFieldGet(this, _FlamingoSwapServiceNeo3_ledgerService, "f").getSigningCallback(ledgerTransport) : undefined,
+                signingCallback,
             });
             yield invoker.invokeFunction(FlamingoSwapInvocationBuilderNeo3_1.FlamingoSwapInvocationBuilderNeo3.swapInvocation(swapInvocationArgs));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -20,7 +20,7 @@
     "bignumber.js": "^9.1.2",
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
-    "@cityofzion/blockchain-service": "1.3.1",
+    "@cityofzion/blockchain-service": "1.3.2",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {