Merge branch 'main' into feat/subSteps

Author: agualis

.github/workflows/checks.yml

@@ -6,6 +6,7 @@ on:
 env:
   NEXT_PUBLIC_BALANCER_API_URL: https://api-v3.balancer.fi/graphql
   NEXT_PUBLIC_WALLET_CONNECT_ID: ${{ secrets.NEXT_PUBLIC_WALLET_CONNECT_ID }}
+  NEXT_PRIVATE_ALCHEMY_KEY: ${{ secrets.PRIVATE_ALCHEMY_KEY }}
   NEXT_PRIVATE_DRPC_KEY: ${{ secrets.PRIVATE_DRPC_KEY }}
 
 jobs:

lib/modules/pool/__mocks__/getPoolMock.ts

@@ -39,5 +39,11 @@ export async function getPoolMock(
     .then(response => response.json())
     .then(result => result.data)) as GetPoolQuery
 
+  if (!getPoolQuery.pool) {
+    throw new Error(
+      `Pool not found in api ${process.env.NEXT_PUBLIC_BALANCER_API_URL} network ${chain} poolId ${poolId}`
+    )
+  }
+
   return getPoolQuery.pool as GqlPoolElement
 }

lib/modules/tokens/approvals/permit2/permit2.helpers.ts

@@ -1,18 +1,23 @@
 import { SdkQueryAddLiquidityOutput } from '@/lib/modules/pool/actions/add-liquidity/add-liquidity.types'
 import { getNowTimestampInSecs } from '@/lib/shared/utils/time'
 import { AllowedAmountsByTokenAddress, ExpirationByTokenAddress } from './usePermit2Allowance'
+import { Address } from 'viem'
+import { TokenAmount } from '@balancer/sdk'
 
 export function hasValidPermit2(
   queryOutput?: SdkQueryAddLiquidityOutput,
   expirations?: ExpirationByTokenAddress,
   allowedAmounts?: AllowedAmountsByTokenAddress
 ): boolean {
   if (!expirations || !allowedAmounts) return false
-  const isValid = !!queryOutput?.sdkQueryOutput.amountsIn.every(
-    t =>
-      t.amount === 0n ||
-      (expirations[t.token.address] >= getNowTimestampInSecs() &&
-        allowedAmounts[t.token.address] >= t.amount)
-  )
+
+  const approvalExpired = (tokenAddress: Address) =>
+    expirations[tokenAddress] >= getNowTimestampInSecs()
+  const alreadyAllowed = (amountIn: TokenAmount) =>
+    !approvalExpired(amountIn.token.address) &&
+    allowedAmounts[amountIn.token.address] >= amountIn.amount
+  const amountInValid = (amountIn: TokenAmount) =>
+    amountIn.amount === 0n || alreadyAllowed(amountIn)
+  const isValid = !!queryOutput?.sdkQueryOutput.amountsIn.every(amountInValid)
   return isValid
 }

lib/modules/tokens/approvals/useTokenApprovalSteps.tsx

@@ -64,17 +64,28 @@ export function useTokenApprovalSteps({
   })
 
   const steps = useMemo(() => {
-    return tokenAmountsToApprove.map(tokenAmountToApprove => {
+    return tokenAmountsToApprove.map((tokenAmountToApprove, index) => {
       const { tokenAddress, requiredRawAmount, requestedRawAmount } = tokenAmountToApprove
+      // USDT edge-case: requires setting approval to 0n before adjusting the value up again
+      const isApprovingZeroForDoubleApproval =
+        requiresDoubleApproval(chain, tokenAddress) && requiredRawAmount === 0n
+      const id = isApprovingZeroForDoubleApproval ? `${tokenAddress}-0` : tokenAddress
       const token = getToken(tokenAddress, chain)
       const symbol = bptSymbol ?? (token && token?.symbol) ?? 'Unknown'
       const labels = buildTokenApprovalLabels({ actionType, symbol, isPermit2 })
-      const id = tokenAddress
 
       const isComplete = () => {
         const isAllowed = tokenAllowances.allowanceFor(tokenAddress) >= requiredRawAmount
-        // USDT edge-case: requires setting approval to 0n before adjusting the value up again
-        if (requiresDoubleApproval(chain, tokenAddress)) return isAllowed
+        if (isApprovingZeroForDoubleApproval) {
+          // Edge case USDT case is completed if:
+          // - The allowance is 0n
+          // - The allowance is greater than the required amount (of the next step)
+          return (
+            tokenAllowances.allowanceFor(tokenAddress) === 0n ||
+            tokenAllowances.allowanceFor(tokenAddress) >=
+              tokenAmountsToApprove[index + 1].requiredRawAmount
+          )
+        }
         return requiredRawAmount > 0n && isAllowed
       }
 

package.json

@@ -46,7 +46,7 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@nikolovlazar/chakra-ui-prose": "^1.2.1",
-    "@rainbow-me/rainbowkit": "^2.1.6",
+    "@rainbow-me/rainbowkit": "^2.1.7",
     "@sentry/nextjs": "^8.13.0",
     "@studio-freight/react-lenis": "^0.0.47",
     "@tanstack/react-query": "^5.56.2",
@@ -85,8 +85,8 @@
     "use-debounce": "^10.0.0",
     "use-sound": "^4.0.1",
     "usehooks-ts": "^3.1.0",
-    "viem": "^2.21.6",
-    "wagmi": "^2.12.11"
+    "viem": "^2.21.18",
+    "wagmi": "^2.12.16"
   },
   "devDependencies": {
     "@apollo/experimental-nextjs-app-support": "^0.11.3",

pnpm-lock.yaml

@@ -8,7 +8,7 @@ export async function setup() {
   for (const chain of Object.values(testChains)) {
     console.log('Starting proxy ', {
       port: chain.port,
-      forkUrl: getForkUrl(ANVIL_NETWORKS[chain.name], false),
+      forkUrl: getForkUrl(chain.name, false),
       forkBlockNumber: ANVIL_NETWORKS[chain.name].forkBlockNumber,
     })
     promises.push(
@@ -17,7 +17,7 @@ export async function setup() {
         host: '::',
         options: {
           chainId: chain.id,
-          forkUrl: getForkUrl(ANVIL_NETWORKS[chain.name], false),
+          forkUrl: getForkUrl(chain.name, false),
           forkBlockNumber: ANVIL_NETWORKS[chain.name].forkBlockNumber,
           noMining: false,
         },

test/anvil/anvil-global-setup.ts

@@ -83,7 +83,14 @@ export function getTestRpcSetup(networkName: NetworksWithFork) {
   return { port, rpcUrl }
 }
 
-export function getForkUrl(network: NetworkSetup, verbose = false): string {
+/*
+ *  We currently use Drpc for all integration tests (Ethereum, Polygon and Sepolia networks)
+ *  In case you want to use a different RPC, you can set something like this (i.e. ALCHEMY)
+ *     const privateAlchemyKey = process.env['NEXT_PRIVATE_ALCHEMY_KEY']
+ *     return `https://polygon-mainnet.g.alchemy.com/v2/${privateAlchemyKey}`
+ */
+export function getForkUrl(networkName: NetworksWithFork, verbose = false): string {
+  const network = ANVIL_NETWORKS[networkName]
   const privateKey = process.env['NEXT_PRIVATE_DRPC_KEY']
   const dRpcUrl = (chainName: string) =>
     `https://lb.drpc.org/ogrpc?network=${chainName}&dkey=${privateKey}`