From 0a0b6eed2c00e04c904b0a4fb579e13999ab1c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Wed, 27 Jul 2022 13:45:36 +0100 Subject: [PATCH] feat: add get txs hashes fallback on ciphertrace --- .../wallet-scoring/ciphertrace/ciphertrace.js | 19 +++++++++++++------ lib/plugins/wallet/mock-wallet/mock-wallet.js | 18 ++++++++++++++++-- lib/wallet-scoring.js | 11 ++++++----- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/lib/plugins/wallet-scoring/ciphertrace/ciphertrace.js b/lib/plugins/wallet-scoring/ciphertrace/ciphertrace.js index b6416b82..02db9562 100644 --- a/lib/plugins/wallet-scoring/ciphertrace/ciphertrace.js +++ b/lib/plugins/wallet-scoring/ciphertrace/ciphertrace.js @@ -52,17 +52,24 @@ function isValidWalletScore (account, score) { return _.isNil(account) ? Promise.resolve(true) : Promise.resolve(score < threshold) } -function getTransactionHash (account, cryptoCode, receivingAddress) { - const client = getClient(account) - if (!_.includes(_.toUpper(cryptoCode), SUPPORTED_COINS) || _.isNil(client)) return Promise.resolve(null) - +function getAddressTransactionsHashes (receivingAddress, cryptoCode, client, wallet) { const { apiVersion, authHeader } = client - console.log(`** DEBUG ** getTransactionHash ENDPOINT: https://rest.ciphertrace.com/api/${apiVersion}/${_.toLower(cryptoCode) !== 'btc' ? `${_.toLower(cryptoCode)}_` : ``}address/search?features=tx&address=${receivingAddress}&mempool=true`) return axios.get(`https://rest.ciphertrace.com/api/${apiVersion}/${_.toLower(cryptoCode) !== 'btc' ? `${_.toLower(cryptoCode)}_` : ``}address/search?features=tx&address=${receivingAddress}&mempool=true`, { headers: authHeader }) + .catch(err => { + console.log(`** DEBUG ** getTransactionHash ERROR: ${err}`) + console.log(`** DEBUG ** Fetching transactions hashes via wallet node...`) + return wallet.getTxHashesByAddress(cryptoCode, receivingAddress) + }) +} + +function getTransactionHash (account, cryptoCode, receivingAddress, wallet) { + const client = getClient(account) + if (!_.includes(_.toUpper(cryptoCode), SUPPORTED_COINS) || _.isNil(client)) return Promise.resolve(null) + getAddressTransactionsHashes(receivingAddress, cryptoCode, client, wallet) .then(res => { const data = res.data if (_.size(data.txHistory) > 1) { @@ -72,7 +79,7 @@ function getTransactionHash (account, cryptoCode, receivingAddress) { return _.join(', ', _.map(it => it.txHash, data.txHistory)) }) .catch(err => { - console.log(`** DEBUG ** getTransactionHash ERROR: ${err}`) + console.log(`** DEBUG ** getTransactionHash from wallet node ERROR: ${err}`) throw err }) } diff --git a/lib/plugins/wallet/mock-wallet/mock-wallet.js b/lib/plugins/wallet/mock-wallet/mock-wallet.js index 6d163cf8..4e359287 100644 --- a/lib/plugins/wallet/mock-wallet/mock-wallet.js +++ b/lib/plugins/wallet/mock-wallet/mock-wallet.js @@ -10,9 +10,14 @@ const SECONDS = 1000 const PUBLISH_TIME = 3 * SECONDS const AUTHORIZE_TIME = PUBLISH_TIME + 5 * SECONDS const CONFIRM_TIME = AUTHORIZE_TIME + 10 * SECONDS +const SUPPORTED_COINS = coinUtils.cryptoCurrencies() let t0 +const checkCryptoCode = (cryptoCode) => !_.includes(cryptoCode, SUPPORTED_COINS) + ? Promise.reject(new Error('Unsupported crypto: ' + cryptoCode)) + : Promise.resolve() + function _balance (cryptoCode) { const cryptoRec = coinUtils.getCryptoCurrency(cryptoCode) const unitScale = cryptoRec.unitScale @@ -107,7 +112,15 @@ function getStatus (account, tx, requested, settings, operatorId) { console.log('[%s] DEBUG: Mock wallet has confirmed transaction [%s]', cryptoCode, toAddress.slice(0, 5)) - return Promise.resolve({status: 'confirmed'}) + return Promise.resolve({ status: 'confirmed' }) +} + +function getTxHashesByAddress (cryptoCode, address) { + return new Promise((resolve, reject) => { + setTimeout(() => { + return resolve([]) // TODO: should return something other than empty list? + }, 100) + }) } function checkBlockchainStatus (cryptoCode) { @@ -123,5 +136,6 @@ module.exports = { newAddress, getStatus, newFunding, - checkBlockchainStatus + checkBlockchainStatus, + getTxHashesByAddress } diff --git a/lib/wallet-scoring.js b/lib/wallet-scoring.js index ab461ce4..0281c25a 100644 --- a/lib/wallet-scoring.js +++ b/lib/wallet-scoring.js @@ -1,13 +1,14 @@ const ph = require('./plugin-helper') -const _ = require('lodash/fp') const argv = require('minimist')(process.argv.slice(2)) +const configManager = require('./new-config-manager') -function loadWalletScoring (settings) { +function loadWalletScoring (settings, cryptoCode) { const pluginCode = argv.mockScoring ? 'mock-scoring' : 'ciphertrace' + const wallet = cryptoCode ? ph.load(ph.WALLET, configManager.getWalletSettings(cryptoCode, settings.config).wallet) : null const plugin = ph.load(ph.WALLET_SCORING, pluginCode) const account = settings.accounts[pluginCode] - return { plugin, account } + return { plugin, account, wallet } } function rateWallet (settings, cryptoCode, address) { @@ -31,9 +32,9 @@ function isValidWalletScore (settings, score) { function getTransactionHash (settings, cryptoCode, receivingAddress) { return Promise.resolve() .then(() => { - const { plugin, account } = loadWalletScoring(settings) + const { plugin, account, wallet } = loadWalletScoring(settings, cryptoCode) - return plugin.getTransactionHash(account, cryptoCode, receivingAddress) + return plugin.getTransactionHash(account, cryptoCode, receivingAddress, wallet) }) }