Merge branch 'master' of github.com:studydefi/dedge into update-dacpr…

…oxyfactory-address
studydefi · Apr 9, 2020 · 9e354a4 · 9e354a4
2 parents 409a20e + 4be7b45
commit 9e354a4
Show file tree

Hide file tree

Showing 60 changed files with 60,330 additions and 60,369 deletions.
diff --git a/packages/frontend/containers/DACProxy.tsx b/packages/frontend/containers/DACProxy.tsx
@@ -43,34 +43,53 @@ function useDACProxy() {
       dedgeCompoundManager,
     } = contracts;
     setLoading(true);
-    const tx = await dedgeHelpers.proxyFactory.buildAndEnterMarkets(
-      dacProxyFactory,
-      dedgeCompoundManager.address,
-      [
-        cEther.address,
-        cDai.address,
-        cRep.address,
-        cZrx.address,
-        cBat.address,
-        cUsdc.address,
-        cWbtc.address,
-      ],
-    );
-
-    window.toastProvider.addMessage("Creating Smart Wallet...", {
-      secondaryMessage: "Check progress on Etherscan",
-      actionHref: `https://etherscan.io/tx/${tx.hash}`,
-      actionText: "Check",
-      variant: "processing",
-    });
-
-    await tx.wait();
-
-    window.toastProvider.addMessage("Smart Wallet created", {
-      variant: "success",
-    });
-    setLoading(false);
 
+    let tx = null;
+    try {
+      tx = await dedgeHelpers.proxyFactory.buildAndEnterMarkets(
+        dacProxyFactory,
+        dedgeCompoundManager.address,
+        [
+          cEther.address,
+          cDai.address,
+          cRep.address,
+          cZrx.address,
+          cBat.address,
+          cUsdc.address,
+          cWbtc.address,
+        ]
+      );
+
+      window.toastProvider.addMessage("Creating Smart Wallet...", {
+        secondaryMessage: "Check progress on Etherscan",
+        actionHref: `https://etherscan.io/tx/${tx.hash}`,
+        actionText: "Check",
+        variant: "processing",
+      });
+
+      await tx.wait();
+
+      window.toastProvider.addMessage("Smart Wallet created", {
+        variant: "success",
+      });
+    } catch (e) {
+      if (tx === null) {
+        window.toastProvider.addMessage(`Transaction cancelled`, {
+          variant: "failure",
+        });
+      } else {
+        window.toastProvider.addMessage(`Failed to create wallet...`, {
+          secondaryMessage: "Check reason on Etherscan",
+          actionHref: `https://etherscan.io/tx/${tx.hash}`,
+          actionText: "Check",
+          variant: "failure",
+        });
+      }
+      setLoading(false);
+      return;
+    }
+
+    setLoading(false);
     fetchProxyAddress();
   };
 
@@ -86,7 +105,7 @@ function useDACProxy() {
     if (proxyAddress) {
       const { abi } = legos.dappsys.dsProxy;
       const proxyContract = new ethers.Contract(proxyAddress, abi, signer);
-      window.analytics.identify(proxyAddress)
+      window.analytics.identify(proxyAddress);
       setProxyContract(proxyContract);
     }
   }, [proxyAddress, signer]);

diff --git a/packages/frontend/features/exit-position/ExitPosition.tsx b/packages/frontend/features/exit-position/ExitPosition.tsx
@@ -87,29 +87,50 @@ const ExitPositionsButton = () => {
                   collateralMarkets,
                 } = await dedgeHelpers.exit.getExitPositionParameters(
                   signer,
-                  proxy.address,
+                  proxy.address
                 );
 
-                const tx = await dedgeHelpers.exit.exitPositionToETH(
-                  address,
-                  etherToBorrowWeiBN,
-                  proxy,
-                  dedgeAddressRegistry.address,
-                  dedgeExitManager.address,
-                  debtMarkets,
-                  collateralMarkets,
-                );
-                window.toastProvider.addMessage(`Exiting positions...`, {
-                  secondaryMessage: "Check progress on Etherscan",
-                  actionHref: `https://etherscan.io/tx/${tx.hash}`,
-                  actionText: "Check",
-                  variant: "processing",
-                });
-                await tx.wait();
-
-                window.toastProvider.addMessage(`Exited Positions!`, {
-                  variant: "success",
-                });
+                let tx = null;
+                try {
+                  tx = await dedgeHelpers.exit.exitPositionToETH(
+                    address,
+                    etherToBorrowWeiBN,
+                    proxy,
+                    dedgeAddressRegistry.address,
+                    dedgeExitManager.address,
+                    debtMarkets,
+                    collateralMarkets
+                  );
+                  window.toastProvider.addMessage(`Exiting positions...`, {
+                    secondaryMessage: "Check progress on Etherscan",
+                    actionHref: `https://etherscan.io/tx/${tx.hash}`,
+                    actionText: "Check",
+                    variant: "processing",
+                  });
+                  await tx.wait();
+
+                  window.toastProvider.addMessage(`Exited Positions!`, {
+                    variant: "success",
+                  });
+                } catch (e) {
+                  if (tx === null) {
+                    window.toastProvider.addMessage(`Transaction cancelled`, {
+                      variant: "failure",
+                    });
+                  } else {
+                    window.toastProvider.addMessage(
+                      `Failed to exit poisitions...`,
+                      {
+                        secondaryMessage: "Check reason on Etherscan",
+                        actionHref: `https://etherscan.io/tx/${tx.hash}`,
+                        actionText: "Check",
+                        variant: "failure",
+                      }
+                    );
+                  }
+                  setLoading(false);
+                  return;
+                }
 
                 window.analytics.track("Exit Positions Success");
                 setLoading(false);

diff --git a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts
@@ -23,7 +23,7 @@ const useAllowVaultTransfer = (selectedVaultId: number) => {
     const allowed = await dedgeHelpers.maker.isUserAllowedVault(
       proxy.address,
       selectedVaultId,
-      makerCdpManager,
+      makerCdpManager
     );
 
     setImportAllowed(Boolean(allowed));
@@ -44,38 +44,54 @@ const useAllowVaultTransfer = (selectedVaultId: number) => {
     const makerDsProxyContract = new ethers.Contract(
       userMakerdaoProxyAddress,
       legos.dappsys.dsProxy.abi,
-      signer,
-    );
-
-    const tx = await dedgeHelpers.maker.dsProxyCdpAllowDacProxy(
-      makerDsProxyContract,
-      proxyAddress,
-      makerCdpManager.address,
-      makerProxyActions.address,
-      selectedVaultId.toString(),
+      signer
     );
 
-    window.toastProvider.addMessage(`Allowing vault #${selectedVaultId}...`, {
-      secondaryMessage: "Check progress on Etherscan",
-      actionHref: `https://etherscan.io/tx/${tx.hash}`,
-      actionText: "Check",
-      variant: "processing",
-    });
-
-    await tx.wait();
-
-    window.toastProvider.addMessage(
-      `Vault #${selectedVaultId} allowance approved`,
-      { variant: "success" },
-    );
-    window.analytics.track("Allow Vault Success", { selectedVaultId });
+    let tx = null;
+    try {
+      tx = await dedgeHelpers.maker.dsProxyCdpAllowDacProxy(
+        makerDsProxyContract,
+        proxyAddress,
+        makerCdpManager.address,
+        makerProxyActions.address,
+        selectedVaultId.toString()
+      );
+      window.toastProvider.addMessage(`Allowing vault #${selectedVaultId}...`, {
+        secondaryMessage: "Check progress on Etherscan",
+        actionHref: `https://etherscan.io/tx/${tx.hash}`,
+        actionText: "Check",
+        variant: "processing",
+      });
+      await tx.wait();
+
+      window.toastProvider.addMessage(
+        `Vault #${selectedVaultId} allowance approved`,
+        { variant: "success" }
+      );
+      window.analytics.track("Allow Vault Success", { selectedVaultId });
+    } catch (e) {
+      if (tx === null) {
+        window.toastProvider.addMessage(`Transaction cancelled`, {
+          variant: "failure",
+        });
+      } else {
+        window.toastProvider.addMessage(`Failed to allow vault...`, {
+          secondaryMessage: "Check reason on Etherscan",
+          actionHref: `https://etherscan.io/tx/${tx.hash}`,
+          actionText: "Check",
+          variant: "failure",
+        });
+      }
+      setLoading(false);
+      return;
+    }
 
     setLoading(false);
     getAllowStatus();
   };
 
   useEffect(() => {
-    if (hasProxy) {
+    if (hasProxy && selectedVaultId !== null) {
       getAllowStatus();
     }
   }, [selectedVaultId]);

diff --git a/packages/frontend/features/import-vault/useImportVault.ts b/packages/frontend/features/import-vault/useImportVault.ts
@@ -44,28 +44,49 @@ const useImportVault = (selectedVaultId) => {
       console.error("Invalid ilk", ilk);
     }
 
-    const tx = await dedgeHelpers.maker.importMakerVault(
-      proxy,
-      dedgeMakerManager.address,
-      dedgeAddressRegistry.address,
-      selectedVaultId.toString(),
-      ilkCTokenEquilavent,
-      ilkJoinAddress,
-      decimals,
-    );
+    let tx = null;
+    try {
+      tx = await dedgeHelpers.maker.importMakerVault(
+        proxy,
+        dedgeMakerManager.address,
+        dedgeAddressRegistry.address,
+        selectedVaultId.toString(),
+        ilkCTokenEquilavent,
+        ilkJoinAddress,
+        decimals
+      );
 
-    window.toastProvider.addMessage(`Importing vault #${selectedVaultId}...`, {
-      secondaryMessage: "Check progress on Etherscan",
-      actionHref: `https://etherscan.io/tx/${tx.hash}`,
-      actionText: "Check",
-      variant: "processing",
-    });
+      window.toastProvider.addMessage(
+        `Importing vault #${selectedVaultId}...`,
+        {
+          secondaryMessage: "Check progress on Etherscan",
+          actionHref: `https://etherscan.io/tx/${tx.hash}`,
+          actionText: "Check",
+          variant: "processing",
+        }
+      );
 
-    await tx.wait();
-    window.toastProvider.addMessage(`Vault #${selectedVaultId} imported!`, {
-      variant: "success",
-    });
-    window.analytics.track("Import Vault Success", { selectedVaultId });
+      await tx.wait();
+      window.toastProvider.addMessage(`Vault #${selectedVaultId} imported!`, {
+        variant: "success",
+      });
+      window.analytics.track("Import Vault Success", { selectedVaultId });
+    } catch (e) {
+      if (tx === null) {
+        window.toastProvider.addMessage(`Transaction cancelled`, {
+          variant: "failure",
+        });
+      } else {
+        window.toastProvider.addMessage(`Failed to import vault...`, {
+          secondaryMessage: "Check reason on Etherscan",
+          actionHref: `https://etherscan.io/tx/${tx.hash}`,
+          actionText: "Check",
+          variant: "failure",
+        });
+      }
+      setLoading(false);
+      return;
+    }
 
     setLoading(false);
     getVaults();