ALL-3271 Fix signing with mnemonic BCH transactions

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@tatumio/tatum-kms",
- "version": "6.4.2",
+ "version": "6.4.3",
  "description": "Tatum KMS - Key Management System for Tatum-powered apps.",
  "main": "dist/index.js",
  "engines": {

src/signatures.ts

@@ -72,7 +72,7 @@
  return [...new Set(keys)]
 }
 
 function validatePrivateKeyWasFound(wallet: any, blockchainSignature: TransactionKMS, privateKey: string | undefined) {
  if (privateKey) return
 
  const index = blockchainSignature.index
@@ -99,13 +99,13 @@
  axios: AxiosInstance,
  path?: string,
  externalUrl?: string,
- externalUrlMethod?: ExternalUrlMethod
+ externalUrlMethod?: ExternalUrlMethod,
 ) => {
  if (externalUrl) {
  console.log(`${new Date().toISOString()} - External url '${externalUrl}' is present, checking against it.`)
  try {
  if (externalUrlMethod === 'POST') {
- await axios.post(`${externalUrl}/${blockchainSignature.id}`, blockchainSignature);
+ await axios.post(`${externalUrl}/${blockchainSignature.id}`, blockchainSignature)
  } else {
  await axios.get(`${externalUrl}/${blockchainSignature.id}`)
  }
@@ -148,7 +148,7 @@
  return
  }
  case Currency.SOL: {
  const solSDK = TatumSolanaSDK({ apiKey, url: TATUM_URL as any })
  txData = await solSDK.kms.sign(
  blockchainSignature as PendingTransaction,
  wallets.map(w => w.privateKey),
@@ -164,12 +164,9 @@
  if (blockchainSignature.withdrawalId) {
  txData = await signBitcoinCashOffchainKMSTransaction(blockchainSignature, wallets[0].mnemonic, testnet)
  } else {
+ const privateKeys = await getPrivateKeys(wallets)
  await bcashBroadcast(
- await signBitcoinCashKMSTransaction(
- blockchainSignature,
- wallets.map(w => w.privateKey),
- testnet,
- ),
+ await signBitcoinCashKMSTransaction(blockchainSignature, privateKeys, testnet),
  blockchainSignature.id,
  )
  return
@@ -199,16 +196,16 @@
  return
  }
  case Currency.XRP: {
  const xrpSdk = TatumXrpSDK({ apiKey, url: TATUM_URL as any })
  const xrpSecret = wallets[0].secret ? wallets[0].secret : wallets[0].privateKey
  txData = await xrpSdk.kms.sign(blockchainSignature as any, xrpSecret)
  await xrpSdk.blockchain.broadcast({ txData, signatureId: blockchainSignature.id })
  return
  }
  case Currency.XLM: {
  const xlmSdk = TatumXlmSDK({ apiKey, url: TATUM_URL as any })
  const xlmSecret = wallets[0].secret ? wallets[0].secret : wallets[0].privateKey
  txData = await xlmSdk.kms.sign(blockchainSignature as any, xlmSecret, testnet)
  await xlmSdk.blockchain.broadcast({ txData, signatureId: blockchainSignature.id })
  return
  }
@@ -607,65 +604,61 @@
 
  if (runOnce) {
  await processPendingTransactions(supportedChains, pwd, testnet, path, axios, externalUrl, externalUrlMethod)
- return;
+ return
  }
- 
+
  setInterval(async () => {
  if (running) {
  return
  }
  running = true
 
  await processPendingTransactions(supportedChains, pwd, testnet, path, axios, externalUrl, externalUrlMethod)
- 
+
  running = false
  }, period * 1000)
 }
 
 async function processPendingTransactions(
- supportedChains: Currency[], 
- pwd: string, 
- testnet: boolean, 
- path: string | undefined, 
- axios: AxiosInstance, 
- externalUrl: string | undefined, 
- externalUrlMethod: ExternalUrlMethod | undefined
+ supportedChains: Currency[],
+ pwd: string,
+ testnet: boolean,
+ path: string | undefined,
+ axios: AxiosInstance,
+ externalUrl: string | undefined,
+ externalUrlMethod: ExternalUrlMethod | undefined,
 ) {
  const transactions = []
+ try {
+ for (const supportedChain of supportedChains) {
+ const wallets = getManagedWallets(pwd, supportedChain, testnet, path)
+ transactions.push(...(await getPendingTransactions(axios, supportedChain, wallets)))
+ }
+ } catch (e) {
+ console.error(e)
+ }
+ const data = []
+ for (const transaction of transactions) {
  try {
- for (const supportedChain of supportedChains) {
- const wallets = getManagedWallets(pwd, supportedChain, testnet, path)
- transactions.push(...(await getPendingTransactions(axios, supportedChain, wallets)))
- }
+ await processTransaction(transaction, testnet, pwd, axios, path, externalUrl, externalUrlMethod)
+ console.log(`${new Date().toISOString()} - Tx was processed: ${transaction.id}`)
  } catch (e) {
- console.error(e)
- }
- const data = []
- for (const transaction of transactions) {
- try {
- await processTransaction(transaction, testnet, pwd, axios, path, externalUrl, externalUrlMethod)
- console.log(`${new Date().toISOString()} - Tx was processed: ${transaction.id}`)
- } catch (e) {
- const msg = (<any>e).response ? JSON.stringify((<any>e).response.data, null, 2) : `${e}`
- data.push({ signatureId: transaction.id, error: msg })
- console.error(`${new Date().toISOString()} - Could not process transaction id ${transaction.id}, error: ${msg}`)
- }
+ const msg = (<any>e).response ? JSON.stringify((<any>e).response.data, null, 2) : `${e}`
+ data.push({ signatureId: transaction.id, error: msg })
+ console.error(`${new Date().toISOString()} - Could not process transaction id ${transaction.id}, error: ${msg}`)
  }
- if (data.length > 0) {
- try {
- const url = `${TATUM_URL}/v3/tatum/kms/batch`
- await axios.post(
- url,
- { errors: data },
- { headers: { 'x-api-key': Config.getValue(ConfigOption.TATUM_API_KEY) } },
- )
- console.log(`${new Date().toISOString()} - Send batch call to url '${url}'.`)
- } catch (e) {
- console.error(
- `${new Date().toISOString()} - Error received from API /v3/tatum/kms/batch - ${(<any>e).config.data}`,
- )
- }
+ }
+ if (data.length > 0) {
+ try {
+ const url = `${TATUM_URL}/v3/tatum/kms/batch`
+ await axios.post(url, { errors: data }, { headers: { 'x-api-key': Config.getValue(ConfigOption.TATUM_API_KEY) } })
+ console.log(`${new Date().toISOString()} - Send batch call to url '${url}'.`)
+ } catch (e) {
+ console.error(
+ `${new Date().toISOString()} - Error received from API /v3/tatum/kms/batch - ${(<any>e).config.data}`,
+ )
  }
+ }
 }
 
 function isValidNumber(value: number | undefined): boolean {