chore: update test assertions

Author: spacesailor24

packages/apps/abilities-e2e/test-e2e/swap.spec.ts

@@ -46,24 +46,24 @@ import {
 const ALCHEMY_GAS_SPONSOR_API_KEY = getEnv('ALCHEMY_GAS_SPONSOR_API_KEY');
 const ALCHEMY_GAS_SPONSOR_POLICY_ID = getEnv('ALCHEMY_GAS_SPONSOR_POLICY_ID');
 
-const SWAP_AMOUNT = 80;
-const SWAP_TOKEN_IN_ADDRESS = '0x4ed4E862860beD51a9570b96d89aF5E1B0Efefed'; // DEGEN
-const SWAP_TOKEN_IN_DECIMALS = 18;
+// const SWAP_AMOUNT = 80;
+// const SWAP_TOKEN_IN_ADDRESS = '0x4ed4E862860beD51a9570b96d89aF5E1B0Efefed'; // DEGEN
+// const SWAP_TOKEN_IN_DECIMALS = 18;
 
 // const SWAP_AMOUNT = 0.0003;
 // const SWAP_TOKEN_IN_ADDRESS = '0x4200000000000000000000000000000000000006'; // WETH
 // const SWAP_TOKEN_IN_DECIMALS = 18;
 
-// const SWAP_AMOUNT = 0.1;
-// const SWAP_TOKEN_IN_ADDRESS = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'; // USDC
-// const SWAP_TOKEN_IN_DECIMALS = 6;
+const SWAP_AMOUNT = 0.1;
+const SWAP_TOKEN_IN_ADDRESS = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'; // USDC
+const SWAP_TOKEN_IN_DECIMALS = 6;
 
-const SWAP_TOKEN_OUT_ADDRESS = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'; // USDC
-const SWAP_TOKEN_OUT_DECIMALS = 6;
+// const SWAP_TOKEN_OUT_ADDRESS = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'; // USDC
+// const SWAP_TOKEN_OUT_DECIMALS = 6;
 // const SWAP_TOKEN_OUT_ADDRESS = '0x4200000000000000000000000000000000000006'; // WETH
 // const SWAP_TOKEN_OUT_DECIMALS = 18;
-// const SWAP_TOKEN_OUT_ADDRESS = '0x4ed4E862860beD51a9570b96d89aF5E1B0Efefed'; // DEGEN
-// const SWAP_TOKEN_OUT_DECIMALS = 18;
+const SWAP_TOKEN_OUT_ADDRESS = '0x4ed4E862860beD51a9570b96d89aF5E1B0Efefed'; // DEGEN
+const SWAP_TOKEN_OUT_DECIMALS = 18;
 
 const RPC_URL = BASE_RPC_URL;
 const CHAIN_ID = 8453;
@@ -478,6 +478,7 @@ describe('Uniswap Swap Ability E2E Tests', () => {
 
       const precheckResult = await uniswapSwapAbilityClient.precheck(
         {
+          action: AbilityAction.Swap,
           rpcUrlForUniswap: RPC_URL,
           signedUniswapQuote: {
             quote: signedUniswapQuote.quote,
@@ -514,9 +515,11 @@ describe('Uniswap Swap Ability E2E Tests', () => {
 
       // Verify the result is properly populated
       expect(precheckResult.result).toBeDefined();
-      expect(BigInt(precheckResult.result!.nativeTokenBalance)).toBeGreaterThan(0n);
+      expect(precheckResult.result!.nativeTokenBalance).toBeDefined();
+      expect(BigInt(precheckResult.result!.nativeTokenBalance as string)).toBeGreaterThan(0n);
       expect(precheckResult.result!.tokenInAddress).toBe(SWAP_TOKEN_IN_ADDRESS);
-      expect(BigInt(precheckResult.result!.tokenInBalance)).toBeGreaterThan(0n);
+      expect(precheckResult.result!.tokenInBalance).toBeDefined();
+      expect(BigInt(precheckResult.result!.tokenInBalance as string)).toBeGreaterThan(0n);
       expect(BigInt(precheckResult.result!.currentTokenInAllowanceForSpender)).toBeGreaterThan(0n);
       expect(precheckResult.result!.spenderAddress).toBe(signedUniswapQuote.quote.to);
     });
@@ -713,6 +716,7 @@ describe('Uniswap Swap Ability E2E Tests', () => {
 
       const precheckResult = await uniswapSwapAbilityClient.precheck(
         {
+          action: AbilityAction.Swap,
           rpcUrlForUniswap: RPC_URL,
           signedUniswapQuote: {
             quote: signedUniswapQuote.quote,
@@ -751,9 +755,10 @@ describe('Uniswap Swap Ability E2E Tests', () => {
 
       // Verify the result is properly populated
       expect(precheckResult.result).toBeDefined();
-      expect(BigInt(precheckResult.result!.nativeTokenBalance)).toBeGreaterThan(0n);
+      expect(precheckResult.result!.nativeTokenBalance).not.toBeDefined();
       expect(precheckResult.result!.tokenInAddress).toBe(SWAP_TOKEN_IN_ADDRESS);
-      expect(BigInt(precheckResult.result!.tokenInBalance)).toBeGreaterThan(0n);
+      expect(precheckResult.result!.tokenInBalance).toBeDefined();
+      expect(BigInt(precheckResult.result!.tokenInBalance as string)).toBeGreaterThan(0n);
       expect(BigInt(precheckResult.result!.currentTokenInAllowanceForSpender)).toBeGreaterThan(0n);
       expect(precheckResult.result!.spenderAddress).toBe(signedUniswapQuote.quote.to);
     });

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

@@ -102,6 +102,7 @@ export const vincentAbility = createVincentAbility({
     // the current allowance is sufficient without having to call execute.
     if (action === AbilityAction.Approve) {
       return succeed({
+        nativeTokenBalance: checkNativeTokenBalanceResultSuccess?.ethBalance.toString(),
         currentTokenInAllowanceForSpender: checkErc20AllowanceResult.currentAllowance.toString(),
         spenderAddress: checkErc20AllowanceResult.spenderAddress,
       });
@@ -119,8 +120,9 @@ export const vincentAbility = createVincentAbility({
       });
     }
 
-    // 5. At this point, the ability action is either swap and the current allowance is sufficient, or
-    // approveAndSwap and the gas for the approval transaction can be paid for if the current allowance is insufficient.
+    // 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 checkErc20Balance({
       provider,
@@ -188,9 +190,10 @@ export const vincentAbility = createVincentAbility({
     }
 
     // 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 sufficient, otherwise we send a new approval transaction.
-    // If the ability action is 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.
+    // 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: string | undefined;
     let approvalTxUserOperationHash: string | undefined;
     if (action === AbilityAction.Approve || action === AbilityAction.ApproveAndSwap) {