@lit-protocol/vincent-ability-uniswap-swap 5.0.0 → 7.0.0

package/dist/src/lib/vincent-ability.js

@@ -7,9 +7,10 @@ const ethers_1 = require("ethers");
 const ability_helpers_1 = require("./ability-helpers");
 const ability_checks_1 = require("./ability-checks");
 const schemas_1 = require("./schemas");
-const check_erc20_allowance_1 = require("./ability-checks/check-erc20-allowance");
 const validate_signed_uniswap_quote_1 = require("./prepare/validate-signed-uniswap-quote");
 const vincent_prepare_metadata_json_1 = tslib_1.__importDefault(require("../generated/vincent-prepare-metadata.json"));
+const types_1 = require("./types");
+const send_erc20_approval_tx_1 = require("./ability-helpers/send-erc20-approval-tx");
 const bigintReplacer = (key, value) => {
     return typeof value === 'bigint' ? value.toString() : value;
 };
@@ -21,12 +22,23 @@ exports.vincentAbility = (0, vincent_ability_sdk_1.createVincentAbility)({
     supportedPolicies: (0, vincent_ability_sdk_1.supportedPoliciesForAbility)([]),
     executeSuccessSchema: schemas_1.executeSuccessSchema,
     executeFailSchema: schemas_1.executeFailSchema,
+    precheckSuccessSchema: schemas_1.precheckSuccessSchema,
     precheckFailSchema: schemas_1.precheckFailSchema,
     precheck: async ({ abilityParams }, { succeed, fail, delegation: { delegatorPkpInfo } }) => {
         console.log('Prechecking UniswapSwapAbility', JSON.stringify(abilityParams, exports.bigintReplacer, 2));
         // TODO: Rewrite checks to use `createAllowResult` and `createDenyResult` so we always know when we get a runtime err
-        const { rpcUrlForUniswap, signedUniswapQuote } = abilityParams;
+        const { action, alchemyGasSponsor, rpcUrlForUniswap, signedUniswapQuote } = abilityParams;
         const { quote } = signedUniswapQuote;
+        if (!action) {
+            return fail({
+                reason: `The action parameter is required. Please use one of the following: ${Object.values(types_1.AbilityAction).join(', ')}`,
+            });
+        }
+        if (!Object.values(types_1.AbilityAction).includes(action)) {
+            return fail({
+                reason: `The provided action: ${action} is not supported. Please use one of the following: ${Object.values(types_1.AbilityAction).join(', ')}`,
+            });
+        }
         try {
             (0, validate_signed_uniswap_quote_1.validateSignedUniswapQuote)({
                 prepareSuccessResult: signedUniswapQuote,
@@ -41,55 +53,95 @@ exports.vincentAbility = (0, vincent_ability_sdk_1.createVincentAbility)({
         }
         const delegatorPkpAddress = delegatorPkpInfo.ethAddress;
         const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider(rpcUrlForUniswap);
-        try {
-            await (0, ability_checks_1.checkNativeTokenBalance)({
+        // 1. If alchemyGasSponsor is not enabled, we need to check if the delegator has enough native token balance to pay for gas fees
+        let checkNativeTokenBalanceResultSuccess;
+        if (!alchemyGasSponsor) {
+            const checkNativeTokenBalanceResult = await (0, ability_checks_1.checkNativeTokenBalance)({
                 provider,
                 pkpEthAddress: delegatorPkpAddress,
             });
+            if (!checkNativeTokenBalanceResult.success) {
+                return fail({
+                    reason: checkNativeTokenBalanceResult.reason,
+                });
+            }
+            checkNativeTokenBalanceResultSuccess = checkNativeTokenBalanceResult;
         }
-        catch (err) {
-            return fail({
-                reason: `Native token balance error: ${err instanceof Error ? err.message : String(err)}`,
-            });
-        }
-        const requiredAmount = ethers_1.ethers.utils
-            .parseUnits(quote.amountIn, quote.tokenInDecimals)
-            .toBigInt();
-        try {
-            await (0, ability_checks_1.checkTokenInBalance)({
-                provider,
-                pkpEthAddress: delegatorPkpAddress,
-                tokenInAddress: quote.tokenIn,
-                tokenInAmount: requiredAmount,
+        const requiredTokenInAmount = ethers_1.ethers.utils.parseUnits(quote.amountIn, quote.tokenInDecimals);
+        // 2. We retrieve the current allowance of the input token for the spender from the delegator
+        const checkErc20AllowanceResult = await (0, ability_checks_1.checkErc20Allowance)({
+            provider,
+            tokenAddress: quote.tokenIn,
+            owner: delegatorPkpInfo.ethAddress,
+            spender: quote.to,
+            requiredAllowance: requiredTokenInAmount,
+        });
+        // 3. If the ability action is approve, we return the current allowance since all
+        // precheck is concerned with is whether the delegatee can call approve which just needs to know if
+        // the gas for the approval transaction can be paid for (whether by gas sponsorship, or by the delegator).
+        // We return the current allowance out of convenience, so the delegatee can know if
+        // the current allowance is sufficient without having to call execute.
+        if (action === types_1.AbilityAction.Approve) {
+            return succeed({
+                nativeTokenBalance: checkNativeTokenBalanceResultSuccess?.ethBalance.toString(),
+                currentTokenInAllowanceForSpender: checkErc20AllowanceResult.currentAllowance.toString(),
+                spenderAddress: checkErc20AllowanceResult.spenderAddress,
             });
         }
-        catch (err) {
+        // 4. If the ability action is swap, and the current allowance is insufficient, we return a failure
+        // because the swap cannot currently be performed.
+        if (action === types_1.AbilityAction.Swap && !checkErc20AllowanceResult.success) {
             return fail({
-                reason: `tokenIn balance check error: ${err instanceof Error ? err.message : String(err)}`,
+                reason: checkErc20AllowanceResult.reason,
+                spenderAddress: checkErc20AllowanceResult.spenderAddress,
+                tokenAddress: checkErc20AllowanceResult.tokenAddress,
+                requiredAllowance: checkErc20AllowanceResult.requiredAllowance.toString(),
+                currentAllowance: checkErc20AllowanceResult.currentAllowance.toString(),
             });
         }
-        // Check ERC20 allowance for the router specified in the route
-        try {
-            await (0, check_erc20_allowance_1.checkErc20Allowance)({
-                provider,
-                tokenAddress: quote.tokenIn,
-                owner: delegatorPkpAddress,
-                spender: quote.to,
-                tokenAmount: requiredAmount,
-            });
-        }
-        catch (err) {
+        // 5. At this point, the ability action is either:
+        // - Swap and the current allowance is sufficient
+        // - ApproveAndSwap and the gas for the approval transaction can be paid for if the current allowance is insufficient.
+        // We now need to check if the current delegator balance of tokenIn is sufficient to perform the swap.
+        const checkErc20BalanceResult = await (0, ability_checks_1.checkErc20Balance)({
+            provider,
+            pkpEthAddress: delegatorPkpAddress,
+            tokenAddress: quote.tokenIn,
+            requiredTokenAmount: requiredTokenInAmount,
+        });
+        if (!checkErc20BalanceResult.success) {
             return fail({
-                reason: `ERC20 allowance check error: ${err instanceof Error ? err.message : String(err)}`,
-                erc20SpenderAddress: quote.to,
+                reason: checkErc20BalanceResult.reason,
+                tokenAddress: checkErc20BalanceResult.tokenAddress,
+                requiredTokenAmount: checkErc20BalanceResult.requiredTokenAmount.toString(),
+                tokenBalance: checkErc20BalanceResult.tokenBalance.toString(),
             });
         }
-        return succeed();
+        // 6. At this point, we know that:
+        // - The current allowance is either sufficient, or the gas for a new approval transaction can be paid for
+        // - The current delegator balance of tokenIn is sufficient to perform the swap
+        return succeed({
+            nativeTokenBalance: checkNativeTokenBalanceResultSuccess?.ethBalance.toString(),
+            tokenInAddress: checkErc20BalanceResult.tokenAddress,
+            tokenInBalance: checkErc20BalanceResult.tokenBalance.toString(),
+            currentTokenInAllowanceForSpender: checkErc20AllowanceResult.currentAllowance.toString(),
+            spenderAddress: checkErc20AllowanceResult.spenderAddress,
+        });
     },
     execute: async ({ abilityParams }, { succeed, fail, delegation: { delegatorPkpInfo } }) => {
         console.log('Executing UniswapSwapAbility', JSON.stringify(abilityParams, exports.bigintReplacer, 2));
-        const { rpcUrlForUniswap, signedUniswapQuote, gasBufferPercentage, baseFeePerGasBufferPercentage, } = abilityParams;
+        const { action, rpcUrlForUniswap, signedUniswapQuote, gasBufferPercentage, baseFeePerGasBufferPercentage, alchemyGasSponsor, alchemyGasSponsorApiKey, alchemyGasSponsorPolicyId, } = abilityParams;
         const { quote } = signedUniswapQuote;
+        if (!action) {
+            return fail({
+                reason: `The action parameter is required. Please use one of the following: ${Object.values(types_1.AbilityAction).join(', ')}`,
+            });
+        }
+        if (!Object.values(types_1.AbilityAction).includes(action)) {
+            return fail({
+                reason: `The provided action: ${action} is not supported. Please use one of the following: ${Object.values(types_1.AbilityAction).join(', ')}`,
+            });
+        }
         try {
             (0, validate_signed_uniswap_quote_1.validateSignedUniswapQuote)({
                 prepareSuccessResult: signedUniswapQuote,
@@ -102,18 +154,98 @@ exports.vincentAbility = (0, vincent_ability_sdk_1.createVincentAbility)({
                 reason: `Uniswap quote validation failed: ${error instanceof Error ? error.message : String(error)}`,
             });
         }
-        const swapTxHash = await (0, ability_helpers_1.sendUniswapTx)({
-            rpcUrl: rpcUrlForUniswap,
-            chainId: quote.chainId,
-            pkpEthAddress: delegatorPkpInfo.ethAddress,
-            pkpPublicKey: delegatorPkpInfo.publicKey,
-            to: quote.to,
-            value: quote.value,
-            calldata: quote.calldata,
-            gasBufferPercentage,
-            baseFeePerGasBufferPercentage,
+        // 1. If the ability action is approve or approveAndSwap, we need to check if the current allowance is sufficient.
+        // If the ability action is:
+        // - Approve, we return success if allowance is sufficient, otherwise we send a new approval transaction
+        // - ApproveAndSwap, and the current allowance is sufficient, we continue to create the swap transaction. Otherwise,
+        // we send a new approval transaction and then continue to create the swap transaction
+        let approvalTxHash;
+        let approvalTxUserOperationHash;
+        if (action === types_1.AbilityAction.Approve || action === types_1.AbilityAction.ApproveAndSwap) {
+            const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider(rpcUrlForUniswap);
+            const requiredTokenInAmount = ethers_1.ethers.utils.parseUnits(quote.amountIn, quote.tokenInDecimals);
+            const checkErc20AllowanceResult = await (0, ability_checks_1.checkErc20Allowance)({
+                provider,
+                tokenAddress: quote.tokenIn,
+                owner: delegatorPkpInfo.ethAddress,
+                spender: quote.to,
+                requiredAllowance: requiredTokenInAmount,
+            });
+            if (checkErc20AllowanceResult.success) {
+                console.log(`Sufficient allowance already exists for spender ${quote.to}, skipping approval transaction. Current allowance: ${checkErc20AllowanceResult.currentAllowance.toString()}`);
+                if (action === types_1.AbilityAction.Approve) {
+                    // 1.1 If the ability action is approve, we return success since the current allowance is sufficient,
+                    // and a new approval transaction is not needed.
+                    return succeed({
+                        currentAllowance: checkErc20AllowanceResult.currentAllowance.toString(),
+                    });
+                }
+            }
+            else {
+                if (checkErc20AllowanceResult.reason.includes('insufficient ERC20 allowance for spender')) {
+                    // 1.2 The current allowance is insufficient, so we need to send a new approval transaction
+                    const txHash = await (0, send_erc20_approval_tx_1.sendErc20ApprovalTx)({
+                        rpcUrl: rpcUrlForUniswap,
+                        chainId: quote.chainId,
+                        pkpEthAddress: delegatorPkpInfo.ethAddress,
+                        pkpPublicKey: delegatorPkpInfo.publicKey,
+                        spenderAddress: quote.to,
+                        allowanceAmount: requiredTokenInAmount.toString(),
+                        erc20TokenAddress: quote.tokenIn,
+                        alchemyGasSponsor,
+                        alchemyGasSponsorApiKey,
+                        alchemyGasSponsorPolicyId,
+                    });
+                    if (alchemyGasSponsor) {
+                        approvalTxUserOperationHash = txHash;
+                    }
+                    else {
+                        approvalTxHash = txHash;
+                    }
+                }
+                else {
+                    // 1.3 Some error other than insufficient allowance occurred, bail out
+                    return fail({
+                        reason: checkErc20AllowanceResult.reason,
+                    });
+                }
+            }
+        }
+        let swapTxHash;
+        let swapTxUserOperationHash;
+        if (action === types_1.AbilityAction.Swap || action === types_1.AbilityAction.ApproveAndSwap) {
+            // 2. The ability action is swap or approveAndSwap, so we send the swap transaction
+            const txHash = await (0, ability_helpers_1.sendUniswapTx)({
+                rpcUrl: rpcUrlForUniswap,
+                chainId: quote.chainId,
+                pkpEthAddress: delegatorPkpInfo.ethAddress,
+                pkpPublicKey: delegatorPkpInfo.publicKey,
+                to: quote.to,
+                value: quote.value,
+                calldata: quote.calldata,
+                gasBufferPercentage,
+                baseFeePerGasBufferPercentage,
+                alchemyGasSponsor,
+                alchemyGasSponsorApiKey,
+                alchemyGasSponsorPolicyId,
+            });
+            if (alchemyGasSponsor) {
+                swapTxUserOperationHash = txHash;
+            }
+            else {
+                swapTxHash = txHash;
+            }
+        }
+        // 3. If the ability action is:
+        // - Approve, we return the approval transaction hash.
+        // - Swap, we return the swap transaction hash.
+        // - ApproveAndSwap, we return the approval and swap transaction hashes.
+        return succeed({
+            approvalTxHash,
+            approvalTxUserOperationHash,
+            swapTxHash,
+            swapTxUserOperationHash,
         });
-        return succeed({ swapTxHash });
     },
 });
 //# sourceMappingURL=vincent-ability.js.map

package/dist/src/lib/vincent-ability.js.map

@@ -1 +1 @@
-{"version":3,"file":"vincent-ability.js","sourceRoot":"","sources":["../../../src/lib/vincent-ability.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vincent-ability.js","sourceRoot":"","sources":["../../../src/lib/vincent-ability.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lit-protocol/vincent-ability-uniswap-swap",
-  "version": "5.0.0",
+  "version": "7.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -12,11 +12,11 @@
     "json-stable-stringify": "^1.3.0",
     "tslib": "2.8.1",
     "zod": "^3.25.64",
-    "@lit-protocol/vincent-ability-sdk": "2.2.0",
-    "@lit-protocol/vincent-app-sdk": "2.2.1"
+    "@lit-protocol/vincent-ability-sdk": "2.3.1",
+    "@lit-protocol/vincent-app-sdk": "2.2.3"
   },
   "peerDependencies": {
-    "@lit-protocol/vincent-app-sdk": "^2.2.1"
+    "@lit-protocol/vincent-app-sdk": "^2.2.3"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.44.2",

package/dist/src/lib/ability-checks/check-token-in-balance.d.ts

@@ -1,8 +0,0 @@
-import { ethers } from 'ethers';
-export declare const checkTokenInBalance: ({ provider, pkpEthAddress, tokenInAddress, tokenInAmount, }: {
-    provider: ethers.providers.StaticJsonRpcProvider;
-    pkpEthAddress: string;
-    tokenInAddress: string;
-    tokenInAmount: bigint;
-}) => Promise<ethers.BigNumber>;
-//# sourceMappingURL=check-token-in-balance.d.ts.map

package/dist/src/lib/ability-checks/check-token-in-balance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-token-in-balance.d.ts","sourceRoot":"","sources":["../../../../src/lib/ability-checks/check-token-in-balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,mBAAmB,GAAU,6DAKvC;IACD,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC;IACjD,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,8BAeA,CAAC"}

package/dist/src/lib/ability-checks/check-token-in-balance.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkTokenInBalance = void 0;
-const ethers_1 = require("ethers");
-const getErc20Contract_1 = require("./getErc20Contract");
-const checkTokenInBalance = async ({ provider, pkpEthAddress, tokenInAddress, tokenInAmount, }) => {
-    const contract = (0, getErc20Contract_1.getErc20Contract)(tokenInAddress, provider);
-    const tokenInBalance = await contract.balanceOf(pkpEthAddress);
-    // Convert bigint to BigNumber for comparison
-    const tokenInAmountBN = ethers_1.ethers.BigNumber.from(tokenInAmount.toString());
-    if (tokenInBalance.lt(tokenInAmountBN)) {
-        throw new Error(`pkpEthAddress (${pkpEthAddress}) has insufficient balance of tokenIn (${tokenInAddress}). Wanted ${tokenInAmount}, but only have ${tokenInBalance} (checkTokenInBalance)`);
-    }
-    return tokenInBalance;
-};
-exports.checkTokenInBalance = checkTokenInBalance;
-//# sourceMappingURL=check-token-in-balance.js.map

package/dist/src/lib/ability-checks/check-token-in-balance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-token-in-balance.js","sourceRoot":"","sources":["../../../../src/lib/ability-checks/check-token-in-balance.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,yDAAsD;AAE/C,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,QAAQ,EACR,aAAa,EACb,cAAc,EACd,aAAa,GAMd,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,IAAA,mCAAgB,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAqB,MAAM,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAEjF,6CAA6C;IAC7C,MAAM,eAAe,GAAG,eAAM,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;IAExE,IAAI,cAAc,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CACb,kBAAkB,aAAa,0CAA0C,cAAc,aAAa,aAAa,mBAAmB,cAAc,wBAAwB,CAC3K,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B"}

package/dist/src/lib/ability-checks/getErc20Contract.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getErc20Contract.d.ts","sourceRoot":"","sources":["../../../../src/lib/ability-checks/getErc20Contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,SAAS,UAUrB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,qBAAqB,mBAGjD"}

package/dist/src/lib/ability-checks/getErc20Contract.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getErc20Contract.js","sourceRoot":"","sources":["../../../../src/lib/ability-checks/getErc20Contract.ts"],"names":[],"mappings":";;;AAcA,4CAKC;AAnBD,mCAAgC;AAEnB,QAAA,SAAS,GAAG;IACvB,mEAAmE;IACnE,2EAA2E;IAC3E,oFAAoF;IACpF,0CAA0C;IAC1C,wDAAwD;IACxD,uEAAuE;IACvE,yFAAyF;IACzF,gDAAgD;IAChD,kDAAkD;CACnD,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,YAAoB,EACpB,QAAgD;IAEhD,OAAO,IAAI,eAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAS,EAAE,QAAQ,CAAC,CAAC;AAChE,CAAC"}