@cityofzion/bs-neo3 1.0.3 → 1.1.0

package/dist/BSNeo3.d.ts

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

package/dist/BSNeo3.js

@@ -22,7 +22,6 @@ const bs_asteroid_sdk_1 = require("@cityofzion/bs-asteroid-sdk");
 const BSNeo3Helper_1 = require("./BSNeo3Helper");
 const NeonDappKitLedgerServiceNeo3_1 = require("./NeonDappKitLedgerServiceNeo3");
 const DoraBDSNeo3_1 = require("./DoraBDSNeo3");
-const RpcBDSNeo3_1 = require("./RpcBDSNeo3");
 const FlamingoEDSNeo3_1 = require("./FlamingoEDSNeo3");
 const GhostMarketNDSNeo3_1 = require("./GhostMarketNDSNeo3");
 const DoraESNeo3_1 = require("./DoraESNeo3");
@@ -38,15 +37,10 @@ class BSNeo3 {
     setNetwork(network) {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;
-        if (DoraBDSNeo3_1.DoraBDSNeo3.SUPPORTED_NETWORKS.includes(network.id)) {
-            this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
-        }
-        else {
-            this.blockchainDataService = new RpcBDSNeo3_1.RPCBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
-        }
-        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network.id, this.tokens);
+        this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
+        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network);
         this.nftDataService = new GhostMarketNDSNeo3_1.GhostMarketNDSNeo3(network);
-        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network.id);
+        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network);
     }
     validateAddress(address) {
         return neon_js_1.wallet.isAddress(address, 53);

package/dist/BSNeo3Helper.d.ts

@@ -1,21 +1,23 @@
-import { Network } from '@cityofzion/blockchain-service';
-export type AvailableNetworkIds = 'mainnet' | 'testnet' | (string & {});
+import { Network, NetworkId } from '@cityofzion/blockchain-service';
+export type BSNeo3NetworkId = NetworkId<'mainnet' | 'testnet'>;
 export declare class BSNeo3Helper {
     #private;
-    static MAINNET_NETWORK_IDS: AvailableNetworkIds[];
-    static TESTNET_NETWORK_IDS: AvailableNetworkIds[];
-    static ALL_NETWORK_IDS: AvailableNetworkIds[];
-    static MAINNET_NETWORKS: Network<AvailableNetworkIds>[];
-    static TESTNET_NETWORKS: Network<AvailableNetworkIds>[];
-    static ALL_NETWORKS: Network<AvailableNetworkIds>[];
-    static DEFAULT_NETWORK: Network<AvailableNetworkIds>;
+    static MAINNET_NETWORK_IDS: BSNeo3NetworkId[];
+    static TESTNET_NETWORK_IDS: BSNeo3NetworkId[];
+    static ALL_NETWORK_IDS: BSNeo3NetworkId[];
+    static MAINNET_NETWORKS: Network<BSNeo3NetworkId>[];
+    static TESTNET_NETWORKS: Network<BSNeo3NetworkId>[];
+    static ALL_NETWORKS: Network<BSNeo3NetworkId>[];
+    static DEFAULT_NETWORK: Network<BSNeo3NetworkId>;
     static NEO_NS_HASH: string;
     static DERIVATION_PATH: string;
-    static getTokens(network: Network<AvailableNetworkIds>): {
+    static getTokens(network: Network<BSNeo3NetworkId>): {
         symbol: string;
         name: string;
         hash: string;
         decimals: number;
     }[];
-    static getRpcList(network: Network<AvailableNetworkIds>): string[];
+    static getRpcList(network: Network<BSNeo3NetworkId>): string[];
+    static isMainnet(network: Network<BSNeo3NetworkId>): boolean;
+    static isCustomNet(network: Network<BSNeo3NetworkId>): boolean;
 }

package/dist/BSNeo3Helper.js

@@ -22,6 +22,12 @@ class BSNeo3Helper {
         var _b;
         return (_b = __classPrivateFieldGet(this, _a, "f", _BSNeo3Helper_RPC_LIST_BY_NETWORK_ID)[network.id]) !== null && _b !== void 0 ? _b : [];
     }
+    static isMainnet(network) {
+        return this.MAINNET_NETWORK_IDS.includes(network.id);
+    }
+    static isCustomNet(network) {
+        return !this.ALL_NETWORK_IDS.includes(network.id);
+    }
 }
 exports.BSNeo3Helper = BSNeo3Helper;
 _a = BSNeo3Helper;

package/dist/DoraBDSNeo3.d.ts

@@ -1,9 +1,8 @@
 import { BalanceResponse, ContractResponse, TransactionsByAddressParams, TransactionsByAddressResponse, TransactionResponse, Network, Token } from '@cityofzion/blockchain-service';
 import { RPCBDSNeo3 } from './RpcBDSNeo3';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare class DoraBDSNeo3 extends RPCBDSNeo3 {
-    static SUPPORTED_NETWORKS: AvailableNetworkIds[];
-    constructor(network: Network<AvailableNetworkIds>, feeToken: Token, claimToken: Token, tokens: Token[]);
+    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[]);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress({ address, page, }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getContract(contractHash: string): Promise<ContractResponse>;

package/dist/DoraBDSNeo3.js

@@ -13,6 +13,7 @@ exports.DoraBDSNeo3 = void 0;
 const neon_js_1 = require("@cityofzion/neon-js");
 const api_1 = require("@cityofzion/dora-ts/dist/api");
 const RpcBDSNeo3_1 = require("./RpcBDSNeo3");
+const BSNeo3Helper_1 = require("./BSNeo3Helper");
 const NeoRest = new api_1.NeoRESTApi({
     doraUrl: 'https://dora.coz.io',
     endpoint: '/api/v2/neo3',
@@ -22,8 +23,14 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         super(network, feeToken, claimToken, tokens);
     }
     getTransaction(hash) {
+        const _super = Object.create(null, {
+            getTransaction: { get: () => super.getTransaction }
+        });
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+                return yield _super.getTransaction.call(this, hash);
+            }
             try {
                 const data = yield NeoRest.transaction(hash, this._network.id);
                 return {
@@ -43,7 +50,13 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
     }
     getTransactionsByAddress({ address, page = 1, }) {
+        const _super = Object.create(null, {
+            getTransactionsByAddress: { get: () => super.getTransactionsByAddress }
+        });
         return __awaiter(this, void 0, void 0, function* () {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+                return yield _super.getTransactionsByAddress.call(this, { address, page });
+            }
             const data = yield NeoRest.addressTXFull(address, page, this._network.id);
             const promises = data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
@@ -106,8 +119,14 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
     }
     getContract(contractHash) {
+        const _super = Object.create(null, {
+            getContract: { get: () => super.getContract }
+        });
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+                return yield _super.getContract.call(this, contractHash);
+            }
             try {
                 const data = yield NeoRest.contract(contractHash, this._network.id);
                 return {
@@ -122,7 +141,13 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
     }
     getTokenInfo(tokenHash) {
+        const _super = Object.create(null, {
+            getTokenInfo: { get: () => super.getTokenInfo }
+        });
         return __awaiter(this, void 0, void 0, function* () {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+                return yield _super.getTokenInfo.call(this, tokenHash);
+            }
             const localToken = this._tokens.find(token => token.hash === tokenHash);
             if (localToken)
                 return localToken;
@@ -146,7 +171,13 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
     }
     getBalance(address) {
+        const _super = Object.create(null, {
+            getBalance: { get: () => super.getBalance }
+        });
         return __awaiter(this, void 0, void 0, function* () {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+                return yield _super.getBalance.call(this, address);
+            }
             const response = yield NeoRest.balance(address, this._network.id);
             const promises = response.map((balance) => __awaiter(this, void 0, void 0, function* () {
                 try {
@@ -171,4 +202,3 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     }
 }
 exports.DoraBDSNeo3 = DoraBDSNeo3;
-DoraBDSNeo3.SUPPORTED_NETWORKS = ['mainnet', 'testnet'];

package/dist/DoraESNeo3.d.ts

@@ -1,8 +1,8 @@
-import { ExplorerService, BuildNftUrlParams } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { ExplorerService, BuildNftUrlParams, Network } from '@cityofzion/blockchain-service';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare class DoraESNeo3 implements ExplorerService {
     #private;
-    constructor(networkType: AvailableNetworkIds);
+    constructor(network: Network<BSNeo3NetworkId>);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
     buildNftUrl({ contractHash, tokenId }: BuildNftUrlParams): string;

package/dist/DoraESNeo3.js

@@ -10,30 +10,30 @@ 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 _DoraESNeo3_networkId;
+var _DoraESNeo3_network;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraESNeo3 = void 0;
-const DoraBDSNeo3_1 = require("./DoraBDSNeo3");
+const BSNeo3Helper_1 = require("./BSNeo3Helper");
 class DoraESNeo3 {
-    constructor(networkType) {
-        _DoraESNeo3_networkId.set(this, void 0);
-        __classPrivateFieldSet(this, _DoraESNeo3_networkId, networkType, "f");
+    constructor(network) {
+        _DoraESNeo3_network.set(this, void 0);
+        __classPrivateFieldSet(this, _DoraESNeo3_network, network, "f");
     }
     buildTransactionUrl(hash) {
-        if (!DoraBDSNeo3_1.DoraBDSNeo3.SUPPORTED_NETWORKS.includes(__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")))
-            throw new Error('Unsupported network');
-        return `https://dora.coz.io/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")}/${hash}`;
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+            throw new Error('DoraESNeo3 is only available on mainnet and testnet');
+        return `https://dora.coz.io/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${hash}`;
     }
     buildContractUrl(contractHash) {
-        if (!DoraBDSNeo3_1.DoraBDSNeo3.SUPPORTED_NETWORKS.includes(__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")))
-            throw new Error('Unsupported network');
-        return `https://dora.coz.io/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")}/${contractHash}`;
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+            throw new Error('DoraESNeo3 is only available on mainnet and testnet');
+        return `https://dora.coz.io/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${contractHash}`;
     }
     buildNftUrl({ contractHash, tokenId }) {
-        if (!DoraBDSNeo3_1.DoraBDSNeo3.SUPPORTED_NETWORKS.includes(__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")))
-            throw new Error('Unsupported network');
-        return `https://dora.coz.io/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")}/${contractHash}/${tokenId}`;
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+            throw new Error('DoraESNeo3 is only available on mainnet and testnet');
+        return `https://dora.coz.io/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${contractHash}/${tokenId}`;
     }
 }
 exports.DoraESNeo3 = DoraESNeo3;
-_DoraESNeo3_networkId = new WeakMap();
+_DoraESNeo3_network = new WeakMap();

package/dist/FlamingoEDSNeo3.d.ts

@@ -1,9 +1,8 @@
-import { CryptoCompareEDS, Currency, ExchangeDataService, GetTokenPriceHistory, Token, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare class FlamingoEDSNeo3 extends CryptoCompareEDS implements ExchangeDataService {
     #private;
-    constructor(networkId: AvailableNetworkIds, tokens: Token[]);
-    getTokenPrices(currency: Currency): Promise<TokenPricesResponse[]>;
-    getTokenPriceHistory(params: GetTokenPriceHistory): Promise<TokenPricesHistoryResponse[]>;
-    private getCurrencyRatio;
+    constructor(network: Network<BSNeo3NetworkId>);
+    getTokenPrices(params: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
+    getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
 }

package/dist/FlamingoEDSNeo3.js

@@ -22,33 +22,36 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _FlamingoEDSNeo3_networkId, _FlamingoEDSNeo3_axiosInstance;
+var _FlamingoEDSNeo3_network, _FlamingoEDSNeo3_axiosInstance;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlamingoEDSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const axios_1 = __importDefault(require("axios"));
+const BSNeo3Helper_1 = require("./BSNeo3Helper");
 class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
-    constructor(networkId, tokens) {
-        super(tokens);
-        _FlamingoEDSNeo3_networkId.set(this, void 0);
+    constructor(network) {
+        super();
+        _FlamingoEDSNeo3_network.set(this, void 0);
         _FlamingoEDSNeo3_axiosInstance.set(this, void 0);
-        __classPrivateFieldSet(this, _FlamingoEDSNeo3_networkId, networkId, "f");
+        __classPrivateFieldSet(this, _FlamingoEDSNeo3_network, network, "f");
         __classPrivateFieldSet(this, _FlamingoEDSNeo3_axiosInstance, axios_1.default.create({ baseURL: 'https://api.flamingo.finance' }), "f");
     }
-    getTokenPrices(currency) {
+    getTokenPrices(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _FlamingoEDSNeo3_networkId, "f") !== 'mainnet')
+            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoEDSNeo3_network, "f")))
                 throw new Error('Exchange is only available on mainnet');
-            const { data: prices } = yield __classPrivateFieldGet(this, _FlamingoEDSNeo3_axiosInstance, "f").get('/token-info/prices');
-            let currencyRatio = 1;
-            if (currency !== 'USD') {
-                currencyRatio = yield this.getCurrencyRatio(currency);
-            }
-            return prices.map(price => ({
-                price: price.usd_price * currencyRatio,
-                symbol: price.symbol,
-                hash: price.hash,
-            }));
+            const { data } = yield __classPrivateFieldGet(this, _FlamingoEDSNeo3_axiosInstance, "f").get('/token-info/prices');
+            const prices = [];
+            data.forEach(item => {
+                const token = params.tokens.find(token => token.hash === item.hash);
+                if (!token)
+                    return;
+                prices.push({
+                    usdPrice: item.usd_price,
+                    token,
+                });
+            });
+            return prices;
         });
     }
     getTokenPriceHistory(params) {
@@ -56,17 +59,11 @@ class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
             getTokenPriceHistory: { get: () => super.getTokenPriceHistory }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _FlamingoEDSNeo3_networkId, "f") !== 'mainnet')
+            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoEDSNeo3_network, "f")))
                 throw new Error('Exchange is only available on mainnet');
             return yield _super.getTokenPriceHistory.call(this, params);
         });
     }
-    getCurrencyRatio(currency) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { data } = yield __classPrivateFieldGet(this, _FlamingoEDSNeo3_axiosInstance, "f").get(`/fiat/exchange-rate?pair=USD_${currency}`);
-            return data;
-        });
-    }
 }
 exports.FlamingoEDSNeo3 = FlamingoEDSNeo3;
-_FlamingoEDSNeo3_networkId = new WeakMap(), _FlamingoEDSNeo3_axiosInstance = new WeakMap();
+_FlamingoEDSNeo3_network = new WeakMap(), _FlamingoEDSNeo3_axiosInstance = new WeakMap();

package/dist/GhostMarketNDSNeo3.d.ts

@@ -1,13 +1,13 @@
 import { NftResponse, NftsResponse, GetNftParam, GetNftsByAddressParams, Network } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 import { RpcNDSNeo3 } from './RpcNDSNeo3';
 export declare class GhostMarketNDSNeo3 extends RpcNDSNeo3 {
     #private;
-    static CONFIG_BY_NETWORK_ID: Partial<Record<AvailableNetworkIds, {
+    static CONFIG_BY_NETWORK_ID: Partial<Record<BSNeo3NetworkId, {
         url: string;
         chain: string;
     }>>;
-    constructor(network: Network<AvailableNetworkIds>);
+    constructor(network: Network<BSNeo3NetworkId>);
     getNftsByAddress({ address, size, cursor }: GetNftsByAddressParams): Promise<NftsResponse>;
     getNft({ contractHash, tokenId }: GetNftParam): Promise<NftResponse>;
 }

package/dist/GhostMarketNDSNeo3.js

@@ -72,7 +72,7 @@ _GhostMarketNDSNeo3_network = new WeakMap(), _GhostMarketNDSNeo3_instances = new
 }, _GhostMarketNDSNeo3_getUrlWithParams = function _GhostMarketNDSNeo3_getUrlWithParams(params) {
     const config = GhostMarketNDSNeo3.CONFIG_BY_NETWORK_ID[__classPrivateFieldGet(this, _GhostMarketNDSNeo3_network, "f").id];
     if (!config)
-        throw new Error('Unsupported network');
+        throw new Error('GhostMarketNDSNeo3 does not support this network');
     const parameters = query_string_1.default.stringify(Object.assign({ chain: config.chain }, params), { arrayFormat: 'bracket' });
     return `${config.url}/assets?${parameters}`;
 }, _GhostMarketNDSNeo3_parse = function _GhostMarketNDSNeo3_parse(data) {

package/dist/RpcBDSNeo3.d.ts

@@ -1,13 +1,13 @@
 import { BDSClaimable, BalanceResponse, BlockchainDataService, ContractResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare class RPCBDSNeo3 implements BlockchainDataService, BDSClaimable {
     readonly _tokenCache: Map<string, Token>;
     readonly _feeToken: Token;
     readonly _claimToken: Token;
-    readonly _network: Network<AvailableNetworkIds>;
+    readonly _network: Network<BSNeo3NetworkId>;
     readonly _tokens: Token[];
     maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network<AvailableNetworkIds>, feeToken: Token, claimToken: Token, tokens: Token[]);
+    constructor(network: Network<BSNeo3NetworkId>, feeToken: Token, claimToken: Token, tokens: Token[]);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress(_params: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getContract(contractHash: string): Promise<ContractResponse>;

package/dist/RpcNDSNeo3.d.ts

@@ -1,8 +1,8 @@
 import { GetNftParam, GetNftsByAddressParams, HasTokenParam, Network, NftDataService, NftResponse, NftsResponse } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from './BSNeo3Helper';
+import { BSNeo3NetworkId } from './BSNeo3Helper';
 export declare abstract class RpcNDSNeo3 implements NftDataService {
     #private;
-    protected constructor(network: Network<AvailableNetworkIds>);
+    protected constructor(network: Network<BSNeo3NetworkId>);
     abstract getNftsByAddress(params: GetNftsByAddressParams): Promise<NftsResponse>;
     abstract getNft(params: GetNftParam): Promise<NftResponse>;
     hasToken({ contractHash, address }: HasTokenParam): Promise<boolean>;

package/dist/flamingo-swap/FlamingoSwapControllerService.d.ts

@@ -1,11 +1,11 @@
 import { Account, Network, SwapControllerService, SwapControllerServiceEvents, SwapControllerServiceSwapToReceiveArgs, SwapControllerServiceSwapToUseArgs, Token } from '@cityofzion/blockchain-service';
 import TypedEmitter from 'typed-emitter';
-import { AvailableNetworkIds } from '../BSNeo3Helper';
-export declare class FlamingoSwapControllerService implements SwapControllerService<AvailableNetworkIds> {
+import { BSNeo3NetworkId } from '../BSNeo3Helper';
+export declare class FlamingoSwapControllerService implements SwapControllerService<BSNeo3NetworkId> {
     #private;
     eventEmitter: TypedEmitter<SwapControllerServiceEvents>;
-    constructor(network: Network<AvailableNetworkIds>);
-    buildSwapArgs(): SwapControllerServiceSwapToReceiveArgs<AvailableNetworkIds> | SwapControllerServiceSwapToUseArgs<AvailableNetworkIds>;
+    constructor(network: Network<BSNeo3NetworkId>);
+    buildSwapArgs(): SwapControllerServiceSwapToReceiveArgs<BSNeo3NetworkId> | SwapControllerServiceSwapToUseArgs<BSNeo3NetworkId>;
     setAccountToUse(account: Account | null): void;
     setAmountToUse(val: string | null): void;
     setAmountToReceive(val: string | null): void;

package/dist/flamingo-swap/FlamingoSwapHelper.d.ts

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { Network, Token } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from '../BSNeo3Helper';
+import { BSNeo3NetworkId } from '../BSNeo3Helper';
 type TGetSwapArgs = {
     amountToUse: string | null;
     amountToReceive: string | null;
@@ -9,7 +9,7 @@ type TGetSwapArgs = {
     reservesToUse: string;
     reservesToReceive: string;
     slippage: number;
-    network: Network<AvailableNetworkIds>;
+    network: Network<BSNeo3NetworkId>;
 };
 export type SwapScriptHashes = {
     flamingoSwapRouter: string;
@@ -28,8 +28,8 @@ export declare class FlamingoSwapHelper {
     static readonly BN_1000: BigNumber;
     static readonly FEE_RATE: BigNumber;
     static readonly GAS_PER_NEO = 0.001;
-    static getSwapScriptHashes(network: Network<AvailableNetworkIds>): SwapScriptHashes;
-    static getBneoToken(network: Network<AvailableNetworkIds>): Token;
+    static getSwapScriptHashes(network: Network<BSNeo3NetworkId>): SwapScriptHashes;
+    static getBneoToken(network: Network<BSNeo3NetworkId>): Token;
     static getSwapFields(params: TGetSwapArgs): {
         amountToReceiveToDisplay: string;
         amountToUseToDisplay: string;
@@ -39,7 +39,7 @@ export declare class FlamingoSwapHelper {
         minimumReceived: string | null;
         maximumSelling: string | null;
     };
-    static overrideToken(network: Network<AvailableNetworkIds>, token: Token): Token;
+    static overrideToken(network: Network<BSNeo3NetworkId>, token: Token): Token;
     private static createTradeData;
     private static overrideAmountInput;
     private static overrideAmountToDisplay;

package/dist/flamingo-swap/FlamingoSwapNeonDappKitInvocationBuilder.d.ts

@@ -1,13 +1,13 @@
 import { ContractInvocationMulti } from '@cityofzion/neon-dappkit-types';
 import { Network, SwapControllerServiceSwapToUseArgs, SwapControllerServiceSwapToReceiveArgs } from '@cityofzion/blockchain-service';
-import { AvailableNetworkIds } from '../BSNeo3Helper';
+import { BSNeo3NetworkId } from '../BSNeo3Helper';
 type GetReservesArgs = {
-    network: Network<AvailableNetworkIds>;
+    network: Network<BSNeo3NetworkId>;
     tokenToReceiveScriptHash: string;
     tokenToUseScriptHash: string;
 };
 export declare class FlamingoSwapNeonDappKitInvocationBuilder {
-    static swapInvocation(data: SwapControllerServiceSwapToReceiveArgs<AvailableNetworkIds> | SwapControllerServiceSwapToUseArgs<AvailableNetworkIds>): ContractInvocationMulti;
+    static swapInvocation(data: SwapControllerServiceSwapToReceiveArgs<BSNeo3NetworkId> | SwapControllerServiceSwapToUseArgs<BSNeo3NetworkId>): ContractInvocationMulti;
     static getReservesInvocation({ network, tokenToReceiveScriptHash, tokenToUseScriptHash, }: GetReservesArgs): ContractInvocationMulti;
     private static swapTokenToReceiveForTokenToUseInvocation;
     private static swapTokenToUseForTokenToReceiveInvocation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -19,7 +19,7 @@
     "@cityofzion/neon-dappkit": "0.4.1",
     "bignumber.js": "~9.1.2",
     "isomorphic-ws": "~5.0.0",
-    "@cityofzion/blockchain-service": "1.0.1",
+    "@cityofzion/blockchain-service": "1.1.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {