Fix transaction history report

services/blockchain-connector/methods/token.js

@@ -22,7 +22,7 @@ const {
 	getTokenBalances,
 	getTokenInitializationFees,
 	tokenHasEscrowAccount,
-	getTokenBalanceAtGenesis,
+	getTokenBalancesAtGenesis,
 } = require('../shared/sdk');
 
 module.exports = [
@@ -86,8 +86,8 @@ module.exports = [
 		params: {},
 	},
 	{
-		name: 'getTokenBalanceAtGenesis',
-		controller: async ({ address }) => getTokenBalanceAtGenesis(address),
+		name: 'getTokenBalancesAtGenesis',
+		controller: async ({ address }) => getTokenBalancesAtGenesis(address),
 		params: {
 			address: { optional: false, type: 'string' },
 		},

services/blockchain-connector/shared/sdk/index.js

@@ -65,7 +65,7 @@ const {
 	getTotalSupply,
 	getTokenInitializationFees,
 	updateTokenInfo,
-	getTokenBalanceAtGenesis,
+	getTokenBalancesAtGenesis,
 } = require('./token');
 
 const {
@@ -188,7 +188,7 @@ module.exports = {
 	getSupportedTokens,
 	getTotalSupply,
 	getTokenInitializationFees,
-	getTokenBalanceAtGenesis,
+	getTokenBalancesAtGenesis,
 
 	// PoS
 	getAllPosValidators,

services/blockchain-connector/shared/sdk/token.js

@@ -75,7 +75,7 @@ const updateTokenInfo = async () => {
 	totalSupply = await getTotalSupply(true);
 };
 
-const getTokenBalanceAtGenesis = async address => {
+const getTokenBalancesAtGenesis = async address => {
 	const MODULE_TOKEN_SUBSTORE_USER = 'userSubstore';
 
 	const tokenModuleGenesisAssets = await getGenesisAssetByModule({
@@ -84,7 +84,7 @@ const getTokenBalanceAtGenesis = async address => {
 	});
 
 	const balancesAtGenesis = tokenModuleGenesisAssets[MODULE_TOKEN_SUBSTORE_USER];
-	const balancesByAddress = balancesAtGenesis.find(e => e.address === address);
+	const balancesByAddress = balancesAtGenesis.filter(e => e.address === address);
 
 	return balancesByAddress;
 };
@@ -99,5 +99,5 @@ module.exports = {
 	getTotalSupply,
 	getTokenInitializationFees,
 	updateTokenInfo,
-	getTokenBalanceAtGenesis,
+	getTokenBalancesAtGenesis,
 };

services/blockchain-indexer/shared/constants.js

@@ -180,6 +180,7 @@ const EVENT = Object.freeze({
 	UNLOCK: 'unlock',
 	COMMAND_EXECUTION_RESULT: 'commandExecutionResult',
 	REWARD_MINTED: 'rewardMinted',
+	REWARDS_ASSIGNED: 'rewardsAssigned',
 	CCM_SEND_SUCCESS: 'ccmSendSuccess',
 	CCM_SENT_FAILED: 'ccmSentFailed',
 });

services/blockchain-indexer/shared/indexer/utils/events.js

@@ -27,7 +27,13 @@ const {
 	},
 } = require('lisk-service-framework');
 
-const { getGenesisHeight, EVENT, EVENT_TOPIC_PREFIX, LENGTH_ID } = require('../../constants');
+const {
+	getGenesisHeight,
+	EVENT,
+	EVENT_TOPIC_PREFIX,
+	LENGTH_ID,
+	MODULE,
+} = require('../../constants');
 
 const config = require('../../../config');
 const eventsTableSchema = require('../../database/schema/events');
@@ -99,6 +105,15 @@ const getEventsInfoToIndex = (block, events) => {
 				eventsInfoToIndex.eventTopicsInfo.push(eventTopicAdditionalInfo);
 			}
 		});
+
+		// Add validator address as a topic for rewardsAssigned events, required for export microservice
+		if (event.module === MODULE.POS && event.name === EVENT.REWARDS_ASSIGNED) {
+			const eventTopicAdditionalInfo = {
+				eventID: event.id,
+				topic: event.data.validatorAddress,
+			};
+			eventsInfoToIndex.eventTopicsInfo.push(eventTopicAdditionalInfo);
+		}
 	});
 
 	return eventsInfoToIndex;

services/export/app.js

@@ -22,7 +22,7 @@ LoggerConfig(config.log);
 
 const packageJson = require('./package.json');
 const { setAppContext } = require('./shared/helpers');
-const { getTokenBalancesAtGenesis } = require('./shared/transactionsExport');
+const { getTokenBalancesAtGenesis } = require('./shared/helpers/account');
 
 const logger = Logger();
 

services/export/shared/excelFieldMappings.js

@@ -17,22 +17,16 @@ const transactionMappings = [
 	{ header: 'Date', key: 'date' },
 	{ header: 'Time', key: 'time' },
 	{ header: 'Block Height', key: 'blockHeight' },
-	{ header: 'Block Reward', key: 'blockReward' },
-	{ header: 'Block Reward Token ID', key: 'rewardTokenID' },
 	{ header: 'Transaction ID', key: 'transactionID' },
 	{ header: 'Module:Command', key: 'moduleCommand' },
 	{ header: 'Transaction Fee', key: 'fee' },
 	{ header: 'Transaction Fee Token ID', key: 'txFeeTokenID' },
 	{ header: 'Amount', key: 'amount' },
 	{ header: 'Amount Token ID', key: 'amountTokenID' },
-	{ header: 'Message Fee', key: 'messageFee' },
-	{ header: 'Message Fee Token ID', key: 'messageFeeTokenID' },
 	{ header: 'Sender Address', key: 'senderAddress' },
 	{ header: 'Sender Public Key', key: 'senderPublicKey' },
 	{ header: 'Recipient Address', key: 'recipientAddress' },
 	{ header: 'Recipient Public Key', key: 'recipientPublicKey' },
-	{ header: 'Reward Amount', key: 'rewardAmount' },
-	{ header: 'Reward Token ID', key: 'rewardTokenID' },
 	{ header: 'Note', key: 'note' },
 	{ header: 'Sending Chain ID', key: 'sendingChainID' },
 	{ header: 'Receiving Chain ID', key: 'receivingChainID' },
@@ -41,8 +35,9 @@ const transactionMappings = [
 const metadataMappings = [
 	{ header: 'Chain ID', key: 'chainID' },
 	{ header: 'Chain Name', key: 'chainName' },
-	{ header: 'Opening Balance', key: 'openingBalance' },
 	{ header: 'Note', key: 'note' },
+	{ header: 'Opening Balance Amount', key: 'openingBalanceAmount' },
+	{ header: 'Token ID', key: 'tokenID' },
 ];
 
 module.exports = {

services/export/shared/helpers/account.js

@@ -13,13 +13,24 @@
  * Removal or modification of this copyright notice is prohibited.
  *
  */
+const { Logger, CacheLRU } = require('lisk-service-framework');
 const {
 	utils: { hash },
 	address: { getLisk32AddressFromPublicKey: getLisk32AddressFromPublicKeyHelper },
 	legacyAddress: { getFirstEightBytesReversed },
 } = require('@liskhq/lisk-cryptography');
 
 const { PUBLIC_KEY, ADDRESS_LISK32 } = require('../regex');
+const { requestAllCustom } = require('./requestAll');
+const { MODULE, MODULE_SUB_STORE } = require('./constants');
+const { requestConnector, requestIndexer } = require('./request');
+
+const logger = Logger();
+
+const publicKeyCache = CacheLRU('publicKey', { max: 100000 });
+
+let tokenModuleData;
+let loadingAssets = false;
 
 const validateLisk32Address = address =>
 	typeof address === 'string' && ADDRESS_LISK32.test(address);
@@ -32,9 +43,107 @@ const getLisk32AddressFromPublicKey = publicKey =>
 const getLegacyAddress = publicKey =>
 	getFirstEightBytesReversed(hash(Buffer.from(publicKey, 'hex'))).toString('hex');
 
+const getAddressFromParams = params =>
+	params.address || getLisk32AddressFromPublicKey(params.publicKey);
+
+const checkIfAccountExists = async address => {
+	const response = await requestIndexer('token.account.exists', { address });
+	const { isExists } = response.data;
+	return isExists;
+};
+
+const checkIfAccountHasTransactions = async address => {
+	// Using getTransactions from chain.js introduces cyclic dependency
+	const response = await requestIndexer('transactions', { address, limit: 1 });
+	return !!response.data.length;
+};
+
+const checkIfAccountIsValidator = async address => {
+	const response = await requestIndexer('pos.validators', { address, sort: 'commission:asc' });
+	return !!response.data.length;
+};
+
+const getTokenBalancesAtGenesis = async () => {
+	if (!tokenModuleData && !loadingAssets) {
+		loadingAssets = true; // loadingAssets avoids repeated invocations
+
+		// Asynchronously fetch the token module genesis assets and cache locally
+		logger.info('Attempting to fetch and cache the token module genesis assets.');
+		requestConnector('getGenesisAssetsLength', {
+			module: MODULE.TOKEN,
+			subStore: MODULE_SUB_STORE.TOKEN.USER,
+		})
+			.then(async genesisBlockAssetsLength => {
+				const totalUsers = genesisBlockAssetsLength[MODULE.TOKEN][MODULE_SUB_STORE.TOKEN.USER];
+
+				const response = await requestAllCustom(
+					requestConnector,
+					'getGenesisAssetByModule',
+					{ module: MODULE.TOKEN, subStore: MODULE_SUB_STORE.TOKEN.USER, limit: 1000 },
+					totalUsers,
+				);
+
+				tokenModuleData = response[MODULE_SUB_STORE.TOKEN.USER];
+				loadingAssets = false;
+				logger.info('Successfully cached token module genesis assets.');
+			})
+			.catch(err => {
+				logger.warn(
+					`Failed to fetch token module genesis assets. Will retry later.\nError: ${err.message}`,
+				);
+				logger.debug(err.stack);
+
+				loadingAssets = false;
+			});
+	}
+
+	return tokenModuleData;
+};
+
+const getOpeningBalances = async address => {
+	const balancesAtGenesis = await getTokenBalancesAtGenesis();
+	const balancesByAddress = balancesAtGenesis
+		? balancesAtGenesis.filter(e => e.address === address)
+		: await requestConnector('getTokenBalancesAtGenesis', { address });
+
+	const openingBalances = balancesByAddress.map(e => {
+		const { tokenID, availableBalance, lockedBalances } = e;
+		const totalLockedBalance = lockedBalances.reduce(
+			(total, balInfo) => total + BigInt(balInfo.amount),
+			BigInt('0'),
+		);
+
+		const amount = BigInt(availableBalance) + totalLockedBalance;
+
+		return { tokenID, amount: amount.toString() };
+	});
+
+	return openingBalances;
+};
+
+const cachePublicKey = async publicKey => {
+	const address = getLisk32AddressFromPublicKey(publicKey);
+	await publicKeyCache.set(address, publicKey);
+};
+
+const getPublicKeyByAddress = async address => {
+	const publicKey = await publicKeyCache.get(address);
+	if (publicKey) return publicKey;
+
+	return null;
+};
+
 module.exports = {
 	validateLisk32Address,
 	validatePublicKey,
 	getLisk32AddressFromPublicKey,
 	getLegacyAddress,
+	getAddressFromParams,
+	checkIfAccountExists,
+	checkIfAccountHasTransactions,
+	checkIfAccountIsValidator,
+	getTokenBalancesAtGenesis,
+	getOpeningBalances,
+	cachePublicKey,
+	getPublicKeyByAddress,
 };