Merge pull request #3612 from balancer/release/1.110.0

Release 1.110.0
balancer · Jul 3, 2023 · e8015e3 · e8015e3 · vercel · Jul 3, 2023
2 parents 4f81e82 + 7d92267
commit e8015e3
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 330 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@balancer/frontend-v2",
-  "version": "1.109.11",
+  "version": "1.110.0",
   "engines": {
     "node": "=16",
     "npm": ">=8"

diff --git a/src/components/_global/BalActionSteps/BalActionSteps.vue b/src/components/_global/BalActionSteps/BalActionSteps.vue
@@ -213,10 +213,9 @@ function handleSignAction(state: TransactionActionState) {
 async function handleTransaction(
   tx: TransactionResponse,
   state: TransactionActionState,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   actionInfo: TransactionActionInfo
 ): Promise<void> {
-  // const { postActionValidation, actionInvalidReason } = actionInfo;
+  const { postActionValidation, actionInvalidReason } = actionInfo;
 
   await txListener(tx, {
     onTxConfirmed: async (receipt: TransactionReceipt) => {
@@ -230,21 +229,21 @@ async function handleTransaction(
 
       state.confirming = false;
 
-      // const isValid = await postActionValidation?.();
-      // if (isValid || !postActionValidation) {
-      const confirmedAt = await getTxConfirmedAt(receipt);
-      state.confirmedAt = dateTimeLabelFor(confirmedAt);
-      state.confirmed = true;
-      if (currentActionIndex.value >= actions.value.length - 1) {
-        emit('success', { receipt, confirmedAt: state.confirmedAt });
+      const isValid = await postActionValidation?.();
+      if (isValid || !postActionValidation) {
+        const confirmedAt = await getTxConfirmedAt(receipt);
+        state.confirmedAt = dateTimeLabelFor(confirmedAt);
+        state.confirmed = true;
+        if (currentActionIndex.value >= actions.value.length - 1) {
+          emit('success', { receipt, confirmedAt: state.confirmedAt });
+        } else {
+          currentActionIndex.value += 1;
+        }
       } else {
-        currentActionIndex.value += 1;
+        // post action validation failed, display reason.
+        if (actionInvalidReason) state.error = actionInvalidReason;
+        state.init = false;
       }
-      // } else {
-      //   // post action validation failed, display reason.
-      //   if (actionInvalidReason) state.error = actionInvalidReason;
-      //   state.init = false;
-      // }
     },
     onTxFailed: () => {
       state.confirming = false;

diff --git a/src/composables/approvals/useTokenApprovalActions.ts b/src/composables/approvals/useTokenApprovalActions.ts
@@ -37,7 +37,7 @@ export default function useTokenApprovalActions() {
   /**
    * COMPOSABLES
    */
-  const { refetchAllowances, approvalsRequired, approvalRequired, getToken } =
+  const { approvalsRequired, approvalRequired, getToken, injectSpenders } =
     useTokens();
   const { t } = useI18n();
   const { getSigner } = useWeb3();
@@ -89,15 +89,17 @@ export default function useTokenApprovalActions() {
     amountsToApprove: AmountToApprove[],
     spender: string
   ): Promise<AmountToApprove[]> {
-    await refetchAllowances();
+    await injectSpenders([spender]);
+
     return approvalsRequired(amountsToApprove, spender);
   }
 
   async function isApprovalValid(
     amountToApprove: AmountToApprove,
     spender: string
   ): Promise<boolean> {
-    await refetchAllowances();
+    await injectSpenders([spender]);
+
     return !approvalRequired(
       amountToApprove.address,
       amountToApprove.amount,

diff --git a/src/composables/queries/useAllowancesQuery.spec.ts b/src/composables/queries/useAllowancesQuery.spec.ts
@@ -35,14 +35,14 @@ test('Returns token allowances from balancer SDK', async () => {
 
   initMulticall(generateMulticallMock(processCall));
 
-  const allowanceContracts = ref([
+  const spenders = ref([
     '0xBA12222222228d8Ba445958a75a0704d566BF2C8',
     '0x6320cD32aA674d2898A68ec82e869385Fc5f7E2f',
     '0x33A99Dcc4C85C014cf12626959111D5898bbCAbF',
   ]);
 
   const { result } = mountComposable(() =>
-    useAllowancesQuery(tokens, allowanceContracts)
+    useAllowancesQuery(tokens, spenders)
   );
 
   const data = await waitForQueryData(result);

diff --git a/src/lib/config/docker/contracts.ts b/src/lib/config/docker/contracts.ts
diff --git a/src/lib/config/docker/index.ts b/src/lib/config/docker/index.ts
diff --git a/src/lib/config/docker/tokens.ts b/src/lib/config/docker/tokens.ts
diff --git a/src/lib/config/goerli/pools.ts b/src/lib/config/goerli/pools.ts
@@ -76,7 +76,7 @@ const pools: Pools = {
     AllowList: [
       '0xbb372d299cc1afa14d5b8691ced1486fa0216f74000200000000000000000757', // DVT /WETH
       '0x4dc5ef9b11fd462d78e197f8a98089933174b2c5000200000000000000000836', //tkn1/tkn2
-      '0x44c5b44fb1995449bdb1d6127b25652e793df012000200000000000000000859'
+      '0x44c5b44fb1995449bdb1d6127b25652e793df012000200000000000000000859',
     ],
   },
   Factories: {

diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts
@@ -1,14 +1,12 @@
 import { Config } from './types';
 
 import arbitrum from './arbitrum';
-import docker from './docker';
 import goerli from './goerli';
+import gnosisChain from './gnosis-chain';
 import mainnet from './mainnet';
 import optimism from './optimism';
 import polygon from './polygon';
-import gnosisChain from './gnosis-chain';
 import zkevm from './zkevm';
-import test from './test';
 
 // We don't import Network from sdk to avoid extra bundle size when loading app (while the SDK is not tree-shakable)
 export enum Network {
@@ -31,10 +29,6 @@ const config: Record<Network | number, Config> = {
   [Network.OPTIMISM]: optimism,
   [Network.GNOSIS]: gnosisChain,
   [Network.ZKEVM]: zkevm,
-  // @ts-ignore
-  12345: test,
-  // @ts-ignore
-  17: docker,
 };
 
 export default config;
diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts
@@ -143,6 +143,7 @@ const pools: Pools = {
       '0xd8721e92ba0f8235b375e9ec9a7b697ec4e2d6c6000200000000000000000575', // 80BIDS-20WETH
       '0x4729f67394030472e853cb61954fe784bfb36c3b000100000000000000000569', // 25WBTC-50USDC-25WETH
       '0x911fc393355fe415a667893d55fff6703c57c72e000200000000000000000574', // 50ETHx-50WETH
+      '0x8334215586e93ee85e3f1a281eaf66e52015754d00020000000000000000057e', // 50WETH-50FIEF
     ],
   },
   Factories: {

diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts
@@ -114,6 +114,7 @@ const pools: Pools = {
       '0x9841438683c2efbfb28c94ec341544b94e4f6dd5000100000000000000000b8f', // WBTC/USDC/PAXG/WETH
       '0x945f337307ea76fdaa2590d083423850f64e247f000100000000000000000b98', // 27wstETH-7WMATIC-25WBTC-7USDC-18stMATIC-8WETH-8DAI
       '0xd7786ac3f9071ddacaf9a5b0bf443c58f8d6cf67000100000000000000000ba8', // 25MKR-25WETH-25DAI-25NEX
+      '0xe93a1e6fb57d2e2be40377841a6477cfe1ef55c2000100000000000000000bbb', // AGA/AGAR/WSTETH/STMATIC/USDC
       '0x7f6a9b65cf1fc091b0e012c2908f0f711dfc95b5000200000000000000000bab', // 80mooMvxMVLP-20wUSDR
       '0xed35f28f837e96f81240ebb82e0e3f518c7e8a2f000100000000000000000bb5', // STARV2-SuperPoolV1
       '0xb49bd41ed56340674e2d2d3cfbfa9807e4e1fe27000100000000000000000bc2', // 25SUSHI-25WETH-25AAVE-25agEUR