Merge branch 'dsa-upgrade' into strategies-v2

This commit is contained in:
Georges KABBOUCHI 2021-08-22 18:38:57 +03:00
commit 2f28caa1de
7 changed files with 123 additions and 83 deletions

View File

@ -67,112 +67,147 @@
</SidebarContextRootContainer> </SidebarContextRootContainer>
</template> </template>
<script> <script lang="ts">
import { computed, defineComponent, ref } from '@nuxtjs/composition-api' import { computed, defineComponent, ref } from "@nuxtjs/composition-api";
import InputNumeric from '~/components/common/input/InputNumeric.vue' import InputNumeric from "~/components/common/input/InputNumeric.vue";
import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position' import { useAaveV2Position } from "~/composables/protocols/useAaveV2Position";
import { useBalances } from '~/composables/useBalances' import { useBalances } from "~/composables/useBalances";
import { useNotification } from '~/composables/useNotification' import { useNotification } from "~/composables/useNotification";
import { useBigNumber } from '~/composables/useBigNumber' import { useBigNumber } from "~/composables/useBigNumber";
import { useFormatting } from '~/composables/useFormatting' import { useFormatting } from "~/composables/useFormatting";
import { useValidators } from '~/composables/useValidators' import { useValidators } from "~/composables/useValidators";
import { useValidation } from '~/composables/useValidation' import { useValidation } from "~/composables/useValidation";
import { useToken } from '~/composables/useToken' import { useToken } from "~/composables/useToken";
import { useParsing } from '~/composables/useParsing' import { useParsing } from "~/composables/useParsing";
import { useMaxAmountActive } from '~/composables/useMaxAmountActive' import { useMaxAmountActive } from "~/composables/useMaxAmountActive";
import { useWeb3 } from '~/composables/useWeb3' import { useWeb3 } from "~/composables/useWeb3";
import atokens from '~/constant/atokens' import atokens from "~/constant/atokens";
import ToggleButton from '~/components/common/input/ToggleButton.vue' import ToggleButton from "~/components/common/input/ToggleButton.vue";
import { useDSA } from '~/composables/useDSA' import { useDSA } from "~/composables/useDSA";
import ButtonCTA from '~/components/common/input/ButtonCTA.vue' import ButtonCTA from "~/components/common/input/ButtonCTA.vue";
import Button from '~/components/Button.vue' import Button from "~/components/Button.vue";
import { useSidebar } from '~/composables/useSidebar' import { useSidebar } from "~/composables/useSidebar";
import DSA from "dsa-connect";
export default defineComponent({ export default defineComponent({
components: { InputNumeric, ToggleButton, ButtonCTA, Button }, components: { InputNumeric, ToggleButton, ButtonCTA, Button },
props: { props: {
tokenKey: { type: String, required: true }, tokenKey: { type: String, required: true }
}, },
setup(props) { setup(props) {
const { close } = useSidebar() const { close } = useSidebar();
const { networkName, account } = useWeb3() const { networkName, account } = useWeb3();
const { dsa } = useDSA() const { dsa } = useDSA();
const { getTokenByKey, valInt } = useToken() const { getTokenByKey, valInt } = useToken();
const { getBalanceByKey, fetchBalances } = useBalances() const { getBalanceByKey, fetchBalances } = useBalances();
const { formatNumber, formatUsdMax, formatUsd } = useFormatting() const { formatNumber, formatUsdMax, formatUsd } = useFormatting();
const { isZero, gt, plus } = useBigNumber() const { isZero, gt, plus } = useBigNumber();
const { parseSafeFloat } = useParsing() const { parseSafeFloat } = useParsing();
const { showPendingTransaction, showWarning } = useNotification() const {
const { status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useAaveV2Position({ showPendingTransaction,
overridePosition: (position) => { showWarning,
if (rootTokenKey.value !== position.key) return position showConfirmedTransaction
} = useNotification();
const {
status,
displayPositions,
maxLiquidation,
liquidationPrice,
liquidationMaxPrice,
refreshPosition
} = useAaveV2Position({
overridePosition: position => {
if (rootTokenKey.value !== position.key) return position;
return { return {
...position, ...position,
supply: plus(position.supply, amountParsed.value).toFixed(), supply: plus(position.supply, amountParsed.value).toFixed()
};
} }
}, });
})
const amount = ref('') const amount = ref("");
const amountParsed = computed(() => parseSafeFloat(amount.value)) 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 token = computed(() => getTokenByKey(rootTokenKey.value));
const symbol = computed(() => token.value?.symbol) const symbol = computed(() => token.value?.symbol);
const decimals = computed(() => token.value?.decimals) const decimals = computed(() => token.value?.decimals);
const balance = computed(() => getBalanceByKey(rootTokenKey.value)) const balance = computed(() => getBalanceByKey(rootTokenKey.value));
const address = computed(() => token.value?.address) const address = computed(() => token.value?.address);
const factor = computed( 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 errors = computed(() => {
const hasAmountValue = !isZero(amount.value) const hasAmountValue = !isZero(amount.value);
const liqValid = gt(factor.value, '0') ? validateLiquidation(status.value, maxLiquidation.value) : null const liqValid = gt(factor.value, "0")
? validateLiquidation(status.value, maxLiquidation.value)
: null;
return { return {
amount: { message: validateAmount(amountParsed.value, balance.value), show: hasAmountValue }, amount: {
message: validateAmount(amountParsed.value, balance.value),
show: hasAmountValue
},
liquidation: { message: liqValid, show: hasAmountValue }, liquidation: { message: liqValid, show: hasAmountValue },
auth: { message: validateIsLoggedIn(!!account.value), show: true }, auth: { message: validateIsLoggedIn(!!account.value), show: true }
} };
}) });
const { errorMessages, isValid } = useValidation(errors) const { errorMessages, isValid } = useValidation(errors);
const pending = ref(false) const pending = ref(false);
async function cast() { 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({ spells.add({
connector: 'aave_v2', connector: "aave_v2",
method: 'deposit', method: "deposit",
args: [address.value, amount, 0, 0], args: [address.value, amount, 0, 0]
}) });
try { try {
const txHash = await dsa.value.cast({ const txHash = await (dsa.value as DSA).cast({
spells, spells,
from: account.value, from: account.value,
}) onReceipt: async receipt => {
showConfirmedTransaction(receipt.transactionHash);
showPendingTransaction(txHash) await fetchBalances(true);
await refreshPosition();
}
});
showPendingTransaction(txHash);
} catch (error) { } catch (error) {
showWarning(error.message) showWarning(error.message);
} }
pending.value = false pending.value = false;
close() close();
} }
return { return {
@ -195,7 +230,7 @@ export default defineComponent({
liquidationMaxPrice, liquidationMaxPrice,
errorMessages, errorMessages,
isValid isValid
};
} }
}, });
})
</script> </script>

View File

@ -1,3 +1,4 @@
import { Spell } from "dsa-connect";
import { useBigNumber } from "../useBigNumber"; import { useBigNumber } from "../useBigNumber";
import { useDSA } from "../useDSA"; import { useDSA } from "../useDSA";
import { useFormatting } from "../useFormatting"; import { useFormatting } from "../useFormatting";
@ -35,7 +36,7 @@ export const use1InchSwap = () => {
unitAmt, unitAmt,
calldata, calldata,
setId setId
}) { }): Spell {
if ( if (
activeNetworkId.value === Network.Polygon || activeNetworkId.value === Network.Polygon ||
activeAccount.value.version == 2 activeAccount.value.version == 2

View File

@ -1,6 +1,5 @@
import { computed, readonly, ref, watch } from "@nuxtjs/composition-api"; import { computed, readonly, ref, watch } from "@nuxtjs/composition-api";
import { useWeb3 } from "./useWeb3"; import { useWeb3 } from "./useWeb3";
//@ts-ignore
import DSA from "dsa-connect"; import DSA from "dsa-connect";
import addresses from "~/constant/addresses"; import addresses from "~/constant/addresses";
import abis from "~/constant/abis"; import abis from "~/constant/abis";
@ -69,7 +68,7 @@ export function useDSA() {
try { try {
const transactionHash = await dsa.value.build({ version: 2 }); const transactionHash = await dsa.value.build({ version: 2 });
accounts.value = await dsa.value.getAccounts(); accounts.value = await dsa.value.getAccounts(account.value);
return transactionHash; return transactionHash;
} catch (error) { } catch (error) {
} finally { } finally {

View File

@ -85,10 +85,12 @@ export function init() {
async ([route, active, dsa], [oldRoute, oldActive, oldDsa]) => { async ([route, active, dsa], [oldRoute, oldActive, oldDsa]) => {
await nextTick(); await nextTick();
//@ts-ignore
const hasPathChanged = !oldRoute || route.path !== oldRoute.path; const hasPathChanged = !oldRoute || route.path !== oldRoute.path;
const hasIsLoggedInChanged = active !== oldActive; const hasIsLoggedInChanged = active !== oldActive;
const hasDsaChanged = dsa !== oldDsa; const hasDsaChanged = dsa !== oldDsa;
//@ts-ignore
const [hash, params] = route.hash.split("?"); const [hash, params] = route.hash.split("?");
if (hasPathChanged){ if (hasPathChanged){
@ -96,6 +98,7 @@ export function init() {
return return
} }
//@ts-ignore
sidebar.value = sidebars[route.path + hash] || sidebars[hash]; sidebar.value = sidebars[route.path + hash] || sidebars[hash];
if (!sidebar.value) { if (!sidebar.value) {

View File

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

View File

@ -18,7 +18,7 @@
"bignumber.js": "^9.0.1", "bignumber.js": "^9.0.1",
"core-js": "^3.15.1", "core-js": "^3.15.1",
"css-color-function": "^1.3.3", "css-color-function": "^1.3.3",
"dsa-connect": "^0.4.3", "dsa-connect": "^0.4.4-beta.2",
"nuxt": "^2.15.7", "nuxt": "^2.15.7",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"slugify": "^1.6.0", "slugify": "^1.6.0",

View File

@ -4675,10 +4675,10 @@ drbg.js@^1.0.1:
create-hash "^1.1.2" create-hash "^1.1.2"
create-hmac "^1.1.4" create-hmac "^1.1.4"
dsa-connect@^0.4.3: dsa-connect@^0.4.4-beta.2:
version "0.4.3" version "0.4.4-beta.2"
resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.3.tgz#382ad7c1b1fa54f963c84adc353dea4bde2f6e80" resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.4-beta.2.tgz#d26739c4d67176e7f29b08cb84ee4f510e0bb830"
integrity sha512-kbG46cvAR2muy2P5jOTVsSZmyDewTAA0lKAeddsrVtpbmys1ujSuDjY/su4At6fAg/iF9/k+ltJAOEvoqt6g9A== integrity sha512-ZRk4OAHD0GFJW74fggNfwXCho4AdWKJdXCyGtuCxwTY7Pm1ycisa/469vD6UjcB8j2CrNDk3AsPgXs5IBmkzDQ==
duplexer3@^0.1.4: duplexer3@^0.1.4:
version "0.1.4" version "0.1.4"