From 1d57f3d3f7030d6d5be34d05890539f2a8acbd3c Mon Sep 17 00:00:00 2001 From: shmuel Date: Thu, 2 Mar 2023 15:04:23 +0200 Subject: [PATCH 1/3] allowance fix --- .../Stability/validation/validateStabilityDepositChange.tsx | 2 +- packages/lib-ethers/etc/lib-ethers.api.md | 4 ++-- packages/lib-ethers/src/BlockPolledLiquityStore.ts | 2 +- packages/lib-ethers/src/ReadableEthersLiquity.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx index 3a7b9110d..14612202f 100644 --- a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx +++ b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx @@ -76,7 +76,7 @@ export const validateStabilityDepositChange = ( ]; } - if(change && !bammAllowance) { + if(change && change.depositLUSD?.gt(bammAllowance)) { return [ undefined, diff --git a/packages/lib-ethers/etc/lib-ethers.api.md b/packages/lib-ethers/etc/lib-ethers.api.md index ad395e68f..f8026e421 100644 --- a/packages/lib-ethers/etc/lib-ethers.api.md +++ b/packages/lib-ethers/etc/lib-ethers.api.md @@ -61,7 +61,7 @@ export class BlockPolledLiquityStore extends LiquityStore; // (undocumented) - getBammAllowance(overrides?: EthersCallOverrides): Promise; + getBammAllowance(overrides?: EthersCallOverrides): Promise; // @internal (undocumented) _getBlockTimestamp(blockTag?: BlockTag): Promise; // (undocumented) diff --git a/packages/lib-ethers/src/BlockPolledLiquityStore.ts b/packages/lib-ethers/src/BlockPolledLiquityStore.ts index 9344d7bf7..2e155c209 100644 --- a/packages/lib-ethers/src/BlockPolledLiquityStore.ts +++ b/packages/lib-ethers/src/BlockPolledLiquityStore.ts @@ -39,7 +39,7 @@ export interface BlockPolledLiquityStoreExtraState { /** @internal */ _feesFactory: (blockTimestamp: number, recoveryMode: boolean) => Fees; - bammAllowance: boolean; + bammAllowance: any; } /** diff --git a/packages/lib-ethers/src/ReadableEthersLiquity.ts b/packages/lib-ethers/src/ReadableEthersLiquity.ts index 3707fb6a4..003001f52 100644 --- a/packages/lib-ethers/src/ReadableEthersLiquity.ts +++ b/packages/lib-ethers/src/ReadableEthersLiquity.ts @@ -610,14 +610,14 @@ export class ReadableEthersLiquity implements ReadableLiquity { : { status: "unregistered" }; } - async getBammAllowance(overrides?: EthersCallOverrides): Promise { + async getBammAllowance(overrides?: EthersCallOverrides): Promise { const { lusdToken, bamm } = _getContracts(this.connection); const address = _requireAddress(this.connection); const reallyLargeAllowance = BigNumber.from("0x8888888888888888888888888888888888888888888888888888888888888888") const allowance = await lusdToken.allowance(address, bamm.address) console.log({allowance}) - const bammAllowance = allowance.gt(reallyLargeAllowance) + const bammAllowance = allowance return bammAllowance; } } From ae8df6c23f929be5314f85847399049ab1af772d Mon Sep 17 00:00:00 2001 From: yaron velner Date: Sun, 12 Mar 2023 10:38:27 +0200 Subject: [PATCH 2/3] convert bamm allowance to string --- .../Stability/validation/validateStabilityDepositChange.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx index 14612202f..b81fe28a1 100644 --- a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx +++ b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx @@ -75,8 +75,7 @@ export const validateStabilityDepositChange = ( ]; } - - if(change && change.depositLUSD?.gt(bammAllowance)) { + if(change && change.depositLUSD?.gt(bammAllowance.toString())) { return [ undefined, From 255f8696c4c05d4555bfe97ab85309ea937e0bc4 Mon Sep 17 00:00:00 2001 From: yaron velner Date: Sun, 12 Mar 2023 10:57:57 +0200 Subject: [PATCH 3/3] convert allowance to decimals before comparing --- .../Stability/validation/validateStabilityDepositChange.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx index b81fe28a1..59c8f7c49 100644 --- a/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx +++ b/packages/dev-frontend/src/components/Stability/validation/validateStabilityDepositChange.tsx @@ -75,7 +75,7 @@ export const validateStabilityDepositChange = ( ]; } - if(change && change.depositLUSD?.gt(bammAllowance.toString())) { + if(change && change.depositLUSD?.gt(Decimal.fromBigNumberString(bammAllowance.toString()))) { return [ undefined,