Merge pull request #1482 from CrypticaScriptura/usdt-backport

LAM-801 fix: backport USDT ratchet fix
lamassu · Jan 10, 2023 · 19a268d · 19a268d
2 parents ab1b6f8 + 5852c96
commit 19a268d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/lib/cash-in/cash-in-low.js b/lib/cash-in/cash-in-low.js
@@ -8,7 +8,7 @@ const E = require('../error')
 
 const PENDING_INTERVAL_MS = 60 * T.minutes
 
-const massageFields = ['direction', 'cryptoNetwork', 'bills', 'blacklisted', 'addressReuse', 'promoCodeApplied', 'validWalletScore']
+const massageFields = ['direction', 'cryptoNetwork', 'bills', 'blacklisted', 'addressReuse', 'promoCodeApplied', 'validWalletScore', 'cashInFeeCrypto']
 const massageUpdateFields = _.concat(massageFields, 'cryptoAtoms')
 
 const massage = _.flow(_.omit(massageFields),
@@ -35,7 +35,7 @@ function toObj (row) {
 
   keys.forEach(key => {
     const objKey = _.camelCase(key)
-    if (_.includes(key, ['crypto_atoms', 'fiat', 'cash_in_fee', 'cash_in_fee_crypto', 'commission_percentage', 'raw_ticker_price'])) {
+    if (_.includes(key, ['crypto_atoms', 'fiat', 'cash_in_fee', 'commission_percentage', 'raw_ticker_price'])) {
       newObj[objKey] = new BN(row[key])
       return
     }
@@ -102,7 +102,7 @@ function diff (oldTx, newTx) {
 }
 
 function ensureRatchet (oldField, newField, fieldKey) {
-  const monotonic = ['cryptoAtoms', 'fiat', 'cashInFeeCrypto', 'send', 'sendConfirmed', 'operatorCompleted', 'timedout', 'txVersion', 'batched']
+  const monotonic = ['cryptoAtoms', 'fiat', 'send', 'sendConfirmed', 'operatorCompleted', 'timedout', 'txVersion', 'batched']
   const free = ['sendPending', 'error', 'errorCode', 'customerId']
 
   if (_.isNil(oldField)) return true

diff --git a/lib/new-admin/graphql/types/transaction.type.js b/lib/new-admin/graphql/types/transaction.type.js
@@ -24,7 +24,6 @@ const typeDef = gql`
     operatorCompleted: Boolean
     sendPending: Boolean
     cashInFee: String
-    cashInFeeCrypto: String
     minimumTx: Float
     customerId: ID
     isAnonymous: Boolean

diff --git a/lib/notifier/test/notifier.test.js b/lib/notifier/test/notifier.test.js
@@ -64,7 +64,6 @@ const tx = {
   operatorCompleted: false,
   sendPending: true,
   cashInFee: new BN(2),
-  cashInFeeCrypto: new BN(9500),
   minimumTx: 5,
   customerId: '47ac1184-8102-11e7-9079-8f13a7117867',
   txVersion: 6,

diff --git a/lib/tx-batching.js b/lib/tx-batching.js
@@ -65,7 +65,7 @@ function getOpenBatchCryptoValue (cryptoCode) {
       if (_.isNil(batch)) return Promise.resolve([])
       return db.any(`SELECT * FROM cash_in_txs WHERE batch_id=$1`, [batch.id])
     })
-    .then(txs => _.reduce((acc, tx) => acc.plus(tx.cash_in_fee_crypto).plus(tx.crypto_atoms), BN(0), txs))
+    .then(txs => _.reduce((acc, tx) => acc.plus(tx.crypto_atoms), BN(0), txs))
 }
 
 module.exports = {

diff --git a/lib/tx.js b/lib/tx.js
@@ -33,7 +33,6 @@ function massage (tx, pi) {
         cryptoAtoms: new BN(r.cryptoAtoms),
         fiat: new BN(r.fiat),
         cashInFee: new BN(r.cashInFee),
-        cashInFeeCrypto: new BN(r.cashInFeeCrypto),
         commissionPercentage: new BN(r.commissionPercentage),
         rawTickerPrice: r.rawTickerPrice ? new BN(r.rawTickerPrice) : null,
         minimumTx: new BN(r.minimumTx)

diff --git a/migrations/1670425142650-deprecate-cash-in-fee-crypto.js b/migrations/1670425142650-deprecate-cash-in-fee-crypto.js
@@ -0,0 +1,13 @@
+const db = require('./db')
+
+exports.up = function (next) {
+  var sql = [
+    'ALTER TABLE cash_in_txs DROP COLUMN cash_in_fee_crypto'
+  ]
+
+  db.multi(sql, next)
+}
+
+exports.down = function (next) {
+  next()
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "lamassu-server",
   "description": "bitcoin atm client server protocol module",
   "keywords": [],
-  "version": "8.0.5",
+  "version": "8.0.6",
   "license": "Unlicense",
   "author": "Lamassu (https://lamassu.is)",
   "dependencies": {