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

Merge branch 'v5' of github.com:lamassu/lamassu-server into origin-v5

Browse source
This commit is contained in:
Josh Harvey 2017-08-30 16:54:36 +03:00
commit c860df1576
3 changed files with 56 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/cash-in-tx.js
View file

@ -73,7 +73,7 @@ function isMonotonic (oldField, newField, fieldKey) {
function ensureRatchet (oldField, newField, fieldKey) {
const monotonic = ['cryptoAtoms', 'fiat', 'cashInFeeCrypto', 'send', 'sendConfirmed', 'operatorCompleted', 'timedout', 'txVersion']
const free = ['sendPending', 'error', 'errorCode']
const free = ['sendPending', 'error', 'errorCode', 'customerId']
if (_.isNil(oldField)) return true
if (_.includes(fieldKey, monotonic)) return isMonotonic(oldField, newField, fieldKey)