From 5125601e56f4b2b323233d1b258fa43a3dc8b042 Mon Sep 17 00:00:00 2001
From: Rafael Taranto <rafael.taranto5@gmail.com>
Date: Sun, 18 Aug 2019 19:46:32 +0100
Subject: [PATCH] Only block reused address if option is on

---
 lib/blacklist.js          |  2 +-
 lib/cash-in/cash-in-tx.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/blacklist.js b/lib/blacklist.js
index 08d2705e..e66ac3ff 100644
--- a/lib/blacklist.js
+++ b/lib/blacklist.js
@@ -2,7 +2,7 @@ const db = require('./db')
 
 function blocked (address, cryptoCode) {
   const sql = `select * from blacklist where address = $1 and crypto_code = $2`
-  return db.oneOrNone(sql, [
+  return db.any(sql, [
     address,
     cryptoCode
   ])
diff --git a/lib/cash-in/cash-in-tx.js b/lib/cash-in/cash-in-tx.js
index 5147bba6..0ef93717 100644
--- a/lib/cash-in/cash-in-tx.js
+++ b/lib/cash-in/cash-in-tx.js
@@ -24,13 +24,13 @@ function post (machineTx, pi) {
       let blacklisted = false
       let addressReuse = false
 
-      return checkForBlacklisted(updatedTx)
-        .then(blacklistItem => {
-          if (blacklistItem && blacklistItem.created_by_operator) {
-            blacklisted = true
-          }
+      return Promise.all([settingsLoader.loadLatest(), checkForBlacklisted(updatedTx)])
+        .then(([{ config }, blacklistItems]) => {
+          const rejectAddressReuseActive = configManager.unscoped(config).rejectAddressReuseActive
 
-          if (blacklistItem && !blacklistItem.created_by_operator) {
+          if (_.some(it => it.created_by_operator === true)(blacklistItems)) {
+            blacklisted = true
+          } else if (_.some(it => it.created_by_operator === false)(blacklistItems) && rejectAddressReuseActive) {
             addressReuse = true
           }