Merge branch 'dsa-upgrade' into strategies-v2

2024-07-29 22:37:06 +00:00 · 2021-08-22 18:38:57 +03:00 · 2021-08-22 18:38:57 +03:00 · 2f28caa1de
commit 2f28caa1de
parent 59bc5369db 27fe5f6e94
7 changed files with 123 additions and 83 deletions
--- a/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue
+++ b/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue
@ -67,112 +67,147 @@
  </SidebarContextRootContainer>
 </template>

-<script>
-import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
-import InputNumeric from '~/components/common/input/InputNumeric.vue'
-import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
-import { useBalances } from '~/composables/useBalances'
-import { useNotification } from '~/composables/useNotification'
-import { useBigNumber } from '~/composables/useBigNumber'
-import { useFormatting } from '~/composables/useFormatting'
-import { useValidators } from '~/composables/useValidators'
-import { useValidation } from '~/composables/useValidation'
-import { useToken } from '~/composables/useToken'
-import { useParsing } from '~/composables/useParsing'
-import { useMaxAmountActive } from '~/composables/useMaxAmountActive'
-import { useWeb3 } from '~/composables/useWeb3'
-import atokens from '~/constant/atokens'
-import ToggleButton from '~/components/common/input/ToggleButton.vue'
-import { useDSA } from '~/composables/useDSA'
-import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
-import Button from '~/components/Button.vue'
-import { useSidebar } from '~/composables/useSidebar'
-
+<script lang="ts">
+import { computed, defineComponent, ref } from "@nuxtjs/composition-api";
+import InputNumeric from "~/components/common/input/InputNumeric.vue";
+import { useAaveV2Position } from "~/composables/protocols/useAaveV2Position";
+import { useBalances } from "~/composables/useBalances";
+import { useNotification } from "~/composables/useNotification";
+import { useBigNumber } from "~/composables/useBigNumber";
+import { useFormatting } from "~/composables/useFormatting";
+import { useValidators } from "~/composables/useValidators";
+import { useValidation } from "~/composables/useValidation";
+import { useToken } from "~/composables/useToken";
+import { useParsing } from "~/composables/useParsing";
+import { useMaxAmountActive } from "~/composables/useMaxAmountActive";
+import { useWeb3 } from "~/composables/useWeb3";
+import atokens from "~/constant/atokens";
+import ToggleButton from "~/components/common/input/ToggleButton.vue";
+import { useDSA } from "~/composables/useDSA";
+import ButtonCTA from "~/components/common/input/ButtonCTA.vue";
+import Button from "~/components/Button.vue";
+import { useSidebar } from "~/composables/useSidebar";
+import DSA from "dsa-connect";
 export default defineComponent({
  components: { InputNumeric, ToggleButton, ButtonCTA, Button },
  props: {
-    tokenKey: { type: String, required: true },
+    tokenKey: { type: String, required: true }
  },
  setup(props) {
-    const { close } = useSidebar()
-    const { networkName, account } = useWeb3()
-    const { dsa } = useDSA()
-    const { getTokenByKey, valInt } = useToken()
-    const { getBalanceByKey, fetchBalances } = useBalances()
-    const { formatNumber, formatUsdMax, formatUsd } = useFormatting()
-    const { isZero, gt, plus } = useBigNumber()
-    const { parseSafeFloat } = useParsing()
-    const { showPendingTransaction, showWarning } = useNotification()
-    const { status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useAaveV2Position({
-      overridePosition: (position) => {
-        if (rootTokenKey.value !== position.key) return position
+    const { close } = useSidebar();
+    const { networkName, account } = useWeb3();
+    const { dsa } = useDSA();
+    const { getTokenByKey, valInt } = useToken();
+    const { getBalanceByKey, fetchBalances } = useBalances();
+    const { formatNumber, formatUsdMax, formatUsd } = useFormatting();
+    const { isZero, gt, plus } = useBigNumber();
+    const { parseSafeFloat } = useParsing();
+    const {
+      showPendingTransaction,
+      showWarning,
+      showConfirmedTransaction
+    } = useNotification();
+    const {
+      status,
+      displayPositions,
+      maxLiquidation,
+      liquidationPrice,
+      liquidationMaxPrice,
+      refreshPosition
+    } = useAaveV2Position({
+      overridePosition: position => {
+        if (rootTokenKey.value !== position.key) return position;

        return {
          ...position,
-          supply: plus(position.supply, amountParsed.value).toFixed(),
+          supply: plus(position.supply, amountParsed.value).toFixed()
+        };
      }
-      },
-    })
+    });

-    const amount = ref('')
-    const amountParsed = computed(() => parseSafeFloat(amount.value))
+    const amount = ref("");
+    const amountParsed = computed(() => parseSafeFloat(amount.value));

-    const rootTokenKey = computed(() => atokens[networkName.value].rootTokens.includes(props.tokenKey) ? props.tokenKey : 'eth')
+    const rootTokenKey = computed(() =>
+      atokens[networkName.value].rootTokens.includes(props.tokenKey)
+        ? props.tokenKey
+        : "eth"
+    );

-    const token = computed(() => getTokenByKey(rootTokenKey.value))
-    const symbol = computed(() => token.value?.symbol)
-    const decimals = computed(() => token.value?.decimals)
-    const balance = computed(() => getBalanceByKey(rootTokenKey.value))
-    const address = computed(() => token.value?.address)
+    const token = computed(() => getTokenByKey(rootTokenKey.value));
+    const symbol = computed(() => token.value?.symbol);
+    const decimals = computed(() => token.value?.decimals);
+    const balance = computed(() => getBalanceByKey(rootTokenKey.value));
+    const address = computed(() => token.value?.address);

    const factor = computed(
-      () => displayPositions.value?.find((position) => rootTokenKey.value === position.key)?.factor
-    )
+      () =>
+        displayPositions.value?.find(
+          position => rootTokenKey.value === position.key
+        )?.factor
+    );

-    const { toggle, isMaxAmount } = useMaxAmountActive(amount, balance)
+    const { toggle, isMaxAmount } = useMaxAmountActive(amount, balance);

-    const { validateAmount, validateLiquidation, validateIsLoggedIn } = useValidators()
+    const {
+      validateAmount,
+      validateLiquidation,
+      validateIsLoggedIn
+    } = useValidators();
    const errors = computed(() => {
-      const hasAmountValue = !isZero(amount.value)
-      const liqValid = gt(factor.value, '0') ? validateLiquidation(status.value, maxLiquidation.value) : null
+      const hasAmountValue = !isZero(amount.value);
+      const liqValid = gt(factor.value, "0")
+        ? validateLiquidation(status.value, maxLiquidation.value)
+        : null;

      return {
-        amount: { message: validateAmount(amountParsed.value, balance.value), show: hasAmountValue },
+        amount: {
+          message: validateAmount(amountParsed.value, balance.value),
+          show: hasAmountValue
+        },
        liquidation: { message: liqValid, show: hasAmountValue },
-        auth: { message: validateIsLoggedIn(!!account.value), show: true },
-      }
-    })
-    const { errorMessages, isValid } = useValidation(errors)
+        auth: { message: validateIsLoggedIn(!!account.value), show: true }
+      };
+    });
+    const { errorMessages, isValid } = useValidation(errors);

-    const pending = ref(false)
+    const pending = ref(false);

    async function cast() {
-      pending.value = true
+      pending.value = true;

-      const amount = isMaxAmount.value ? dsa.value.maxValue : valInt(amountParsed.value, decimals.value)
+      const amount = isMaxAmount.value
+        ? dsa.value.maxValue
+        : valInt(amountParsed.value, decimals.value);

-      const spells = dsa.value.Spell()
+      const spells = dsa.value.Spell();

      spells.add({
-        connector: 'aave_v2',
-        method: 'deposit',
-        args: [address.value, amount, 0, 0],
-      })
+        connector: "aave_v2",
+        method: "deposit",
+        args: [address.value, amount, 0, 0]
+      });

      try {
-        const txHash = await dsa.value.cast({
+        const txHash = await (dsa.value as DSA).cast({
          spells,
          from: account.value,
-        })
+          onReceipt: async receipt => {
+            showConfirmedTransaction(receipt.transactionHash);

-        showPendingTransaction(txHash)
+            await fetchBalances(true);
+            await refreshPosition();
+          }
+        });
+
+        showPendingTransaction(txHash);
      } catch (error) {
-        showWarning(error.message)
+        showWarning(error.message);
      }

-      pending.value = false
+      pending.value = false;

-      close()
+      close();
    }

    return {
@ -195,7 +230,7 @@ export default defineComponent({
      liquidationMaxPrice,
      errorMessages,
      isValid
+    };
  }
-  },
-})
+});
 </script>
--- a/composables/swap/use1InchSwap.ts
+++ b/composables/swap/use1InchSwap.ts
@ -1,3 +1,4 @@
+import { Spell } from "dsa-connect";
 import { useBigNumber } from "../useBigNumber";
 import { useDSA } from "../useDSA";
 import { useFormatting } from "../useFormatting";
@ -35,7 +36,7 @@ export const use1InchSwap = () => {
    unitAmt,
    calldata,
    setId
-  }) {
+  }): Spell {
    if (
      activeNetworkId.value === Network.Polygon ||
      activeAccount.value.version == 2
--- a/composables/useDSA.ts
+++ b/composables/useDSA.ts
@ -1,6 +1,5 @@
 import { computed, readonly, ref, watch } from "@nuxtjs/composition-api";
 import { useWeb3 } from "./useWeb3";
-//@ts-ignore
 import DSA from "dsa-connect";
 import addresses from "~/constant/addresses";
 import abis from "~/constant/abis";
@ -69,7 +68,7 @@ export function useDSA() {
    try {
      const transactionHash = await dsa.value.build({ version: 2 });

-      accounts.value = await dsa.value.getAccounts();
+      accounts.value = await dsa.value.getAccounts(account.value);
      return transactionHash;
    } catch (error) {
    } finally {
--- a/composables/useSidebar.ts
+++ b/composables/useSidebar.ts
@ -85,10 +85,12 @@ export function init() {
    async ([route, active, dsa], [oldRoute, oldActive, oldDsa]) => {
      await nextTick();

+      //@ts-ignore
      const hasPathChanged = !oldRoute || route.path !== oldRoute.path;
      const hasIsLoggedInChanged = active !== oldActive;
      const hasDsaChanged = dsa !== oldDsa;

+      //@ts-ignore
      const [hash, params] = route.hash.split("?");
      
      if (hasPathChanged){
@ -96,6 +98,7 @@ export function init() {
        return
      }

+       //@ts-ignore
      sidebar.value = sidebars[route.path + hash] || sidebars[hash];
        
      if (!sidebar.value) {
--- a/composables/useWeb3.ts
+++ b/composables/useWeb3.ts
@ -23,7 +23,7 @@ const chains = [
 ];

 const active = ref(false);
-const chainId = ref<number>();
+const chainId = ref<1|137>();
 const networkName = computed<Network>(
  () => chains.find(c => c.chainId === chainId.value)?.name || Network.Mainnet
 );
@ -60,6 +60,7 @@ export function useWeb3() {
      account.value = web3Provider.accounts[0];
    }
    let newWeb3 = new Web3(web3Provider);
+     //@ts-ignore
    chainId.value = await newWeb3.eth.getChainId();
    web3.value = newWeb3;

@ -118,6 +119,7 @@ export function useWeb3() {
      return;
    }
    let newWeb3 = new Web3(web3Provider);
+     //@ts-ignore
    chainId.value = await newWeb3.eth.getChainId();
    web3.value = newWeb3;
  };
--- a/package.json
+++ b/package.json
@ -18,7 +18,7 @@
    "bignumber.js": "^9.0.1",
    "core-js": "^3.15.1",
    "css-color-function": "^1.3.3",
-    "dsa-connect": "^0.4.3",
+    "dsa-connect": "^0.4.4-beta.2",
    "nuxt": "^2.15.7",
    "qrcode": "^1.4.4",
    "slugify": "^1.6.0",
--- a/yarn.lock
+++ b/yarn.lock
@ -4675,10 +4675,10 @@ drbg.js@^1.0.1:
    create-hash "^1.1.2"
    create-hmac "^1.1.4"

-dsa-connect@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.3.tgz#382ad7c1b1fa54f963c84adc353dea4bde2f6e80"
-  integrity sha512-kbG46cvAR2muy2P5jOTVsSZmyDewTAA0lKAeddsrVtpbmys1ujSuDjY/su4At6fAg/iF9/k+ltJAOEvoqt6g9A==
+dsa-connect@^0.4.4-beta.2:
+  version "0.4.4-beta.2"
+  resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.4-beta.2.tgz#d26739c4d67176e7f29b08cb84ee4f510e0bb830"
+  integrity sha512-ZRk4OAHD0GFJW74fggNfwXCho4AdWKJdXCyGtuCxwTY7Pm1ycisa/469vD6UjcB8j2CrNDk3AsPgXs5IBmkzDQ==

 duplexer3@^0.1.4:
  version "0.1.4"