Merge pull request #1899 from LiskHQ/1898-indexing-issues-against-the…

…-testnet Indexing issues against the testnet
LiskArchive · Oct 26, 2023 · 04d0de9 · 04d0de9
2 parents 8d4a2f8 + f019cf3
commit 04d0de9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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 = {

diff --git 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}.`);
 

diff --git 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('_');