@cityofzion/bs-neo3 1.0.4 → 1.1.0

package/dist/BSNeo3.js

@@ -38,7 +38,7 @@ class BSNeo3 {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;
         this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
-        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network, this.tokens);
+        this.exchangeDataService = new FlamingoEDSNeo3_1.FlamingoEDSNeo3(network);
         this.nftDataService = new GhostMarketNDSNeo3_1.GhostMarketNDSNeo3(network);
         this.explorerService = new DoraESNeo3_1.DoraESNeo3(network);
     }

package/dist/DoraBDSNeo3.js

@@ -28,7 +28,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
                 return yield _super.getTransaction.call(this, hash);
             }
             try {
@@ -54,7 +54,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
             getTransactionsByAddress: { get: () => super.getTransactionsByAddress }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+            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);
@@ -124,7 +124,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
         });
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
                 return yield _super.getContract.call(this, contractHash);
             }
             try {
@@ -145,7 +145,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
             getTokenInfo: { get: () => super.getTokenInfo }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
                 return yield _super.getTokenInfo.call(this, tokenHash);
             }
             const localToken = this._tokens.find(token => token.hash === tokenHash);
@@ -175,7 +175,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
             getBalance: { get: () => super.getBalance }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
+            if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(this._network)) {
                 return yield _super.getBalance.call(this, address);
             }
             const response = yield NeoRest.balance(address, this._network.id);

package/dist/DoraESNeo3.js

@@ -20,17 +20,17 @@ class DoraESNeo3 {
         __classPrivateFieldSet(this, _DoraESNeo3_network, network, "f");
     }
     buildTransactionUrl(hash) {
-        if (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        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 (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        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 (!BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        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}`;
     }

package/dist/FlamingoEDSNeo3.d.ts

@@ -1,9 +1,8 @@
-import { CryptoCompareEDS, Currency, ExchangeDataService, GetTokenPriceHistory, Network, Token, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
+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(network: Network<BSNeo3NetworkId>, 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

@@ -29,27 +29,29 @@ 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(network, tokens) {
-        super(tokens);
+    constructor(network) {
+        super();
         _FlamingoEDSNeo3_network.set(this, void 0);
         _FlamingoEDSNeo3_axiosInstance.set(this, void 0);
         __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 (!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) {
@@ -62,12 +64,6 @@ class FlamingoEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
             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_network = new WeakMap(), _FlamingoEDSNeo3_axiosInstance = new WeakMap();

package/package.json

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