From 5e20b6b940fa7e98bd7d0ac88480d16b74070a05 Mon Sep 17 00:00:00 2001
From: hareland <packagist@proton.me>
Date: Tue, 11 Feb 2025 17:29:51 +0100
Subject: [PATCH] CY-2049: Implement better check for when a currency is valid.

---
 index.js          | 19 +++++++++----------
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/index.js b/index.js
index fb5a167..f0257be 100644
--- a/index.js
+++ b/index.js
@@ -555,18 +555,17 @@ Kraken.prototype._listTransactionsRecursive = function (type, start, knownTransa
 
     try {
       // Construct transaction objects for each ledger entry
-      const transactions = _.values(response.ledger).map(tx => {
-        try{
-          return convertFromKrakenTransaction(tx);
-        }catch (err) {
-          const msg = err.cause ? err.cause.message : err.message;
-          if(msg.match(new RegExp('Invalid currency \'[A-Z]{2,4}\'', 'g'))){
-            this.logger.info(err, msg);
+      const transactions = _.values(response.ledger)
+        .map(transaction => {
+          const symbol = convertFromKrakenCurrencyCode(transaction.asset);
+          if(!coinifyCurrency.isValidCurrency(symbol)) {
+            this.logger.info(transaction, `Invalid currency '${symbol}'`);
             return null;
           }
-          throw err;
-        }
-      }).filter(item => item !== null);
+
+          return convertFromKrakenTransaction(transaction);
+        })
+        .filter(item => item !== null);
 
       // Merge our newly converted transactions with the ones from previous calls
       const allTransactions = transactions.concat(knownTransactions);
diff --git a/package-lock.json b/package-lock.json
index 5141420..9f8a25c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "kraken-exc",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eae0036..7b5b7c1 100644
--- a/package.json
+++ b/package.json
@@ -43,5 +43,5 @@
     "test": "LOG_LEVEL=fatal mocha --config .mocharc.json",
     "test-watch": "LOG_LEVEL=info mocha --config .mocharc.json --watch"
   },
-  "version": "2.5.5"
+  "version": "2.5.6"
 }