chore: implement feedback

Author: spacesailor24

nx.json

@@ -68,7 +68,6 @@
       "ability-aave",
       "ability-debridge",
       "policy-send-counter",
-      "wrapped-keys",
       "ability-sol-transaction-signer"
     ],
     "projectsRelationship": "independent",

packages/apps/abilities-e2e/test-e2e/solana-transaction-signer.spec.ts

@@ -1,5 +1,8 @@
 import { formatEther } from 'viem';
 import { bundledVincentAbility as solTransactionSignerBundledAbility } from '@lit-protocol/vincent-ability-sol-transaction-signer';
+import { constants } from '@lit-protocol/vincent-wrapped-keys';
+
+const { LIT_PREFIX } = constants;
 
 import {
   disconnectVincentAbilityClients,
@@ -50,7 +53,7 @@ import { LIT_NETWORK } from '@lit-protocol/constants';
 import { api } from '@lit-protocol/vincent-wrapped-keys';
 const { getVincentRegistryAccessControlCondition } = api;
 
-const SOLANA_CLUSTER = 'mainnet-beta';
+const SOLANA_CLUSTER = 'devnet';
 
 // Extend Jest timeout to 4 minutes
 jest.setTimeout(240000);
@@ -300,7 +303,7 @@ describe('Solana Transaction Signer Ability E2E Tests', () => {
     await LIT_NODE_CLIENT.connect();
 
     EVM_CONTRACT_CONDITION = await getVincentRegistryAccessControlCondition({
-      agentWalletAddress: TEST_CONFIG.userPkp!.ethAddress!,
+      delegatorAddress: TEST_CONFIG.userPkp!.ethAddress!,
     });
 
     TEST_SOLANA_KEYPAIR = Keypair.generate();
@@ -339,7 +342,7 @@ describe('Solana Transaction Signer Ability E2E Tests', () => {
     const { ciphertext, dataToEncryptHash } = await LIT_NODE_CLIENT.encrypt({
       evmContractConditions: [EVM_CONTRACT_CONDITION],
       dataToEncrypt: new TextEncoder().encode(
-        `vincent_${Buffer.from(TEST_SOLANA_KEYPAIR.secretKey).toString('hex')}`,
+        `${LIT_PREFIX}${Buffer.from(TEST_SOLANA_KEYPAIR.secretKey).toString('hex')}`,
       ),
     });
     CIPHERTEXT = ciphertext;

packages/apps/abilities-e2e/test-e2e/test-config.json

@@ -1,5 +1,5 @@
 {
-  "appId": 63160545517,
+  "appId": 92519500199,
   "appVersion": 1,
   "userPkp": {
     "tokenId": "3642086617849255502636868489753780819830331370694537145307432406587444605687",

packages/apps/ability-sol-transaction-signer/package.json

@@ -6,6 +6,7 @@
   },
   "dependencies": {
     "@lit-protocol/vincent-ability-sdk": "workspace:*",
+    "@lit-protocol/vincent-wrapped-keys": "workspace:*",
     "@solana/web3.js": "^1.98.4",
     "ethers": "^5.8.0",
     "tslib": "2.8.1",

packages/apps/ability-sol-transaction-signer/project.json

@@ -31,7 +31,7 @@
     },
     "build": {
       "executor": "@nx/js:tsc",
-      "dependsOn": ["action:build"],
+      "dependsOn": ["wrapped-keys:build", "action:build"],
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "packages/apps/ability-sol-transaction-signer/dist",

packages/apps/ability-sol-transaction-signer/src/generated/lit-action.js

@@ -1,3 +1,3 @@
 {
-  "ipfsCid": "QmTHgC3WvLVLRCYXfjUtZVLyJWazYTMTijsnJoPGi48JHn"
+  "ipfsCid": "QmWPHQzpuUzzszV3Nux1gHGeP434s6PziG1S2vU4osRNxi"
 }

packages/apps/ability-sol-transaction-signer/src/generated/vincent-ability-metadata.json

@@ -1,9 +1,11 @@
 import {
   createVincentAbility,
   supportedPoliciesForAbility,
-  getSolanaKeyPairFromWrappedKey,
 } from '@lit-protocol/vincent-ability-sdk';
 import { clusterApiUrl, Transaction } from '@solana/web3.js';
+import { api } from '@lit-protocol/vincent-wrapped-keys';
+
+const getSolanaKeyPairFromWrappedKey = api.litActionHelpers.getSolanaKeyPairFromWrappedKey;
 
 import {
   executeFailSchema,
@@ -79,7 +81,7 @@ export const vincentAbility = createVincentAbility({
 
     try {
       const solanaKeypair = await getSolanaKeyPairFromWrappedKey({
-        agentWalletPkpTokenId: tokenId,
+        delegatorPkpTokenId: tokenId,
         ciphertext,
         dataToEncryptHash,
       });

packages/apps/ability-sol-transaction-signer/src/lib/vincent-ability.ts

@@ -6,8 +6,6 @@
   },
   "dependencies": {
     "@lit-protocol/vincent-contracts-sdk": "workspace:*",
-    "@lit-protocol/vincent-wrapped-keys": "workspace:*",
-    "@solana/web3.js": "^1.98.4",
     "ethers": "5.8.0",
     "ethers-v6": "npm:ethers@^6",
     "semver": "^7.7.2",

packages/libs/ability-sdk/package.json

@@ -30,6 +30,3 @@ export type {
 export type { BaseAbilityContext } from './lib/abilityCore/abilityConfig/context/types';
 
 export { populateTransaction } from './lib/abilityHelpers';
-
-// Wrapped Keys utilities
-export { getSolanaKeyPairFromWrappedKey } from './lib/wrapped-keys';