checking for allowance before approval (#118)

Author: aalavandhan

spot-contracts/tasks/mainnet.sh

@@ -47,6 +47,8 @@ yarn hardhat --network mainnet transferOwnership "0x2978B4103985A6668CE345555b0f
 yarn hardhat --network mainnet ops:info 0xC1f33e0cf7e40a67375007104B929E49a581bafE
 
 # test ops
+yarn hardhat --network mainnet ops:updateState 0xC1f33e0cf7e40a67375007104B929E49a581bafE
+
 yarn hardhat --network mainnet ops:trancheAndDeposit \
   --router-address 0x38f600e08540178719BF656e6B43FC15A529c393 \
   --perp-address 0xC1f33e0cf7e40a67375007104B929E49a581bafE \

spot-contracts/tasks/ops/perp.ts

@@ -204,9 +204,12 @@ task("ops:trancheAndDeposit")
     console.log("Signer", signerAddress);
 
     console.log("Approving router to spend tokens:");
-    const tx1 = await collateralToken.connect(signer).approve(router.address, fixedPtCollateralAmount);
-    await tx1.wait();
-    console.log("Tx", tx1.hash);
+    const allowance = await collateralToken.allowance(signerAddress, router.address);
+    if (allowance.lt(fixedPtCollateralAmount)) {
+      const tx1 = await collateralToken.connect(signer).approve(router.address, fixedPtCollateralAmount);
+      await tx1.wait();
+      console.log("Tx", tx1.hash);
+    }
 
     let fee = BigNumber.from("0");
     if (totalMintFee.gt("0") && feeToken.address !== perp.address) {
@@ -482,9 +485,12 @@ task("ops:trancheAndRollover")
     console.log("Signer", signerAddress);
 
     console.log("Approving collateralToken to be spent");
-    const tx1 = await collateralToken.connect(signer).approve(router.address, fixedPtCollateralAmount);
-    await tx1.wait();
-    console.log("Tx", tx1.hash);
+    const allowance = await collateralToken.allowance(signerAddress, router.address);
+    if (allowance.lt(fixedPtCollateralAmount)) {
+      const tx1 = await collateralToken.connect(signer).approve(router.address, fixedPtCollateralAmount);
+      await tx1.wait();
+      console.log("Tx", tx1.hash);
+    }
 
     let fee = BigNumber.from("0");
     if (totalRolloverFee.gt("0")) {