@cityofzion/bs-neo3 1.3.0 → 1.3.2

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/constants/FlamingoSwapConstants.js

@@ -25,12 +25,6 @@ FlamingoSwapConstants.TESTNET_FLAMINGO_SWAP_TOKENS = {
         hash: '0x5b53998b399d10cd25727269e865acc785ef5c1a',
         name: 'FLM',
     },
-    FLUND: {
-        symbol: 'FLUND',
-        decimals: 8,
-        hash: '0x3d0085f442ead25ff3a7507c8eaa27cc8623a6be',
-        name: 'FLUND',
-    },
     TIPS: {
         symbol: 'TIPS',
         decimals: 8,
@@ -139,81 +133,6 @@ FlamingoSwapConstants.TESTNET_FLAMINGO_SWAP_TOKENS = {
         hash: '0x1883231a31dc912805cc08a281d4c268c4cac345',
         name: 'fBNB',
     },
-    // ============ Ethereum Assets ============ //
-    WETH: {
-        symbol: 'WETH',
-        decimals: 18,
-        hash: '0xb603cea165119701b58d56d10d2060fbfb3efad8',
-        name: 'WETH',
-    },
-    WBTC: {
-        symbol: 'WBTC',
-        decimals: 8,
-        hash: '0x557563dc4ed3fd256eba55b9622f53331ab97c2f',
-        name: 'WBTC',
-    },
-    USDT: {
-        symbol: 'USDT',
-        decimals: 6,
-        hash: '0xad3f96ae966ad60347f31845b7e4b333104c52fb',
-        name: 'USDT',
-    },
-    xWETH: {
-        symbol: 'xWETH',
-        decimals: 18,
-        hash: '0xd38fc89febb12e5d32faa72e07d486a268b9c63a',
-        name: 'xWETH',
-    },
-    xWBTC: {
-        symbol: 'xWBTC',
-        decimals: 8,
-        hash: '0x447b931cc604a30dc16c49002f35a7aab7888b78',
-        name: 'xWBTC',
-    },
-    xUSDT: {
-        symbol: 'xUSDT',
-        decimals: 6,
-        hash: '0xf15b5430321f4e51f5f534cedada7fbb78fa6680',
-        name: 'xUSDT',
-    },
-    // ============ Ontology Assets ============ //
-    ONTd: {
-        symbol: 'ONTd',
-        decimals: 9,
-        hash: '0x869951e3397550e800d5faf579857cdb637a0051',
-        name: 'ONTd',
-    },
-    // ============ BSC Assets ============ //
-    CAKE: {
-        symbol: 'CAKE',
-        decimals: 18,
-        hash: '0x778140d3A1e0024Be11e723a8af2C4d521feBA4f',
-        name: 'CAKE',
-    },
-    BNB: {
-        symbol: 'BNB',
-        decimals: 18,
-        hash: '0x0000000000000000000000000000000000000000',
-        name: 'BNB',
-    },
-    xfCAKE: {
-        symbol: 'xfCAKE',
-        decimals: 18,
-        hash: '0x64A647dC1634d164896D7146f7Ad314665DFeB18',
-        name: 'xfCAKE',
-    },
-    bNUDES: {
-        symbol: 'bNUDES',
-        decimals: 8,
-        hash: '0xeA5143686D0edb60dcE657CeDA8367a92a2Bff58',
-        name: 'bNUDES',
-    },
-    FUSD: {
-        symbol: 'FUSD',
-        decimals: 8,
-        hash: '0xcdaddd3e196bb1c1978364dd78b8cec5d4753f58',
-        name: 'FUSD',
-    },
 };
 FlamingoSwapConstants.MAINNET_FLAMINGO_SWAP_TOKENS = {
     // ============ Neo Assets ============ //
@@ -223,12 +142,6 @@ FlamingoSwapConstants.MAINNET_FLAMINGO_SWAP_TOKENS = {
         hash: '0xf0151f528127558851b39c2cd8aa47da7418ab28',
         name: 'FLM',
     },
-    FLUND: {
-        symbol: 'FLUND',
-        decimals: 8,
-        hash: '0xa9603a59e21d29e37ac39cf1b5f5abf5006b22a3',
-        name: 'FLUND',
-    },
     TIPS: {
         symbol: 'TIPS',
         decimals: 8,
@@ -355,69 +268,6 @@ FlamingoSwapConstants.MAINNET_FLAMINGO_SWAP_TOKENS = {
         hash: '0xb56f0fba45cc57a948b342186274dfd863996bb3',
         name: 'fBNB',
     },
-    // ============ Ethereum Assets ============ //
-    WETH: {
-        symbol: 'WETH',
-        decimals: 18,
-        hash: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-        name: 'WETH',
-    },
-    WBTC: {
-        symbol: 'WBTC',
-        decimals: 8,
-        hash: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-        name: 'WBTC',
-    },
-    USDT: {
-        symbol: 'USDT',
-        decimals: 6,
-        hash: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-        name: 'USDT',
-    },
-    xWETH: {
-        symbol: 'xWETH',
-        decimals: 18,
-        hash: '0x46b2E0224efb03D43eba88AB5A1995480e6A76b6',
-        name: 'xWETH',
-    },
-    xWBTC: {
-        symbol: 'xWBTC',
-        decimals: 8,
-        hash: '0xebd0e8988ac25a793dc27368f96a5a72e34efcd7',
-        name: 'xWBTC',
-    },
-    xUSDT: {
-        symbol: 'xUSDT',
-        decimals: 6,
-        hash: '0xa93727e8661d4f82cfd50f7d8fd3f38ec8493b84',
-        name: 'xUSDT',
-    },
-    // ============ Ontology Assets ============ //
-    ONTd: {
-        symbol: 'ONTd',
-        decimals: 9,
-        hash: '33ae7eae016193ba0fe238b223623bc78faac158',
-        name: 'ONTd',
-    },
-    WING: {
-        symbol: 'WING',
-        decimals: 9,
-        hash: '00c59fcd27a562d6397883eab1f2fff56e58ef80',
-        name: 'WING',
-    },
-    // ============ BSC Assets ============ //
-    CAKE: {
-        symbol: 'CAKE',
-        decimals: 18,
-        hash: '0x0E09FaBB73Bd3Ade0a17ECC321fD13a19e81cE82',
-        name: 'CAKE',
-    },
-    xfCAKE: {
-        symbol: 'xfCAKE',
-        decimals: 18,
-        hash: '0xD05923B7E0c86f31A4a6dFA4d5bbF191AbEe6Ab2',
-        name: 'xfCAKE',
-    },
 };
 FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS = {
     testnet: _a.TESTNET_FLAMINGO_SWAP_TOKENS,

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;

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) {

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 export * from './BSNeo3';
 export * from './builder/invocation/FlamingoSwapInvocationBuilderNeo3';
 export * from './builder/invocation/NeonDappKitInvocationBuilderNeo3';
-export * from './constants/FlamingoSwapConstants';
 export * from './helpers/BSNeo3Helper';
 export * from './helpers/FlamingoSwapHelper';
+export * from './constants/FlamingoSwapConstants';
 export * from './services/blockchain-data/DoraBDSNeo3';
 export * from './services/blockchain-data/RpcBDSNeo3';
 export * from './services/exchange-data/FlamingoEDSNeo3';

package/dist/index.js

@@ -17,9 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BSNeo3"), exports);
 __exportStar(require("./builder/invocation/FlamingoSwapInvocationBuilderNeo3"), exports);
 __exportStar(require("./builder/invocation/NeonDappKitInvocationBuilderNeo3"), exports);
-__exportStar(require("./constants/FlamingoSwapConstants"), exports);
 __exportStar(require("./helpers/BSNeo3Helper"), exports);
 __exportStar(require("./helpers/FlamingoSwapHelper"), exports);
+__exportStar(require("./constants/FlamingoSwapConstants"), exports);
 __exportStar(require("./services/blockchain-data/DoraBDSNeo3"), exports);
 __exportStar(require("./services/blockchain-data/RpcBDSNeo3"), exports);
 __exportStar(require("./services/exchange-data/FlamingoEDSNeo3"), exports);

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

@@ -1,4 +1,4 @@
-import { Account, Network, PoolGraph, SwapService, SwapServiceEvents, SwapServiceSwapToReceiveArgs, SwapServiceSwapToUseArgs, Token } from '@cityofzion/blockchain-service';
+import { Account, Network, SwapService, SwapServiceEvents, SwapServiceSwapToReceiveArgs, SwapServiceSwapToUseArgs, Token } from '@cityofzion/blockchain-service';
 import TypedEmitter from 'typed-emitter';
 import { BSNeo3NetworkId } from '../../helpers/BSNeo3Helper';
 import { NeonDappKitLedgerServiceNeo3 } from '../ledger/NeonDappKitLedgerServiceNeo3';
@@ -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;
-    listSwappableTokens(network: Network<BSNeo3NetworkId>): PoolGraph;
     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' });
     }
-    listSwappableTokens(network) {
-        return 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/dist/services/swap/handlers/FlamingoSwapRouteHandler.js

@@ -35,24 +35,24 @@ class FlamingoSwapRouteHandler {
         });
     }
     static createPoolGraph(network) {
+        const poolGraph = {};
         const pools = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapPools(network);
         const tokens = FlamingoSwapHelper_1.FlamingoSwapHelper.getFlamingoSwapTokens(network);
         const { NEO, bNEO } = tokens;
-        const poolGraph = {};
         // Initialize poolGraph with empty arrays
-        Object.values(tokens).forEach(token => {
-            poolGraph[token.symbol] = [];
+        Object.keys(tokens).forEach(tokenSymbol => {
+            poolGraph[tokenSymbol] = [];
         });
         // Add edges to poolGraph
         Object.values(pools).forEach(pool => {
-            const tokenA = pool.tokens[0].symbol;
-            const tokenB = pool.tokens[1].symbol;
-            poolGraph[tokenA].push(tokenB);
-            poolGraph[tokenB].push(tokenA);
+            const tokenASymbol = pool.tokens[0].symbol;
+            const tokenBSymbol = pool.tokens[1].symbol;
+            poolGraph[tokenASymbol].push(tokenBSymbol);
+            poolGraph[tokenBSymbol].push(tokenASymbol);
         });
         // Remove duplicates from poolGraph
-        Object.keys(poolGraph).forEach(tokenSymbol => {
-            poolGraph[tokenSymbol] = [...new Set(poolGraph[tokenSymbol])];
+        Object.keys(tokens).forEach(tokenSymbol => {
+            poolGraph[tokenSymbol] = Array.from(new Set(poolGraph[tokenSymbol]));
         });
         // Include NEO to the poolGraph
         poolGraph[NEO.symbol] = Object.keys(tokens).filter(tokenSymbol => tokenSymbol === bNEO.symbol);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "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.0",
+    "@cityofzion/blockchain-service": "1.3.2",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {