From a9ba92f67bb207bd8ba744861c0ef64add4918b2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 12:32:35 +0200 Subject: [PATCH 1/6] Transaction Resolver: transmit Redeem Link to calculateBalance --- backend/src/graphql/resolver/TransactionResolver.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 461a70a00..240369006 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -57,7 +57,12 @@ export const executeTransaction = async ( // validate amount const receivedCallDate = new Date() - const sendBalance = await calculateBalance(sender.id, amount.mul(-1), receivedCallDate) + const sendBalance = await calculateBalance( + sender.id, + amount.mul(-1), + receivedCallDate, + transactionLink, + ) if (!sendBalance) { throw new Error("user hasn't enough GDD or amount is < 0") } From fa7f2b9d87581f7c07dee6c64b8a01e3697de355 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 12:33:29 +0200 Subject: [PATCH 2/6] calculateBalance: If we redeem a link, make sure we do not consider its amount as blocked when calculating the balance --- backend/src/util/validate.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index 95e1bf699..5d2f39aa0 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -4,6 +4,7 @@ import { Transaction } from '@entity/Transaction' import { Decay } from '@model/Decay' import { getCustomRepository } from '@dbTools/typeorm' import { TransactionLinkRepository } from '@repository/TransactionLink' +import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' function isStringBoolean(value: string): boolean { const lowerValue = value.toLowerCase() @@ -21,6 +22,7 @@ async function calculateBalance( userId: number, amount: Decimal, time: Date, + transactionLink?: dbTransactionLink | null, ): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number } | null> { const lastTransaction = await Transaction.findOne({ userId }, { order: { balanceDate: 'DESC' } }) if (!lastTransaction) return null @@ -32,7 +34,13 @@ async function calculateBalance( const transactionLinkRepository = getCustomRepository(TransactionLinkRepository) const { sumHoldAvailableAmount } = await transactionLinkRepository.summary(userId, time) - if (balance.minus(sumHoldAvailableAmount.toString()).lessThan(0)) { + // If we want to redeem a link we need to make sure that the link amount is not calculated as blocked + // else we cannot redeem links which are more or equal to half of what an account actually owns + const sumHoldAvailableAmountMinusTransactionLink = transactionLink + ? sumHoldAvailableAmount.minus(transactionLink.amount.toString()) + : sumHoldAvailableAmount + + if (balance.minus(sumHoldAvailableAmountMinusTransactionLink.toString()).lessThan(0)) { return null } return { balance, lastTransactionId: lastTransaction.id, decay } From 04807bd225603f6c88c60052e51bb90cf24c4e93 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 12:34:09 +0200 Subject: [PATCH 3/6] corrected comment --- backend/src/util/validate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index 5d2f39aa0..1a0ce02ce 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -34,7 +34,7 @@ async function calculateBalance( const transactionLinkRepository = getCustomRepository(TransactionLinkRepository) const { sumHoldAvailableAmount } = await transactionLinkRepository.summary(userId, time) - // If we want to redeem a link we need to make sure that the link amount is not calculated as blocked + // If we want to redeem a link we need to make sure that the link amount is not considered as blocked // else we cannot redeem links which are more or equal to half of what an account actually owns const sumHoldAvailableAmountMinusTransactionLink = transactionLink ? sumHoldAvailableAmount.minus(transactionLink.amount.toString()) From b53aef90f883a06ff789e652ef68f1f846e02f23 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 20:52:59 +0200 Subject: [PATCH 4/6] Update backend/src/util/validate.ts Co-authored-by: Moriz Wahl --- backend/src/util/validate.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index 1a0ce02ce..b158761da 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -36,11 +36,9 @@ async function calculateBalance( // If we want to redeem a link we need to make sure that the link amount is not considered as blocked // else we cannot redeem links which are more or equal to half of what an account actually owns - const sumHoldAvailableAmountMinusTransactionLink = transactionLink - ? sumHoldAvailableAmount.minus(transactionLink.amount.toString()) - : sumHoldAvailableAmount + const releasedLinkAmount = transactionLink ? transactionLink.amount : new Decimal(0) - if (balance.minus(sumHoldAvailableAmountMinusTransactionLink.toString()).lessThan(0)) { + if (balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0)) { return null } return { balance, lastTransactionId: lastTransaction.id, decay } From ef675980a8fc0266c2aecb97f3068ed636b34ad6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 21:04:16 +0200 Subject: [PATCH 5/6] lint fixes --- backend/src/util/validate.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index b158761da..3c8cd5935 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -38,7 +38,9 @@ async function calculateBalance( // else we cannot redeem links which are more or equal to half of what an account actually owns const releasedLinkAmount = transactionLink ? transactionLink.amount : new Decimal(0) - if (balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0)) { + if ( + balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0) + ) { return null } return { balance, lastTransactionId: lastTransaction.id, decay } From 3ef0074d33f657979e68806f9a73ac9259e19d98 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 21:47:55 +0200 Subject: [PATCH 6/6] free not only the link value but also the decay amount withheld --- backend/src/util/validate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index 3c8cd5935..8d1c90ca4 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -36,7 +36,7 @@ async function calculateBalance( // If we want to redeem a link we need to make sure that the link amount is not considered as blocked // else we cannot redeem links which are more or equal to half of what an account actually owns - const releasedLinkAmount = transactionLink ? transactionLink.amount : new Decimal(0) + const releasedLinkAmount = transactionLink ? transactionLink.holdAvailableAmount : new Decimal(0) if ( balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0)