inverse approve logic

taikoxyz · Dec 1, 2022 · 8d84c3d · 8d84c3d
1 parent 63dbd28
commit 8d84c3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/packages/bridge-ui/src/erc20/bridge.spec.ts b/packages/bridge-ui/src/erc20/bridge.spec.ts
@@ -110,7 +110,7 @@ describe("bridge tests", () => {
 
   it("approve throws when amount is already greater than whats set", async () => {
     mockContract.allowance.mockImplementationOnce(() =>
-      opts.amountInWei.sub(1)
+      opts.amountInWei.add(1)
     );
 
     mockSigner.getAddress.mockImplementationOnce(() => "0xfake");
@@ -119,7 +119,7 @@ describe("bridge tests", () => {
 
     expect(mockContract.allowance).not.toHaveBeenCalled();
     await expect(bridge.Approve(approveOpts)).rejects.toThrowError(
-      "token vault does not have required allowance"
+      "token vault already has required allowance"
     );
 
     expect(mockSigner.getAddress).toHaveBeenCalled();
@@ -131,7 +131,7 @@ describe("bridge tests", () => {
 
   it("approve succeeds when allowance is less than what is being requested", async () => {
     mockContract.allowance.mockImplementationOnce(() =>
-      opts.amountInWei.add(1)
+      opts.amountInWei.sub(1)
     );
 
     mockSigner.getAddress.mockImplementationOnce(() => "0xfake");

diff --git a/packages/bridge-ui/src/erc20/bridge.ts b/packages/bridge-ui/src/erc20/bridge.ts
@@ -12,10 +12,8 @@ class ERC20Bridge implements Bridge {
     bridgeAddress: string
   ): Promise<boolean> {
     const contract: Contract = new Contract(tokenAddress, ERC20, signer);
-    const allowance: BigNumber = await contract.allowance(
-      await signer.getAddress(),
-      bridgeAddress
-    );
+    const owner = await signer.getAddress();
+    const allowance: BigNumber = await contract.allowance(owner, bridgeAddress);
 
     return allowance.lt(amount);
   }
@@ -31,14 +29,14 @@ class ERC20Bridge implements Bridge {
 
   async Approve(opts: ApproveOpts): Promise<Transaction> {
     if (
-      await this.spenderRequiresAllowance(
+      !(await this.spenderRequiresAllowance(
         opts.contractAddress,
         opts.signer,
         opts.amountInWei,
         opts.spenderAddress
-      )
+      ))
     ) {
-      throw Error("token vault does not have required allowance");
+      throw Error("token vault already has required allowance");
     }
 
     const contract: Contract = new Contract(