From f682a77eb57c9e4fcef5bbf32348590746b46750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Sun, 20 Jun 2021 21:30:59 +0100
Subject: [PATCH] feat: migrate old tx addresses to blacklist table feat: add
 new addresses to blacklist list

---
 lib/cash-in/cash-in-tx.js                          |  7 ++-----
 .../1624214428956-txs-addresses-to-blacklist.js    | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 migrations/1624214428956-txs-addresses-to-blacklist.js

diff --git a/lib/cash-in/cash-in-tx.js b/lib/cash-in/cash-in-tx.js
index 12fd78a4..bfca6526 100644
--- a/lib/cash-in/cash-in-tx.js
+++ b/lib/cash-in/cash-in-tx.js
@@ -134,11 +134,8 @@ function postProcess (r, pi, isBlacklisted, addressReuse) {
     })
     .then(sendRec => {
       settingsLoader.loadLatest().then(it => {
-        const rejectAddressReuseActive = configManager.getCompliance(it.config).rejectAddressReuse
-        if (rejectAddressReuseActive) {
-          blacklist.addToUsedAddresses(r.tx.toAddress, r.tx.cryptoCode)
-            .catch(err => logger.error('Failure adding to addressReuse', err))
-        }
+        blacklist.addToUsedAddresses(r.tx.toAddress, r.tx.cryptoCode)
+          .catch(err => logger.error('Failure adding to addressReuse', err))
       })
 
       pi.notifyOperator(r.tx, sendRec)
diff --git a/migrations/1624214428956-txs-addresses-to-blacklist.js b/migrations/1624214428956-txs-addresses-to-blacklist.js
new file mode 100644
index 00000000..b21a3b9b
--- /dev/null
+++ b/migrations/1624214428956-txs-addresses-to-blacklist.js
@@ -0,0 +1,14 @@
+var db = require('./db')
+
+exports.up = function (next) {
+  var sql = [
+    `INSERT INTO blacklist SELECT DISTINCT crypto_code, to_address, false FROM cash_in_txs ON CONFLICT DO NOTHING`,
+    `INSERT INTO blacklist SELECT DISTINCT crypto_code, to_address, false FROM cash_out_txs ON CONFLICT DO NOTHING`
+  ]
+
+  db.multi(sql, next)
+}
+
+exports.down = function (next) {
+  next()
+}