@cityofzion/bs-neo3 0.14.3 → 1.0.0

package/dist/BSNeo3.d.ts

@@ -1,7 +1,8 @@
-import { BlockchainDataService, BlockchainService, BSClaimable, Account, ExchangeDataService, BDSClaimable, Token, BSWithNameService, Network, PartialBy, TransferParam, BSCalculableFee, NftDataService, BSWithNft, AccountWithDerivationPath, BSWithExplorerService, ExplorerService, BSWithLedger } from '@cityofzion/blockchain-service';
+import { BlockchainDataService, BlockchainService, BSClaimable, Account, ExchangeDataService, BDSClaimable, Token, BSWithNameService, Network, TransferParam, BSCalculableFee, NftDataService, BSWithNft, AccountWithDerivationPath, BSWithExplorerService, ExplorerService, BSWithLedger, PartialNetwork } from '@cityofzion/blockchain-service';
+import { AvailableNetworkIds } from './constants';
 import { LedgerServiceNeo3 } from './LedgerServiceNeo3';
 import Transport from '@ledgerhq/hw-transport';
-export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger {
+export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService<BSCustomName, AvailableNetworkIds>, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger {
     readonly blockchainName: BSCustomName;
     readonly feeToken: Token;
     readonly claimToken: Token;
@@ -13,9 +14,9 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     exchangeDataService: ExchangeDataService;
     explorerService: ExplorerService;
     tokens: Token[];
-    network: Network;
-    constructor(blockchainName: BSCustomName, network: PartialBy<Network, 'url'>, getLedgerTransport?: (account: Account) => Promise<Transport>);
-    setNetwork(param: PartialBy<Network, 'url'>): void;
+    network: Network<AvailableNetworkIds>;
+    constructor(blockchainName: BSCustomName, network: PartialNetwork<AvailableNetworkIds>, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    setNetwork(partialNetwork: PartialNetwork<AvailableNetworkIds>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(encryptedKey: string): boolean;
     validateKey(key: string): boolean;

package/dist/BSNeo3.js

@@ -24,29 +24,30 @@ class BSNeo3 {
     constructor(blockchainName, network, getLedgerTransport) {
         this.blockchainName = blockchainName;
         this.ledgerService = new LedgerServiceNeo3_1.LedgerServiceNeo3(getLedgerTransport);
-        this.tokens = constants_1.TOKENS[network.type];
+        this.tokens = constants_1.TOKENS[network.id];
         this.derivationPath = constants_1.DERIVATION_PATH;
         this.feeToken = this.tokens.find(token => token.symbol === 'GAS');
         this.burnToken = this.tokens.find(token => token.symbol === 'NEO');
         this.claimToken = this.tokens.find(token => token.symbol === 'GAS');
         this.setNetwork(network);
     }
-    setNetwork(param) {
-        var _a;
+    setNetwork(partialNetwork) {
+        var _a, _b;
         const network = {
-            type: param.type,
-            url: (_a = param.url) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_URL_BY_NETWORK_TYPE[param.type],
+            id: partialNetwork.id,
+            name: (_a = partialNetwork.name) !== null && _a !== void 0 ? _a : partialNetwork.id,
+            url: (_b = partialNetwork.url) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_URL_BY_NETWORK_TYPE[partialNetwork.id],
         };
         this.network = network;
-        if (network.type === 'custom') {
+        if (network.name === 'custom') {
             this.blockchainDataService = new RpcBDSNeo3_1.RPCBDSNeo3(network, this.feeToken, this.claimToken);
         }
         else {
             this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken);
         }
-        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network.type);
+        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network.id);
         this.nftDataService = new GhostMarketNDSNeo3_1.GhostMarketNDSNeo3(network);
-        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network.type);
+        this.explorerService = new DoraESNeo3_1.DoraESNeo3(network.id);
     }
     validateAddress(address) {
         return neon_js_1.wallet.isAddress(address, 53);

package/dist/DoraBDSNeo3.d.ts

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

package/dist/DoraBDSNeo3.js

@@ -20,7 +20,7 @@ const NeoRest = new api_1.NeoRESTApi({
 });
 class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     constructor(network, feeToken, claimToken) {
-        if (network.type === 'custom') {
+        if (network.id === 'custom') {
             throw new Error('DoraBDSNeo3 does not support custom networks');
         }
         super(network, feeToken, claimToken);
@@ -29,7 +29,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const data = yield NeoRest.transaction(hash, this._network.type);
+                const data = yield NeoRest.transaction(hash, this._network.id);
                 return {
                     block: data.block,
                     time: Number(data.time),
@@ -48,7 +48,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     }
     getTransactionsByAddress({ address, page = 1, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield NeoRest.addressTXFull(address, page, this._network.type);
+            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;
                 const transferPromises = [];
@@ -113,7 +113,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const data = yield NeoRest.contract(contractHash, this._network.type);
+                const data = yield NeoRest.contract(contractHash, this._network.id);
                 return {
                     hash: data.hash,
                     methods: (_b = (_a = data.manifest.abi) === null || _a === void 0 ? void 0 : _a.methods) !== null && _b !== void 0 ? _b : [],
@@ -127,14 +127,14 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     }
     getTokenInfo(tokenHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const localToken = constants_1.TOKENS[this._network.type].find(token => token.hash === tokenHash);
+            const localToken = constants_1.TOKENS[this._network.id].find(token => token.hash === tokenHash);
             if (localToken)
                 return localToken;
             if (this._tokenCache.has(tokenHash)) {
                 return this._tokenCache.get(tokenHash);
             }
             try {
-                const { decimals, symbol, name, scripthash } = yield NeoRest.asset(tokenHash, this._network.type);
+                const { decimals, symbol, name, scripthash } = yield NeoRest.asset(tokenHash, this._network.id);
                 const token = {
                     decimals: Number(decimals),
                     symbol,
@@ -151,7 +151,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     }
     getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield NeoRest.balance(address, this._network.type);
+            const response = yield NeoRest.balance(address, this._network.id);
             const promises = response.map((balance) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const token = yield this.getTokenInfo(balance.asset);

package/dist/DoraESNeo3.d.ts

@@ -1,7 +1,8 @@
-import { ExplorerService, NetworkType, BuildNftUrlParams } from '@cityofzion/blockchain-service';
+import { ExplorerService, BuildNftUrlParams } from '@cityofzion/blockchain-service';
+import { AvailableNetworkIds } from './constants';
 export declare class DoraESNeo3 implements ExplorerService {
     #private;
-    constructor(networkType: NetworkType);
+    constructor(networkType: AvailableNetworkIds);
     buildTransactionUrl(hash: string): string;
     buildNftUrl({ contractHash, tokenId }: BuildNftUrlParams): string;
 }

package/dist/DoraESNeo3.js

@@ -10,24 +10,24 @@ 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_networkType;
+var _DoraESNeo3_networkId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraESNeo3 = void 0;
 class DoraESNeo3 {
     constructor(networkType) {
-        _DoraESNeo3_networkType.set(this, void 0);
-        __classPrivateFieldSet(this, _DoraESNeo3_networkType, networkType, "f");
+        _DoraESNeo3_networkId.set(this, void 0);
+        __classPrivateFieldSet(this, _DoraESNeo3_networkId, networkType, "f");
     }
     buildTransactionUrl(hash) {
-        if (__classPrivateFieldGet(this, _DoraESNeo3_networkType, "f") === 'custom')
+        if (__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f") === 'custom')
             throw new Error('DoraESNeo3 does not support custom network');
-        return `https://dora.coz.io/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkType, "f")}/${hash}`;
+        return `https://dora.coz.io/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")}/${hash}`;
     }
     buildNftUrl({ contractHash, tokenId }) {
-        if (__classPrivateFieldGet(this, _DoraESNeo3_networkType, "f") === 'custom')
+        if (__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f") === 'custom')
             throw new Error('DoraESNeo3 does not support custom network');
-        return `https://dora.coz.io/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkType, "f")}/${contractHash}/${tokenId}`;
+        return `https://dora.coz.io/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_networkId, "f")}/${contractHash}/${tokenId}`;
     }
 }
 exports.DoraESNeo3 = DoraESNeo3;
-_DoraESNeo3_networkType = new WeakMap();
+_DoraESNeo3_networkId = new WeakMap();

package/dist/FlamingoEDSNeo3.d.ts

@@ -1,7 +1,9 @@
-import { CryptoCompareEDS, Currency, ExchangeDataService, NetworkType, TokenPricesResponse } from '@cityofzion/blockchain-service';
+import { CryptoCompareEDS, Currency, ExchangeDataService, GetTokenPriceHistory, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
+import { AvailableNetworkIds } from './constants';
 export declare class FlamingoEDSNeo3 extends CryptoCompareEDS implements ExchangeDataService {
     #private;
-    constructor(networkType: NetworkType);
+    constructor(networkId: AvailableNetworkIds);
     getTokenPrices(currency: Currency): Promise<TokenPricesResponse[]>;
+    getTokenPriceHistory(params: GetTokenPriceHistory): Promise<TokenPricesHistoryResponse[]>;
     private getCurrencyRatio;
 }

package/dist/FlamingoEDSNeo3.js

@@ -22,23 +22,23 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _FlamingoEDSNeo3_networkType, _FlamingoEDSNeo3_axiosInstance;
+var _FlamingoEDSNeo3_networkId, _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 constants_1 = require("./constants");
 class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
-    constructor(networkType) {
-        super(networkType, constants_1.TOKENS[networkType]);
-        _FlamingoEDSNeo3_networkType.set(this, void 0);
+    constructor(networkId) {
+        super(constants_1.TOKENS[networkId]);
+        _FlamingoEDSNeo3_networkId.set(this, void 0);
         _FlamingoEDSNeo3_axiosInstance.set(this, void 0);
-        __classPrivateFieldSet(this, _FlamingoEDSNeo3_networkType, networkType, "f");
+        __classPrivateFieldSet(this, _FlamingoEDSNeo3_networkId, networkId, "f");
         __classPrivateFieldSet(this, _FlamingoEDSNeo3_axiosInstance, axios_1.default.create({ baseURL: 'https://api.flamingo.finance' }), "f");
     }
     getTokenPrices(currency) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _FlamingoEDSNeo3_networkType, "f") !== 'mainnet')
+            if (__classPrivateFieldGet(this, _FlamingoEDSNeo3_networkId, "f") !== 'mainnet')
                 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;
@@ -52,6 +52,11 @@ class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
             }));
         });
     }
+    getTokenPriceHistory(params) {
+        if (__classPrivateFieldGet(this, _FlamingoEDSNeo3_networkId, "f") !== 'mainnet')
+            throw new Error('Exchange is only available on mainnet');
+        return super.getTokenPriceHistory(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}`);
@@ -60,4 +65,4 @@ class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
     }
 }
 exports.FlamingoEDSNeo3 = FlamingoEDSNeo3;
-_FlamingoEDSNeo3_networkType = new WeakMap(), _FlamingoEDSNeo3_axiosInstance = new WeakMap();
+_FlamingoEDSNeo3_networkId = new WeakMap(), _FlamingoEDSNeo3_axiosInstance = new WeakMap();

package/dist/GhostMarketNDSNeo3.d.ts

@@ -1,8 +1,9 @@
 import { NftResponse, NftsResponse, GetNftParam, GetNftsByAddressParams, Network } from '@cityofzion/blockchain-service';
+import { AvailableNetworkIds } from './constants';
 import { RpcNDSNeo3 } from './RpcNDSNeo3';
 export declare class GhostMarketNDSNeo3 extends RpcNDSNeo3 {
     #private;
-    constructor(network: Network);
+    constructor(network: Network<AvailableNetworkIds>);
     getNftsByAddress({ address, size, cursor }: GetNftsByAddressParams): Promise<NftsResponse>;
     getNft({ contractHash, tokenId }: GetNftParam): Promise<NftResponse>;
     private treatGhostMarketImage;

package/dist/GhostMarketNDSNeo3.js

@@ -22,7 +22,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _GhostMarketNDSNeo3_networkType;
+var _GhostMarketNDSNeo3_networkId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GhostMarketNDSNeo3 = void 0;
 const query_string_1 = __importDefault(require("query-string"));
@@ -32,8 +32,8 @@ const RpcNDSNeo3_1 = require("./RpcNDSNeo3");
 class GhostMarketNDSNeo3 extends RpcNDSNeo3_1.RpcNDSNeo3 {
     constructor(network) {
         super(network);
-        _GhostMarketNDSNeo3_networkType.set(this, void 0);
-        __classPrivateFieldSet(this, _GhostMarketNDSNeo3_networkType, network.type, "f");
+        _GhostMarketNDSNeo3_networkId.set(this, void 0);
+        __classPrivateFieldSet(this, _GhostMarketNDSNeo3_networkId, network.id, "f");
     }
     getNftsByAddress({ address, size = 18, cursor }) {
         var _a;
@@ -69,8 +69,8 @@ class GhostMarketNDSNeo3 extends RpcNDSNeo3_1.RpcNDSNeo3 {
         return srcImage;
     }
     getUrlWithParams(params) {
-        const parameters = query_string_1.default.stringify(Object.assign({ chain: constants_1.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSNeo3_networkType, "f")] }, params), { arrayFormat: 'bracket' });
-        return `${constants_1.GHOSTMARKET_URL_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSNeo3_networkType, "f")]}/assets?${parameters}`;
+        const parameters = query_string_1.default.stringify(Object.assign({ chain: constants_1.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSNeo3_networkId, "f")] }, params), { arrayFormat: 'bracket' });
+        return `${constants_1.GHOSTMARKET_URL_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSNeo3_networkId, "f")]}/assets?${parameters}`;
     }
     parse(data) {
         var _a, _b;
@@ -92,4 +92,4 @@ class GhostMarketNDSNeo3 extends RpcNDSNeo3_1.RpcNDSNeo3 {
     }
 }
 exports.GhostMarketNDSNeo3 = GhostMarketNDSNeo3;
-_GhostMarketNDSNeo3_networkType = new WeakMap();
+_GhostMarketNDSNeo3_networkId = new WeakMap();

package/dist/RpcBDSNeo3.d.ts

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

package/dist/RpcBDSNeo3.js

@@ -73,7 +73,7 @@ class RPCBDSNeo3 {
     }
     getTokenInfo(tokenHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const localToken = constants_1.TOKENS[this._network.type].find(token => token.hash === tokenHash);
+            const localToken = constants_1.TOKENS[this._network.id].find(token => token.hash === tokenHash);
             if (localToken)
                 return localToken;
             if (this._tokenCache.has(tokenHash)) {
@@ -158,7 +158,7 @@ class RPCBDSNeo3 {
     getRpcList() {
         return __awaiter(this, void 0, void 0, function* () {
             const list = [];
-            const promises = constants_1.RPC_LIST_BY_NETWORK_TYPE[this._network.type].map(url => {
+            const promises = constants_1.RPC_LIST_BY_NETWORK_TYPE[this._network.id].map(url => {
                 // eslint-disable-next-line no-async-promise-executor
                 return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                     const timeout = setTimeout(() => {

package/dist/assets/tokens/common.json

@@ -1,13 +1,13 @@
 [
     {
         "symbol": "GAS",
-        "name": "GASToken",
+        "name": "GAS",
         "hash": "d2a4cff31913016155e38e474a2c06d08be276cf",
         "decimals": 8
     },
     {
         "symbol": "NEO",
-        "name": "NeoToken",
+        "name": "NEO",
         "hash": "ef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
         "decimals": 0
     }

package/dist/constants.d.ts

@@ -1,13 +1,14 @@
-import { NetworkType, Token } from '@cityofzion/blockchain-service';
-export declare const TOKENS: Record<NetworkType, Token[]>;
+import { Token } from '@cityofzion/blockchain-service';
+export type AvailableNetworkIds = 'mainnet' | 'testnet' | 'custom';
+export declare const TOKENS: Record<AvailableNetworkIds, Token[]>;
 export declare const BLOCKCHAIN_WSS_URL = "wss://rpc10.n3.nspcc.ru:10331/ws";
 export declare const NEO_NS_HASH = "0x50ac1c37690cc2cfc594472833cf57505d5f46de";
 export declare const GAS_PER_NEO = 0.001;
-export declare const GHOSTMARKET_URL_BY_NETWORK_TYPE: Partial<Record<NetworkType, string>>;
-export declare const GHOSTMARKET_CHAIN_BY_NETWORK_TYPE: Partial<Record<NetworkType, string>>;
+export declare const GHOSTMARKET_URL_BY_NETWORK_TYPE: Partial<Record<AvailableNetworkIds, string>>;
+export declare const GHOSTMARKET_CHAIN_BY_NETWORK_TYPE: Partial<Record<AvailableNetworkIds, string>>;
 export declare const DERIVATION_PATH = "m/44'/888'/0'/0/?";
-export declare const RPC_LIST_BY_NETWORK_TYPE: Record<NetworkType, string[]>;
-export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<NetworkType, string>;
+export declare const RPC_LIST_BY_NETWORK_TYPE: Record<AvailableNetworkIds, string[]>;
+export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<AvailableNetworkIds, string>;
 export type SwapScriptHashes = {
     flamingoSwapRouter: string;
     flamingoPairWhiteList: string;
@@ -17,4 +18,4 @@ export type SwapScriptHashes = {
     bneo: string;
     flpBneoGas: string;
 };
-export declare const SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE: Partial<Record<NetworkType, SwapScriptHashes>>;
+export declare const SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE: Partial<Record<AvailableNetworkIds, SwapScriptHashes>>;

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

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

package/dist/flamingo-swap/FlamingoSwapControllerService.js

@@ -52,7 +52,7 @@ class FlamingoSwapControllerService {
         _FlamingoSwapControllerService_liquidityProviderFee.set(this, null);
         _FlamingoSwapControllerService_routes.set(this, null);
         _FlamingoSwapControllerService_lastAmountChange.set(this, null);
-        if (network.type === 'custom')
+        if (network.id === 'custom')
             throw new FlamingoSwapError_1.CustomNetworkNotSupportedError();
         __classPrivateFieldSet(this, _FlamingoSwapControllerService_network, network, "f");
         this.eventEmitter = new events_1.default();

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

@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { Network, Token } from '@cityofzion/blockchain-service';
+import { AvailableNetworkIds } from '../constants';
 type TGetSwapArgs = {
     amountToUse: string | null;
     amountToReceive: string | null;
@@ -8,7 +9,7 @@ type TGetSwapArgs = {
     reservesToUse: string;
     reservesToReceive: string;
     slippage: number;
-    network: Network;
+    network: Network<AvailableNetworkIds>;
 };
 export declare class FlamingoSwapHelper {
     static readonly BN_0: BigNumber;
@@ -25,7 +26,7 @@ export declare class FlamingoSwapHelper {
         minimumReceived: string | null;
         maximumSelling: string | null;
     };
-    static overrideToken(network: Network, token: Token): Token;
+    static overrideToken(network: Network<AvailableNetworkIds>, token: Token): Token;
     private static createTradeData;
     private static overrideAmountInput;
     private static overrideAmountToDisplay;

package/dist/flamingo-swap/FlamingoSwapHelper.js

@@ -78,12 +78,12 @@ class FlamingoSwapHelper {
         };
     }
     static overrideToken(network, token) {
-        const neoScriptHash = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type].neo;
+        const neoScriptHash = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id].neo;
         const isNeoToken = this.normalizeHash(token.hash) === this.normalizeHash(neoScriptHash);
         if (!isNeoToken) {
             return token;
         }
-        const bneoToken = constants_1.TOKENS[network.type].find(token => token.hash === constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type].bneo);
+        const bneoToken = constants_1.TOKENS[network.id].find(token => token.hash === constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id].bneo);
         if (!bneoToken)
             throw new Error('Bneo token not found');
         return bneoToken;

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

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

package/dist/flamingo-swap/FlamingoSwapNeonDappKitInvocationBuilder.js

@@ -11,7 +11,7 @@ class FlamingoSwapNeonDappKitInvocationBuilder {
             : this.swapTokenToUseForTokenToReceiveInvocation(data);
     }
     static getReservesInvocation({ network, tokenToReceiveScriptHash, tokenToUseScriptHash, }) {
-        const flamingoSwapRouter = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type].flamingoSwapRouter;
+        const flamingoSwapRouter = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id].flamingoSwapRouter;
         return {
             invocations: [
                 {
@@ -39,7 +39,7 @@ class FlamingoSwapNeonDappKitInvocationBuilder {
     static swapTokenToReceiveForTokenToUseInvocation({ address, amountToReceive, maximumSelling, tokenToReceive, tokenToUse, deadline, network, }) {
         const invocations = [];
         const allowedContracts = [];
-        const scriptHashes = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type];
+        const scriptHashes = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id];
         const tokenToReceiveOverrode = FlamingoSwapHelper_1.FlamingoSwapHelper.overrideToken(network, tokenToReceive);
         const amountToReceiveFormatted = neon_core_1.u.BigInteger.fromDecimal(Number(amountToReceive), tokenToReceiveOverrode.decimals).toString();
         const maximumSellingFormatted = neon_core_1.u.BigInteger.fromDecimal(Number(maximumSelling), tokenToUse.decimals).toString();
@@ -104,7 +104,7 @@ class FlamingoSwapNeonDappKitInvocationBuilder {
     static swapTokenToUseForTokenToReceiveInvocation({ address, amountToUse, deadline, tokenToReceive, tokenToUse, minimumReceived, network, }) {
         const invocations = [];
         const allowedContracts = [];
-        const scriptHashes = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type];
+        const scriptHashes = constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id];
         const isNeoSwapped = tokenToUse.hash === scriptHashes.neo;
         if (isNeoSwapped) {
             const transferContractInvocation = this.transferContractInvocation({
@@ -202,8 +202,8 @@ class FlamingoSwapNeonDappKitInvocationBuilder {
         return [scriptHashes.gas, scriptHashes.flpBneoGas, scriptHashes.bneo];
     }
     static overrideScriptHash(network, scriptHash) {
-        return scriptHash === constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type].neo
-            ? constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.type].bneo
+        return scriptHash === constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id].neo
+            ? constants_1.SWAP_SCRIPT_HASHES_BY_NETWORK_TYPE[network.id].bneo
             : scriptHash;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "0.14.3",
+  "version": "1.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -17,24 +17,24 @@
     "query-string": "7.1.3",
     "@ledgerhq/hw-transport": "~6.30.5",
     "@cityofzion/neon-dappkit": "0.4.1",
-    "@cityofzion/neon-dappkit-types": "~0.3.1",
     "bignumber.js": "~9.1.2",
-    "typed-emitter": "~2.1.0",
     "isomorphic-ws": "~5.0.0",
-    "@cityofzion/blockchain-service": "0.13.0",
+    "@cityofzion/blockchain-service": "1.0.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {
+    "@cityofzion/neon-dappkit-types": "~0.3.1",
+    "@ledgerhq/hw-transport-node-hid": "~6.28.5",
     "@types/jest": "29.5.3",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
-    "@ledgerhq/hw-transport-node-hid": "~6.28.5",
     "dotenv": "16.3.1",
     "eslint": "^8.48.0",
     "jest": "29.6.2",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
-    "typescript": "4.9.5"
+    "typescript": "4.9.5",
+    "typed-emitter": "~2.1.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",