From e0730d3f3acce8043f2d7e951659059d4768bbdd Mon Sep 17 00:00:00 2001 From: Sameer Kumar Subudhi Date: Thu, 26 Oct 2023 17:58:37 +0200 Subject: [PATCH 1/3] :bug: Fix getTransactionExecutionStatus --- services/blockchain-indexer/shared/utils/transactions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/blockchain-indexer/shared/utils/transactions.js b/services/blockchain-indexer/shared/utils/transactions.js index ba4a5fbea7..7355bbae25 100644 --- a/services/blockchain-indexer/shared/utils/transactions.js +++ b/services/blockchain-indexer/shared/utils/transactions.js @@ -14,7 +14,7 @@ * */ const { parseToJSONCompatObj } = require('./parser'); -const { TRANSACTION_STATUS, EVENT } = require('../constants'); +const { TRANSACTION_STATUS, EVENT, EVENT_TOPIC_PREFIX } = require('../constants'); const normalizeTransaction = async tx => { tx.moduleCommand = `${tx.module}:${tx.command}`; @@ -24,7 +24,9 @@ const normalizeTransaction = async tx => { const getTransactionExecutionStatus = (tx, events) => { const expectedEventName = `${tx.module}:${EVENT.COMMAND_EXECUTION_RESULT}`; const commandExecResultEvents = events.filter(e => `${e.module}:${e.name}` === expectedEventName); - const txExecResultEvent = commandExecResultEvents.find(e => e.topics.includes(tx.id)); + const txExecResultEvent = commandExecResultEvents.find( + e => e.topics.includes(EVENT_TOPIC_PREFIX.TX_ID.concat(tx.id)) || e.topics.includes(tx.id), + ); if (!txExecResultEvent) throw Error(`Event unavailable to determine execution status for transaction: ${tx.id}.`); From cf6f4666608aeb9259a4032520cf412a21ab6d29 Mon Sep 17 00:00:00 2001 From: Sameer Kumar Subudhi Date: Thu, 26 Oct 2023 17:59:04 +0200 Subject: [PATCH 2/3] :bug: Remove betanet support from app-registry --- services/blockchain-app-registry/config.js | 3 +-- services/blockchain-app-registry/shared/utils/regex.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/blockchain-app-registry/config.js b/services/blockchain-app-registry/config.js index 090e1bd969..1f0c7497b0 100644 --- a/services/blockchain-app-registry/config.js +++ b/services/blockchain-app-registry/config.js @@ -76,7 +76,7 @@ config.gitHub = { config.dataDir = `${__dirname}/data`; -config.supportedNetworks = ['mainnet', 'testnet', 'betanet', 'devnet']; +config.supportedNetworks = ['mainnet', 'testnet', 'devnet']; const DEFAULT_LISK_APPS = ['lisk_mainchain']; const DEFAULT_USER_APPS = String(process.env.DEFAULT_APPS).split(','); @@ -94,7 +94,6 @@ config.ALLOWED_FILE_EXTENSIONS = ['.png', '.svg']; config.CHAIN_ID_PREFIX_NETWORK_MAP = Object.freeze({ '00': 'mainnet', '01': 'testnet', - '02': 'betanet', '04': 'devnet', }); diff --git a/services/blockchain-app-registry/shared/utils/regex.js b/services/blockchain-app-registry/shared/utils/regex.js index ea387fd872..440f43ade4 100644 --- a/services/blockchain-app-registry/shared/utils/regex.js +++ b/services/blockchain-app-registry/shared/utils/regex.js @@ -29,7 +29,7 @@ * Removal or modification of this copyright notice is prohibited. * */ -const NETWORK = /^\b(?:mainnet|testnet|betanet|devnet|,)+\b$/; +const NETWORK = /^\b(?:mainnet|testnet|devnet|,)+\b$/; const MAINCHAIN_ID = /^[a-fA-F0-9]{2}000000$/; module.exports = { From f019cf39b9deed45df9ed6238803859d975721ca Mon Sep 17 00:00:00 2001 From: Sameer Kumar Subudhi Date: Thu, 26 Oct 2023 17:59:19 +0200 Subject: [PATCH 3/3] :bug: Add error handling in standardizeCurrencyConversionRates --- services/market/shared/market/sources/exchangeratesapi.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/market/shared/market/sources/exchangeratesapi.js b/services/market/shared/market/sources/exchangeratesapi.js index 3f9d111a37..78a62d6030 100644 --- a/services/market/shared/market/sources/exchangeratesapi.js +++ b/services/market/shared/market/sources/exchangeratesapi.js @@ -66,13 +66,14 @@ const fetchAllCurrencyConversionRates = async () => { }; const standardizeCurrencyConversionRates = rawConversionRates => { - const [transformedConversionRates] = Object.entries(rawConversionRates).map( - ([baseCur, conversionRates]) => + const [transformedConversionRates] = Object.entries(rawConversionRates) + .filter(([, conversionRates]) => !!conversionRates) + .map(([baseCur, conversionRates]) => Object.getOwnPropertyNames(conversionRates).map(targetCur => ({ symbol: `${baseCur}_${targetCur}`, price: conversionRates[targetCur], })), - ); + ); const standardizedConversionRates = Array.isArray(transformedConversionRates) ? transformedConversionRates.map(conversionRate => { const [from, to] = conversionRate.symbol.split('_');