lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #549 from csrapr/fix/blacklist-bch-duplicate-bug

Browse source 
Fix: adds created_by_operator constraint for duplicate checking
This commit is contained in:
Rafael Taranto 2021-01-08 21:59:51 +00:00 • committed by GitHub
commit c2bc6a248d
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/blacklist.js
View file

@ -14,7 +14,7 @@ const getBlacklist = () => {
// Delete row from blacklist table by crypto code and address
const deleteFromBlacklist = (cryptoCode, address) => {
return db.none(
'delete from blacklist where crypto_code = $1 and address = $2;',
`DELETE FROM blacklist WHERE created_by_operator = 't' AND crypto_code = $1 AND address = $2`,
[cryptoCode, address]
)
}

16
migrations/1609346970940-alter-blacklist-unique-constraint.js Normal file
View file

@ -0,0 +1,16 @@
var db = require('./db')
exports.up = function (next) {
var sql = [
`ALTER TABLE blacklist DROP CONSTRAINT blacklist_crypto_code_address_key`,
`ALTER TABLE blacklist ADD CONSTRAINT blacklist_crypto_code_address_created_by_operator_key UNIQUE (crypto_code, address, created_by_operator)`,
`CREATE INDEX ON blacklist (created_by_operator)`,
`REINDEX TABLE blacklist`
]
db.multi(sql, next)
}
exports.down = function (next) {
next()
}

3
new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
View file

@ -20,6 +20,9 @@ const BlackListModal = ({
}) => {
const classes = useStyles()
const handleAddToBlacklist = address => {
if (selectedCoin.code === 'BCH' && !address.startsWith('bitcoincash:')) {
address = 'bitcoincash:' + address
}
addToBlacklist(selectedCoin.code, address)
}
const placeholderAddress = {