ALL-9923 Fixed version in report for Docker

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tatumio/tatum-kms",
-  "version": "7.0.7",
+  "version": "7.0.8",
   "description": "Tatum KMS - Key Management System for Tatum-powered apps.",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",

src/management.ts

@@ -30,6 +30,8 @@
 import { utils } from './utils'
 import semver from 'semver'
 
+import { version } from '../package.json'
+
 const ensurePathExists = (path: string) => {
   const dir = dirname(path)
   if (!existsSync(dir)) {
@@ -134,7 +136,7 @@
 }
 
 const generatePureWallet = async (chain: Currency, testnet: boolean, mnemonic?: string) => {
   let wallet: any
   if (chain === Currency.SOL) {
     const sdk = TatumSolanaSDK({ apiKey: '' })
     wallet = sdk.wallet.wallet()
@@ -236,7 +238,7 @@
   const cnt = Number(count)
   for (let i = 0; i < cnt; i++) {
     const wallet = await generatePureWallet(chain, testnet)
     let address: any
     if (wallet.address) {
       address = wallet.address
     } else {
@@ -273,7 +275,7 @@
 }
 
 // TODO: validate all properties from wallet and create a type or interface to replace any bellow
 export const isWalletsValid = (wallets: any, options: WalletsValidationOptions) => {
   if (Object.keys(wallets).length === 0) {
     console.error(JSON.stringify({ error: `No such wallet for chain '${options.chain}'.` }, null, 2))
     return false
@@ -366,7 +368,7 @@
     console.error(JSON.stringify({ error: `No such wallet for signatureId '${id}'.` }, null, 2))
     return null
   }
   let pk: { address: any }
   if (wallet[id].address) {
     pk = {
       address: wallet[id].address,
@@ -545,7 +547,7 @@
 }
 
 const getKmsVersion = (): string => {
-  return process.env.npm_package_version ?? 'N/A'
+  return version || 'N/A'
 }
 
 const getPathToWallet = (path?: string) => {

src/signatures.ts

@@ -58,6 +58,7 @@
 import { getManagedWallets, getWallet, getWalletForSignature } from './management'
 import semver from 'semver'
 import { Config, ConfigOption } from './config'
+import { version } from '../package.json'
 
 const TATUM_URL: string = process.env.TATUM_API_URL || 'https://api.tatum.io'
 
@@ -77,7 +78,7 @@
   return result
 }
 
 function validatePrivateKeyWasFound(wallet: any, blockchainSignature: TransactionKMS, privateKey: string | undefined) {
   if (privateKey) return
 
   const index = blockchainSignature.index
@@ -156,7 +157,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),
@@ -204,16 +205,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
     }
@@ -516,7 +517,7 @@
   versionUpdateState.level = parts[1]?.toUpperCase()?.trim()
   versionUpdateState.logFunction = versionUpdateState.level === 'ERROR' ? console.error : console.log
   versionUpdateState.message = parts[2]?.trim()
-  versionUpdateState.currentVersion = process.env.npm_package_version ?? ''
+  versionUpdateState.currentVersion = version ?? ''
 
   if (
     !versionUpdateState.running &&
@@ -562,7 +563,7 @@
       {
         headers: {
           'x-api-key': Config.getValue(ConfigOption.TATUM_API_KEY),
-          'x-ttm-kms-client-version': process.env.npm_package_version ?? '',
+          'x-ttm-kms-client-version': version ?? '',
         },
       },
     )