Merge pull request #375 from LIT-Protocol/chore/repalce-vendor-sugar-install

Replace `sugar-sdk` vendor install, refactor use of SDK

Author: spacesailor24

.nx/version-plans/version-plan-1761170189565.md

@@ -0,0 +1,5 @@
+---
+ability-aerodrome-swap: minor
+---
+
+Refactor internal use of the SDK to simplify the Aerodrome Swap Ability

packages/apps/ability-aerodrome-swap/package.json

@@ -6,8 +6,8 @@
   },
   "dependencies": {
     "@lit-protocol/vincent-ability-sdk": "workspace:*",
+    "sugar-sdk": "file:vendor/sugar-sdk-0.3.0-alpha.1.tgz",
     "ethers": "^5.8.0",
-    "sugar-sdk": "file:vendor/sugar-sdk-0.3.0.tgz",
     "tslib": "2.8.1",
     "zod": "^3.25.64"
   },

packages/apps/ability-aerodrome-swap/src/generated/lit-action.js

@@ -1,3 +1,3 @@
 {
-  "ipfsCid": "QmQpvixAaeDCw1Fkgaqf5EidTMm1PzgKwJjpjFXPmJVaxV"
+  "ipfsCid": "QmQ92K8M45AqsgyfaKNrcrJiQgQLaCu2ip9mHehnbJfkRg"
 }

packages/apps/ability-aerodrome-swap/src/generated/vincent-ability-metadata.json

@@ -2,7 +2,7 @@ import {
   createVincentAbility,
   supportedPoliciesForAbility,
 } from '@lit-protocol/vincent-ability-sdk';
-import { base, getCallDataForSwap, getDefaultConfig, getQuoteForSwap } from 'sugar-sdk';
+import { base, getDefaultConfig, getQuoteForSwap, swap } from 'sugar-sdk';
 import { ethers } from 'ethers';
 
 import {
@@ -15,7 +15,7 @@ import {
 } from './schemas';
 import { AbilityAction, CheckNativeTokenBalanceResultSuccess } from './types';
 import { checkErc20Allowance, checkErc20Balance, checkNativeTokenBalance } from './ability-checks';
-import { executeSwapParams, getChainConfig, getSwapVars, type Quote } from 'sugar-sdk/primitives';
+import { getChainConfig, type Quote } from 'sugar-sdk/primitives';
 import { findSupportedTokenOnBase } from './ability-helpers/find-supported-token-on-base';
 import { sendAerodromeSwapTx, sendErc20ApprovalTx } from './ability-helpers';
 
@@ -364,69 +364,28 @@ export const vincentAbility = createVincentAbility({
       }
       const { quote }: { quote: Quote } = parsedQuoteResponse;
 
-      // 3.3 Get the Sugar calldata for the swap quote
-      console.log(
-        '[@lit-protocol/vincent-ability-aerodrome-swap execute] Getting Sugar calldata for swap quote',
-      );
-      const sugarCallDataForSwap = await getCallDataForSwap({
+      // 3.3 Get the swap calldata
+      console.log('[@lit-protocol/vincent-ability-aerodrome-swap execute] Getting swap calldata');
+      const swapData = await swap({
         config: sugarConfigBaseMainnet,
-        fromToken: quote.fromToken,
-        toToken: quote.toToken,
-        amountIn: requiredTokenInAmount.toBigInt(),
+        quote,
         account: delegatorPkpInfo.ethAddress as `0x${string}`,
         slippage: SLIPPAGE,
-      });
-      if (sugarCallDataForSwap === null) {
-        return fail({
-          reason: 'Unable to generate call data for the Aerodrome swap quote',
-        });
-      }
-
-      // 3.4 Get the Sugar swap vars for the swap quote
-      console.log(
-        '[@lit-protocol/vincent-ability-aerodrome-swap execute] Getting Sugar swap vars for swap quote',
-      );
-      const { chainId, planner, amount } = getSwapVars(
-        sugarConfigBaseMainnet.sugarConfig,
-        quote,
-        `${Math.ceil(SLIPPAGE * 100)}`,
-        delegatorPkpInfo.ethAddress as `0x${string}`,
-      );
-
-      // 3.5 Get the Sugar execute swap params for the swap quote
-      console.log(
-        '[@lit-protocol/vincent-ability-aerodrome-swap execute] Getting Sugar execute swap params for swap quote',
-      );
-      const sugarExecuteSwapParams = executeSwapParams({
-        config: sugarConfigBaseMainnet.sugarConfig,
-        chainId,
-        commands: planner.commands as `0x${string}`,
-        inputs: planner.inputs,
-        value: amount,
+        unsignedTransactionOnly: true,
       });
 
-      // 3.6 ABI encode the swap params for ethers calldata
-      console.log(
-        '[@lit-protocol/vincent-ability-aerodrome-swap execute] ABI encoding swap params for ethers calldata',
-      );
-      const executeInterface = new ethers.utils.Interface(sugarExecuteSwapParams.abi);
-      const encodedCalldataForEthers = executeInterface.encodeFunctionData(
-        'execute(bytes,bytes[])',
-        [planner.commands, planner.inputs],
-      );
-
-      // 3.7 Send the swap transaction
+      // 3.4 Send the swap transaction
       console.log(
         '[@lit-protocol/vincent-ability-aerodrome-swap execute] Sending swap transaction',
       );
       const txHash = await sendAerodromeSwapTx({
         rpcUrl,
-        chainId: base.id,
+        chainId: swapData.chainId,
         pkpEthAddress: delegatorPkpInfo.ethAddress,
         pkpPublicKey: delegatorPkpInfo.publicKey,
-        to: sugarChainConfigBaseMainnet.UNIVERSAL_ROUTER_ADDRESS,
-        value: amount.toString(),
-        calldata: encodedCalldataForEthers,
+        to: swapData.to,
+        value: swapData.value.toString(),
+        calldata: swapData.data,
         gasBufferPercentage,
         baseFeePerGasBufferPercentage,
         alchemyGasSponsor,

packages/apps/ability-aerodrome-swap/src/lib/vincent-ability.ts

@@ -342,7 +342,8 @@ contract VincentUserFacet is VincentBase {
 
             mapping(bytes32 => bytes) storage abilityPolicyParameterValues = us_.agentPkpTokenIdToAgentStorage[
                 pkpTokenId
-            ].abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
+            ]
+            .abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
 
             // Step 4: Iterate through each policy associated with the ability.
             for (uint256 j = 0; j < policyCount; j++) {

packages/apps/ability-aerodrome-swap/vendor/sugar-sdk-0.3.0-alpha.1.tgz

@@ -90,9 +90,9 @@ contract DeployFeeDiamond is Script {
         cuts[6] = contractToFacetCutAdd("AerodromeSwapFeeFacet", address(aerodromeSwapFeeFacet));
 
         // Deploy the Diamond with the diamondCut facet and all other facets in one transaction
-        Fee diamond = new Fee{
-            salt: create2Salt
-        }(cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")}));
+        Fee diamond = new Fee{salt: create2Salt}(
+            cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")})
+        );
 
         // Stop broadcasting transactions
         vm.stopBroadcast();