chore(dca-backend): bump uniswap ability to version 8.0.0

Author: awisniew207

README.md

@@ -9,7 +9,7 @@ This project demonstrates how to schedule and execute recurring DCA (Dollar-Cost
 - Node ^22.16.0
 - pnpm ^10.7.0
 - Docker or a local MongoDB instance
-- A Vincent App with ERC20 approval and Uniswap swap abilities
+- A Vincent App with Uniswap swap ability
 
 ## Monorepo Structure
 
@@ -21,7 +21,6 @@ This codebase is composed of three main parts:
   - Express.js API server used by the frontend
   - Agenda-based job scheduler that runs DCA jobs
   - Integration with a Vincent App to execute swaps on behalf of users
-    - Vincent ERC20 Approval ability: authorizes Uniswap to spend user tokens
     - Vincent Uniswap Swap ability: executes the actual token swaps
 
 ## Packages
@@ -45,11 +44,10 @@ To run this code and sign on behalf of your delegators, create your own Vincent
 
 1. Go to the [Vincent Dashboard](https://dashboard.heyvincent.ai/) and log in as a builder.
 2. Create a new app similar to [wBTC DCA](https://dashboard.heyvincent.ai/user/appId/9796398001/connect).
-3. Add the ERC20 Approval ability.
-4. Add the Uniswap Swap ability.
-5. Publish the app.
-6. Once users can connect to it, configure the backend with your App ID and the delegatee private key via environment variables. You can use the Deploy on Railway button below to deploy the entire app.
-7. Once deployed, you'll need to update the `App User URL` and `Redirect URIs` to the URL deployed from Railway.
+3. Add the Uniswap Swap ability.
+4. Publish the app.
+5. Once users can connect to it, configure the backend with your App ID and the delegatee private key via environment variables. You can use the Deploy on Railway button below to deploy the entire app.
+6. Once deployed, you'll need to update the `App User URL` and `Redirect URIs` to the URL deployed from Railway.
 
 [![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/UY2g5I?referralCode=iNEMKY&utm_medium=integration&utm_source=template&utm_campaign=generic)
 

packages/dca-backend/package.json

@@ -49,9 +49,8 @@
     "@lit-protocol/contracts-sdk": "^7.3.0",
     "@lit-protocol/lit-node-client": "^7.3.0",
     "@lit-protocol/types": "^7.3.0",
-    "@lit-protocol/vincent-ability-erc20-approval": "3.1.0",
-    "@lit-protocol/vincent-ability-uniswap-swap": "5.0.0",
-    "@lit-protocol/vincent-app-sdk": "2.2.1",
+    "@lit-protocol/vincent-ability-uniswap-swap": "8.0.0",
+    "@lit-protocol/vincent-app-sdk": "2.2.2",
     "@lit-protocol/vincent-contracts-sdk": "^1.0.1",
     "@lit-protocol/vincent-scaffold-sdk": "1.1.9-mma",
     "@noble/secp256k1": "^2.2.3",

packages/dca-backend/src/lib/agenda/jobs/executeDCASwap/executeDCASwap.ts

@@ -4,6 +4,7 @@ import consola from 'consola';
 import { ethers } from 'ethers';
 
 import { IRelayPKP } from '@lit-protocol/types';
+import { AbilityAction } from '@lit-protocol/vincent-ability-uniswap-swap';
 
 import { type AppData, assertPermittedVersion } from '../jobVersion';
 import {
@@ -15,11 +16,7 @@ import {
   getUserPermittedVersion,
   handleOperationExecution,
 } from './utils';
-import {
-  getErc20ApprovalToolClient,
-  getSignedUniswapQuote,
-  getUniswapToolClient,
-} from './vincentAbilities';
+import { getSignedUniswapQuote, getUniswapAbilityClient } from './vincentAbilities';
 import { env } from '../../../env';
 import { normalizeError } from '../../../error';
 import { PurchasedCoin } from '../../../mongo/models/PurchasedCoin';
@@ -36,69 +33,22 @@ export type JobParams = {
 
 const { BASE_RPC_URL, VINCENT_APP_ID } = env;
 
-const BASE_CHAIN_ID = 8453;
 const BASE_USDC_ADDRESS = '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913';
 const BASE_WBTC_ADDRESS = '0x0555E30da8f98308EdB960aa94C0Db47230d2B9c';
-const BASE_UNISWAP_V3_ROUTER = '0x2626664c2603336E57B271c5C0b26F421741e481';
 
 const baseProvider = new ethers.providers.StaticJsonRpcProvider(BASE_RPC_URL);
 const usdcContract = getERC20Contract(BASE_USDC_ADDRESS, baseProvider);
 
-async function addUsdcApproval({
-  ethAddress,
-  usdcAmount,
-}: {
-  ethAddress: `0x${string}`;
-  usdcAmount: ethers.BigNumber;
-}): Promise<`0x${string}` | undefined> {
-  const erc20ApprovalToolClient = getErc20ApprovalToolClient();
-  const approvalParams = {
-    alchemyGasSponsor,
-    alchemyGasSponsorApiKey,
-    alchemyGasSponsorPolicyId,
-    chainId: BASE_CHAIN_ID,
-    rpcUrl: BASE_RPC_URL,
-    spenderAddress: BASE_UNISWAP_V3_ROUTER,
-    tokenAddress: BASE_USDC_ADDRESS,
-    tokenAmount: usdcAmount.mul(5).toString(), // Approve 5x the amount to spend so we don't wait for approval tx's every time we run
-  };
-  const approvalContext = {
-    delegatorPkpEthAddress: ethAddress,
-  };
-
-  // Running precheck to prevent sending approval tx if not needed or will fail
-  const approvalPrecheckResult = await erc20ApprovalToolClient.precheck(
-    approvalParams,
-    approvalContext
-  );
-  if (!approvalPrecheckResult.success) {
-    throw new Error(`ERC20 approval tool precheck failed: ${approvalPrecheckResult}`);
-  } else if (approvalPrecheckResult.result.alreadyApproved) {
-    // No need to send tx, allowance is already at that amount
-    return undefined;
-  }
-
-  // Sending approval tx
-  const approvalExecutionResult = await erc20ApprovalToolClient.execute(
-    approvalParams,
-    approvalContext
-  );
-  consola.trace('ERC20 Approval Vincent Tool Response:', approvalExecutionResult);
-  if (!approvalExecutionResult.success) {
-    throw new Error(`ERC20 approval tool execution failed: ${approvalExecutionResult}`);
-  }
-
-  return approvalExecutionResult.result.approvalTxHash as `0x${string}`;
-}
-
 async function handleSwapExecution({
   delegatorAddress,
+  pkpPublicKey,
   tokenInAddress,
   tokenInAmount,
   tokenInDecimals,
   tokenOutAddress,
 }: {
   delegatorAddress: `0x${string}`;
+  pkpPublicKey: `0x${string}`;
   tokenInAddress: `0x${string}`;
   tokenInAmount: ethers.BigNumber;
   tokenInDecimals: number;
@@ -112,27 +62,75 @@ async function handleSwapExecution({
     tokenInAmount: ethers.utils.formatUnits(tokenInAmount, tokenInDecimals),
   });
 
-  const uniswapToolClient = getUniswapToolClient();
-  const swapParams = {
+  const uniswapToolClient = getUniswapAbilityClient();
+  const swapContext = {
+    delegatorPkpEthAddress: delegatorAddress,
+  };
+
+  const approveParams = {
+    alchemyGasSponsor,
+    alchemyGasSponsorApiKey,
+    alchemyGasSponsorPolicyId,
     signedUniswapQuote,
+    action: AbilityAction.Approve as 'approve',
     rpcUrlForUniswap: BASE_RPC_URL,
   };
-  const swapContext = {
-    delegatorPkpEthAddress: delegatorAddress,
+
+  const approvePrecheckResult = await uniswapToolClient.precheck(approveParams, swapContext);
+  consola.trace('Uniswap Approve Precheck Response:', approvePrecheckResult);
+  if (!approvePrecheckResult.success) {
+    throw new Error(`Uniswap approve precheck failed: ${approvePrecheckResult.result?.reason}`);
+  }
+
+  const approveExecutionResult = await uniswapToolClient.execute(approveParams, swapContext);
+  consola.trace('Uniswap Approve Vincent Tool Response:', approveExecutionResult);
+  if (approveExecutionResult.success === false) {
+    throw new Error(`Uniswap tool approval failed: ${approveExecutionResult.runtimeError}`);
+  }
+
+  const approveResult = approveExecutionResult.result!;
+  const approveOperationHash = (approveResult.approvalTxUserOperationHash ||
+    approveResult.approvalTxHash) as `0x${string}` | undefined;
+
+  if (approveOperationHash) {
+    consola.debug('Waiting for approval transaction to be mined...');
+    await handleOperationExecution({
+      pkpPublicKey,
+      isSponsored: alchemyGasSponsor,
+      operationHash: approveOperationHash,
+      provider: baseProvider,
+    });
+    consola.debug('Approval transaction mined successfully');
+  } else {
+    consola.debug('Approval already sufficient, no transaction needed');
+  }
+
+  const swapParams = {
+    alchemyGasSponsor,
+    alchemyGasSponsorApiKey,
+    alchemyGasSponsorPolicyId,
+    signedUniswapQuote,
+    action: AbilityAction.Swap as 'swap',
+    rpcUrlForUniswap: BASE_RPC_URL,
   };
 
   const swapPrecheckResult = await uniswapToolClient.precheck(swapParams, swapContext);
+  consola.trace('Uniswap Swap Precheck Response:', swapPrecheckResult);
   if (!swapPrecheckResult.success) {
-    throw new Error(`Uniswap tool precheck failed: ${swapPrecheckResult}`);
+    throw new Error(`Uniswap swap precheck failed: ${swapPrecheckResult.result?.reason}`);
   }
 
   const swapExecutionResult = await uniswapToolClient.execute(swapParams, swapContext);
   consola.trace('Uniswap Swap Vincent Tool Response:', swapExecutionResult);
-  if (!swapExecutionResult.success) {
-    throw new Error(`Uniswap tool execution failed: ${swapExecutionResult}`);
+  if (swapExecutionResult.success === false) {
+    throw new Error(`Uniswap tool execution failed: ${swapExecutionResult.runtimeError}`);
   }
 
-  return swapExecutionResult.result.swapTxHash as `0x${string}`;
+  const result = swapExecutionResult.result!;
+  const operationHash = (result.swapTxUserOperationHash ||
+    result.swapTxHash) as `0x${string}`;
+
+  return operationHash;
 }
 
 export async function executeDCASwap(job: JobType, sentryScope: Sentry.Scope): Promise<void> {
@@ -200,32 +198,22 @@ export async function executeDCASwap(job: JobType, sentryScope: Sentry.Scope): P
       usdcBalance: ethers.utils.formatUnits(usdcBalance, 6),
     });
 
-    const approvalHash = await addUsdcApproval({
-      ethAddress: ethAddress as `0x${string}`,
-      usdcAmount: _purchaseAmount,
-    });
-    sentryScope.addBreadcrumb({
-      data: {
-        approvalHash,
-      },
-    });
-
-    if (approvalHash) {
-      await handleOperationExecution({
-        isSponsored: alchemyGasSponsor,
-        operationHash: approvalHash,
-        pkpPublicKey: publicKey,
-        provider: baseProvider,
-      });
-    }
-
-    const swapHash = await handleSwapExecution({
+    const swapOperationHash = await handleSwapExecution({
       delegatorAddress: ethAddress as `0x${string}`,
+      pkpPublicKey: publicKey as `0x${string}`,
       tokenInAddress: BASE_USDC_ADDRESS,
       tokenInAmount: _purchaseAmount,
       tokenInDecimals: 6,
       tokenOutAddress: BASE_WBTC_ADDRESS,
     });
+
+    const { txHash: swapHash } = await handleOperationExecution({
+      isSponsored: alchemyGasSponsor,
+      operationHash: swapOperationHash,
+      pkpPublicKey: publicKey,
+      provider: baseProvider,
+    });
+
     sentryScope.addBreadcrumb({
       data: {
         swapHash,

packages/dca-backend/src/lib/agenda/jobs/executeDCASwap/utils/handle-operation-execution.ts

@@ -23,6 +23,7 @@ export async function handleOperationExecution({
   let useropHash;
   if (!isSponsored) {
     txHash = operationHash;
+    await waitForTransaction({ confirmations, provider, transactionHash: txHash });
   } else {
     useropHash = operationHash;
     txHash = await waitForUserOperation({

packages/dca-backend/src/lib/agenda/jobs/executeDCASwap/vincentAbilities.ts

@@ -1,5 +1,4 @@
 import { LitNodeClient } from '@lit-protocol/lit-node-client';
-import { bundledVincentAbility as erc20ApprovalBundledVincentAbility } from '@lit-protocol/vincent-ability-erc20-approval';
 import {
   bundledVincentAbility as uniswapSwapBundledVincentAbility,
   getSignedUniswapQuote as getSignedUniswapQuoteAction,
@@ -29,14 +28,7 @@ export async function getSignedUniswapQuote(
   });
 }
 
-export function getErc20ApprovalToolClient() {
-  return getVincentAbilityClient({
-    bundledVincentAbility: erc20ApprovalBundledVincentAbility,
-    ethersSigner: delegateeSigner,
-  });
-}
-
-export function getUniswapToolClient() {
+export function getUniswapAbilityClient() {
   return getVincentAbilityClient({
     bundledVincentAbility: uniswapSwapBundledVincentAbility,
     ethersSigner: delegateeSigner,

packages/dca-frontend/package.json

@@ -26,7 +26,7 @@
     "@lit-protocol/constants": "^7.3.0",
     "@lit-protocol/lit-node-client": "^7.3.0",
     "@lit-protocol/types": "^7.3.0",
-    "@lit-protocol/vincent-app-sdk": "2.0.2-mma",
+    "@lit-protocol/vincent-app-sdk": "2.2.2",
     "@radix-ui/react-checkbox": "^1.1.4",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.6",