diff --git a/lib/blacklist.js b/lib/blacklist.js index 2a34a1f2..8324fc20 100644 --- a/lib/blacklist.js +++ b/lib/blacklist.js @@ -27,7 +27,6 @@ const insertIntoBlacklist = address => { function blocked (address) { const sql = `SELECT address, content FROM blacklist b LEFT OUTER JOIN blacklist_messages bm ON bm.id = b.blacklist_message_id WHERE address = $1` return db.oneOrNone(sql, [address]) - .then(r => !_.isNil(r)) } function getMessages () { diff --git a/lib/cash-in/cash-in-tx.js b/lib/cash-in/cash-in-tx.js index 03235176..09d0a235 100644 --- a/lib/cash-in/cash-in-tx.js +++ b/lib/cash-in/cash-in-tx.js @@ -32,7 +32,6 @@ function post (machineTx, pi) { return cashInAtomic.atomic(machineTx, pi) .then(r => { const updatedTx = r.tx - let blacklisted = null let addressReuse = false const promises = [settingsLoader.loadLatestConfig()] @@ -47,8 +46,9 @@ function post (machineTx, pi) { } return Promise.all(promises) - .then(([config, isBlacklisted = false, isReusedAddress = false, walletScore = null]) => { + .then(([config, blacklisted = false, isReusedAddress = false, walletScore = null]) => { const { rejectAddressReuse } = configManager.getCompliance(config) + const isBlacklisted = !!blacklisted if (isBlacklisted) { notifier.notifyIfActive('compliance', 'blacklistNotify', r.tx, false)