fix: Remove npx-import usage, as it broke aliased imports in the bundled worker bin

Author: MaximusHaximus

packages/dca-backend/package.json

@@ -50,8 +50,11 @@
     "@lit-protocol/lit-node-client": "^7.3.0",
     "@lit-protocol/types": "^7.3.0",
     "@lit-protocol/vincent-app-sdk": "2.2.3",
-    "@lit-protocol/vincent-contracts-sdk": "^1.0.1",
+    "@lit-protocol/vincent-contracts-sdk": "^2.0.0",
     "@lit-protocol/vincent-scaffold-sdk": "1.1.9-mma",
+    "@lit-protocol/vincent-ability-erc20-approval": "3.1.0",
+    "@lit-protocol/vincent-ability-uniswap-swap-v5": "npm:@lit-protocol/vincent-ability-uniswap-swap@5.0.0",
+    "@lit-protocol/vincent-ability-uniswap-swap-v8": "npm:@lit-protocol/vincent-ability-uniswap-swap@8.0.0",
     "@noble/secp256k1": "^2.2.3",
     "@sentry/cli": "^2.52.0",
     "@sentry/node": "^10.5.0",
@@ -65,21 +68,16 @@
     "helmet": "^8.1.0",
     "mongoose": "^8.10.1",
     "node-cache": "^5.1.2",
-    "npx-import": "^1.1.4",
     "semver": "^7.7.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@lit-protocol/vincent-ability-erc20-approval": "3.1.0",
-    "@lit-protocol/vincent-ability-uniswap-swap-v5": "npm:@lit-protocol/vincent-ability-uniswap-swap@5.0.0",
-    "@lit-protocol/vincent-ability-uniswap-swap-v8": "npm:@lit-protocol/vincent-ability-uniswap-swap@8.0.0",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.1",
     "@types/jest": "^29.5.14",
     "@types/semver": "^7.7.0",
     "ethers": "^5.8.0",
-    "ethers-v6": "npm:ethers@6.15.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.3.0",
     "unbuild": "^3.5.0",

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

@@ -1,15 +1,15 @@
-import { npxImport } from 'npx-import';
-
 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,
+} from '@lit-protocol/vincent-ability-uniswap-swap-v5';
 import { getVincentAbilityClient } from '@lit-protocol/vincent-app-sdk/abilityClient';
 
 import { delegateeSigner } from '../utils/signer';
 
 import type { QuoteParams } from '@lit-protocol/vincent-ability-uniswap-swap-v5';
 
-type Erc20Ability = typeof import('@lit-protocol/vincent-ability-erc20-approval');
-type UniswapAbility = typeof import('@lit-protocol/vincent-ability-uniswap-swap-v5');
-
 const litNodeClient = new LitNodeClient({
   debug: true,
   litNetwork: 'datil',
@@ -21,10 +21,6 @@ export async function getSignedUniswapQuote(quoteParams: QuoteParams) {
     await litNodeClient.connect();
   }
 
-  const { getSignedUniswapQuote: getSignedUniswapQuoteAction } = await npxImport<UniswapAbility>(
-    '@lit-protocol/vincent-ability-uniswap-swap@5.0.0'
-  );
-
   return getSignedUniswapQuoteAction({
     litNodeClient,
     quoteParams,
@@ -33,18 +29,13 @@ export async function getSignedUniswapQuote(quoteParams: QuoteParams) {
 }
 
 export async function getErc20ApprovalToolClient() {
-  const { bundledVincentAbility: erc20ApprovalBundledVincentAbility } =
-    await npxImport<Erc20Ability>('@lit-protocol/vincent-ability-erc20-approval@3.1.0');
-
   return getVincentAbilityClient({
     bundledVincentAbility: erc20ApprovalBundledVincentAbility,
     ethersSigner: delegateeSigner,
   });
 }
 
 export async function getUniswapToolClient() {
-  const { bundledVincentAbility: uniswapSwapBundledVincentAbility } =
-    await npxImport<UniswapAbility>('@lit-protocol/vincent-uniswap-swap@5.0.0');
   return getVincentAbilityClient({
     bundledVincentAbility: uniswapSwapBundledVincentAbility,
     ethersSigner: delegateeSigner,

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

@@ -1,21 +1,19 @@
-import { npxImport } from 'npx-import';
-
 import { LitNodeClient } from '@lit-protocol/lit-node-client';
+import {
+  bundledVincentAbility as uniswapSwapBundledVincentAbility,
+  getSignedUniswapQuote as getSignedUniswapQuoteAction,
+} from '@lit-protocol/vincent-ability-uniswap-swap-v8';
 import { getVincentAbilityClient } from '@lit-protocol/vincent-app-sdk/abilityClient';
 
 import { delegateeSigner } from '../utils/signer';
 
 import type { QuoteParams } from '@lit-protocol/vincent-ability-uniswap-swap-v8';
 
-type UniswapAbility = typeof import('@lit-protocol/vincent-ability-uniswap-swap-v8');
-
 const litNodeClient = new LitNodeClient({
   debug: true,
   litNetwork: 'datil',
 });
 
-const UNISWAP_PKG_VER = '8.0.0';
-
 export async function getSignedUniswapQuote(
   quoteParams: QuoteParams
 ): Promise<ReturnType<typeof getSignedUniswapQuoteAction>> {
@@ -24,10 +22,6 @@ export async function getSignedUniswapQuote(
     await litNodeClient.connect();
   }
 
-  const { getSignedUniswapQuote: getSignedUniswapQuoteAction } = await npxImport<UniswapAbility>(
-    `@lit-protocol/vincent-ability-uniswap-swap@${UNISWAP_PKG_VER}`
-  );
-
   return getSignedUniswapQuoteAction({
     litNodeClient,
     quoteParams,
@@ -36,9 +30,6 @@ export async function getSignedUniswapQuote(
 }
 
 export async function getUniswapAbilityClient() {
-  const { bundledVincentAbility: uniswapSwapBundledVincentAbility } =
-    await npxImport<UniswapAbility>(`@lit-protocol/vincent-uniswap-swap@${UNISWAP_PKG_VER}`);
-
   return getVincentAbilityClient({
     bundledVincentAbility: uniswapSwapBundledVincentAbility,
     ethersSigner: delegateeSigner,