@cityofzion/bs-neo3 1.10.9 → 1.11.0

package/dist/helpers/BSNeo3Helper.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeo3Helper = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const native_json_1 = __importDefault(require("../assets/tokens/native.json"));
 const BSNeo3Constants_1 = require("../constants/BSNeo3Constants");
 class BSNeo3Helper {
@@ -23,7 +24,7 @@ class BSNeo3Helper {
         return !BSNeo3Constants_1.BSNeo3Constants.ALL_NETWORK_IDS.includes(network.id);
     }
     static normalizeHash(hash) {
-        return hash.startsWith('0x') ? hash.slice(2) : hash;
+        return (0, blockchain_service_1.normalizeHash)(hash, { lowercase: false });
     }
 }
 exports.BSNeo3Helper = BSNeo3Helper;

package/dist/services/exchange-data/FlamingoForthewinEDSNeo3.d.ts

@@ -1,8 +1,8 @@
-import { CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
+import { ExchangeDataService, FlamingoForthewinEDS, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
 import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
-export declare class FlamingoForthewinEDSNeo3 extends CryptoCompareEDS implements ExchangeDataService {
+export declare class FlamingoForthewinEDSNeo3 extends FlamingoForthewinEDS implements ExchangeDataService {
     #private;
     constructor(network: Network<BSNeo3NetworkId>);
-    getTokenPrices({ tokens }: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
+    getTokenPrices(params: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
     getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
 }

package/dist/services/exchange-data/FlamingoForthewinEDSNeo3.js

@@ -19,60 +19,25 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _FlamingoForthewinEDSNeo3_network, _FlamingoForthewinEDSNeo3_flamingoAxiosInstance, _FlamingoForthewinEDSNeo3_forthewinAxiosInstance;
+var _FlamingoForthewinEDSNeo3_network;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlamingoForthewinEDSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const axios_1 = __importDefault(require("axios"));
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
-class FlamingoForthewinEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
+class FlamingoForthewinEDSNeo3 extends blockchain_service_1.FlamingoForthewinEDS {
     constructor(network) {
         super();
         _FlamingoForthewinEDSNeo3_network.set(this, void 0);
-        _FlamingoForthewinEDSNeo3_flamingoAxiosInstance.set(this, void 0);
-        _FlamingoForthewinEDSNeo3_forthewinAxiosInstance.set(this, void 0);
         __classPrivateFieldSet(this, _FlamingoForthewinEDSNeo3_network, network, "f");
-        __classPrivateFieldSet(this, _FlamingoForthewinEDSNeo3_flamingoAxiosInstance, axios_1.default.create({ baseURL: 'https://neo-api.b-cdn.net/flamingo' }), "f");
-        __classPrivateFieldSet(this, _FlamingoForthewinEDSNeo3_forthewinAxiosInstance, axios_1.default.create({ baseURL: 'https://api.forthewin.network' }), "f");
     }
-    getTokenPrices({ tokens }) {
-        var _a, _b;
+    getTokenPrices(params) {
+        const _super = Object.create(null, {
+            getTokenPrices: { get: () => super.getTokenPrices }
+        });
         return __awaiter(this, void 0, void 0, function* () {
             if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_network, "f")))
                 throw new Error('Exchange is only available on Mainnet');
-            const { data: flamingoData } = yield __classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_flamingoAxiosInstance, "f").get('/live-data/prices/latest');
-            const prices = [];
-            const allTokens = BSNeo3Helper_1.BSNeo3Helper.getTokens(__classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_network, "f"));
-            const neoToken = tokens.find(({ symbol }) => symbol === 'NEO');
-            const bNeoTokenHash = BSNeo3Helper_1.BSNeo3Helper.normalizeHash((_b = (_a = allTokens.find(({ symbol }) => symbol === 'bNEO')) === null || _a === void 0 ? void 0 : _a.hash) !== null && _b !== void 0 ? _b : '');
-            if (neoToken)
-                flamingoData.forEach(item => {
-                    if (bNeoTokenHash === BSNeo3Helper_1.BSNeo3Helper.normalizeHash(item.hash))
-                        flamingoData.push(Object.assign(Object.assign({}, item), { symbol: neoToken.symbol, hash: neoToken.hash }));
-                });
-            flamingoData.forEach(item => {
-                const token = tokens.find(({ hash }) => BSNeo3Helper_1.BSNeo3Helper.normalizeHash(hash) === BSNeo3Helper_1.BSNeo3Helper.normalizeHash(item.hash));
-                if (!token)
-                    return;
-                prices.push({ usdPrice: item.usd_price, token });
-            });
-            if (tokens.length > prices.length) {
-                const { data: forthewinData } = yield __classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_forthewinAxiosInstance, "f").get('/mainnet/prices');
-                Object.entries(forthewinData).forEach(([hash, usdPrice]) => {
-                    hash = BSNeo3Helper_1.BSNeo3Helper.normalizeHash(hash);
-                    const hasPrice = !!prices.find(({ token }) => BSNeo3Helper_1.BSNeo3Helper.normalizeHash(token.hash) === hash);
-                    if (hasPrice)
-                        return;
-                    const foundToken = tokens.find(token => BSNeo3Helper_1.BSNeo3Helper.normalizeHash(token.hash) === hash);
-                    if (!foundToken)
-                        return;
-                    prices.push({ usdPrice, token: foundToken });
-                });
-            }
-            return prices;
+            return yield _super.getTokenPrices.call(this, params);
         });
     }
     getTokenPriceHistory(params) {
@@ -81,10 +46,10 @@ class FlamingoForthewinEDSNeo3 extends blockchain_service_1.CryptoCompareEDS {
         });
         return __awaiter(this, void 0, void 0, function* () {
             if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_network, "f")))
-                throw new Error('Exchange is only available on mainnet');
+                throw new Error('Exchange is only available on Mainnet');
             return yield _super.getTokenPriceHistory.call(this, params);
         });
     }
 }
 exports.FlamingoForthewinEDSNeo3 = FlamingoForthewinEDSNeo3;
-_FlamingoForthewinEDSNeo3_network = new WeakMap(), _FlamingoForthewinEDSNeo3_flamingoAxiosInstance = new WeakMap(), _FlamingoForthewinEDSNeo3_forthewinAxiosInstance = new WeakMap();
+_FlamingoForthewinEDSNeo3_network = new WeakMap();

package/dist/services/ledger/NeonDappKitLedgerServiceNeo3.d.ts

@@ -7,6 +7,7 @@ export declare class NeonDappKitLedgerServiceNeo3<BSName extends string = string
     emitter: LedgerServiceEmitter;
     getLedgerTransport?: GetLedgerTransport<BSName>;
     constructor(blockchainService: BSNeo3<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
+    verifyAppName(transport: Transport): Promise<boolean>;
     getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
     getAccounts(transport: Transport, untilIndexByBlockchainService?: UntilIndexRecord<BSName>): Promise<Account<BSName>[]>;
     getSigningCallback(transport: Transport, account: Account): api.SigningFunction;

package/dist/services/ledger/NeonDappKitLedgerServiceNeo3.js

@@ -35,6 +35,7 @@ var LedgerStatus;
 })(LedgerStatus || (LedgerStatus = {}));
 var LedgerCommand;
 (function (LedgerCommand) {
+    LedgerCommand[LedgerCommand["GET_APP_NAME"] = 0] = "GET_APP_NAME";
     LedgerCommand[LedgerCommand["GET_PUBLIC_KEY"] = 4] = "GET_PUBLIC_KEY";
     LedgerCommand[LedgerCommand["SIGN"] = 2] = "SIGN";
 })(LedgerCommand || (LedgerCommand = {}));
@@ -51,10 +52,29 @@ class NeonDappKitLedgerServiceNeo3 {
         __classPrivateFieldSet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, blockchainService, "f");
         this.getLedgerTransport = getLedgerTransport;
     }
+    // This verification is necessary because the NEO2 Ledger App also detects NEO3
+    verifyAppName(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_APP_NAME, 0x00, LedgerSecondParameter.LAST_DATA, undefined);
+                const version = response.toString('ascii');
+                const appName = version.substring(0, version.length - 2);
+                if (appName !== 'NEO N3')
+                    return false;
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
+    }
     getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const bip44Path = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
             const bip44PathHex = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_bip44PathToHex).call(this, bip44Path);
+            const isNeoN3App = yield this.verifyAppName(transport);
+            if (!isNeoN3App)
+                throw new Error('App is not NEO N3');
             const result = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_PUBLIC_KEY, 0x00, LedgerSecondParameter.LAST_DATA, bip44PathHex);
             const publicKey = result.toString('hex').substring(0, 130);
             const { address } = new neon_js_1.wallet.Account(publicKey);
@@ -79,6 +99,9 @@ class NeonDappKitLedgerServiceNeo3 {
     }
     getSigningCallback(transport, account) {
         return (transaction, { witnessIndex, network }) => __awaiter(this, void 0, void 0, function* () {
+            const isNeoN3App = yield this.verifyAppName(transport);
+            if (!isNeoN3App)
+                throw new Error('App is not NEO N3');
             try {
                 this.emitter.emit('getSignatureStart');
                 if (!account.bip44Path) {
@@ -120,7 +143,9 @@ class NeonDappKitLedgerServiceNeo3 {
 }
 exports.NeonDappKitLedgerServiceNeo3 = NeonDappKitLedgerServiceNeo3;
 _NeonDappKitLedgerServiceNeo3_blockchainService = new WeakMap(), _NeonDappKitLedgerServiceNeo3_instances = new WeakSet(), _NeonDappKitLedgerServiceNeo3_sendChunk = function _NeonDappKitLedgerServiceNeo3_sendChunk(transport, command, commandIndex, secondParameter, chunk) {
-    return transport.send(0x80, command, commandIndex, secondParameter, Buffer.from(chunk, 'hex'), [LedgerStatus.OK]);
+    return transport.send(0x80, command, commandIndex, secondParameter, chunk ? Buffer.from(chunk, 'hex') : undefined, [
+        LedgerStatus.OK,
+    ]);
 }, _NeonDappKitLedgerServiceNeo3_bip44PathToHex = function _NeonDappKitLedgerServiceNeo3_bip44PathToHex(path) {
     let result = '';
     const components = path.split('/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.10.9",
+  "version": "1.11.0",
   "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.16.3",
+    "@cityofzion/blockchain-service": "1.17.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {