chore: remove pkp token id from wk methods. Dynamically get abi for isDelegateePermitted

Author: spacesailor24

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

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

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

@@ -1,3 +1,3 @@
 {
-  "ipfsCid": "QmZVuFvb658YHAmiPrA7Pn3aGsjtEKkeb6DJfwNvQcVAew"
+  "ipfsCid": "Qmexso1eSsrbPwugcqRNqvejhqrPrRjvAz9qVCy9yJTHMD"
 }

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

@@ -77,11 +77,11 @@ export const vincentAbility = createVincentAbility({
       dataToEncryptHash,
       legacyTransactionOptions,
     } = abilityParams;
-    const { tokenId } = delegatorPkpInfo;
+    const { ethAddress } = delegatorPkpInfo;
 
     try {
       const solanaKeypair = await getSolanaKeyPairFromWrappedKey({
-        delegatorPkpTokenId: tokenId,
+        delegatorAddress: ethAddress,
         ciphertext,
         dataToEncryptHash,
       });

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

@@ -45,4 +45,4 @@ export { createContract } from './utils';
 
 export { getPkpTokenId } from './utils/pkpInfo';
 
-export { VINCENT_DIAMOND_CONTRACT_ADDRESS_PROD } from './constants';
+export { VINCENT_DIAMOND_CONTRACT_ADDRESS_PROD, COMBINED_ABI } from './constants';

packages/libs/contracts-sdk/src/index.ts

@@ -6,6 +6,7 @@ import { LIT_RPC } from '@lit-protocol/constants';
 import {
   VINCENT_DIAMOND_CONTRACT_ADDRESS_PROD,
   getPkpTokenId,
+  COMBINED_ABI,
 } from '@lit-protocol/vincent-contracts-sdk';
 
 import type { KeyType, Network } from '../types';
@@ -57,66 +58,45 @@ export function getFirstSessionSig(pkpSessionSigs: SessionSigsMap): AuthSig {
  */
 export async function getVincentRegistryAccessControlCondition({
   delegatorAddress,
-  delegatorPkpTokenId,
 }: {
-  delegatorAddress?: string;
-  delegatorPkpTokenId?: string;
+  delegatorAddress: string;
 }): Promise<AccsEVMParams> {
-  let _delegatorPkpTokenId = delegatorPkpTokenId;
-
-  if (delegatorAddress) {
-    if (!ethers.utils.isAddress(delegatorAddress)) {
-      throw new Error(`delegatorAddress is not a valid Ethereum Address: ${delegatorAddress}`);
-    }
-
-    _delegatorPkpTokenId = (
-      await getPkpTokenId({
-        pkpEthAddress: delegatorAddress,
-        signer: ethers.Wallet.createRandom().connect(
-          new ethers.providers.StaticJsonRpcProvider(LIT_RPC.CHRONICLE_YELLOWSTONE),
-        ),
-      })
-    ).toString();
+  if (!ethers.utils.isAddress(delegatorAddress)) {
+    throw new Error(`delegatorAddress is not a valid Ethereum Address: ${delegatorAddress}`);
   }
 
-  if (!_delegatorPkpTokenId) {
-    throw new Error(
-      'The delegator address or PKP token ID is required to create an access control conditions',
-    );
-  }
+  const delegatorPkpTokenId = (
+    await getPkpTokenId({
+      pkpEthAddress: delegatorAddress,
+      signer: ethers.Wallet.createRandom().connect(
+        new ethers.providers.StaticJsonRpcProvider(LIT_RPC.CHRONICLE_YELLOWSTONE),
+      ),
+    })
+  ).toString();
+
+  const contractInterface = new ethers.utils.Interface(COMBINED_ABI.fragments);
+  const fragment = contractInterface.getFunction('isDelegateePermitted');
 
   const functionAbi = {
     type: 'function',
-    name: 'isDelegateePermitted',
-    inputs: [
-      {
-        name: 'delegatee',
-        type: 'address',
-      },
-      {
-        name: 'pkpTokenId',
-        type: 'uint256',
-      },
-      {
-        name: 'abilityIpfsCid',
-        type: 'string',
-      },
-    ],
-    outputs: [
-      {
-        name: 'isPermitted',
-        type: 'bool',
-      },
-    ],
-    stateMutability: 'view',
+    name: fragment.name,
+    inputs: fragment.inputs.map((input) => ({
+      name: input.name,
+      type: input.type,
+    })),
+    outputs: fragment.outputs?.map((output) => ({
+      name: output.name,
+      type: output.type,
+    })),
+    stateMutability: fragment.stateMutability,
   };
 
   return {
     contractAddress: VINCENT_DIAMOND_CONTRACT_ADDRESS_PROD,
     functionAbi,
     chain: CHAIN_YELLOWSTONE,
     functionName: 'isDelegateePermitted',
-    functionParams: [':userAddress', _delegatorPkpTokenId, ':currentActionIpfsId'],
+    functionParams: [':userAddress', delegatorPkpTokenId, ':currentActionIpfsId'],
     returnValueTest: {
       key: 'isPermitted',
       comparator: '=',

packages/libs/wrapped-keys/src/lib/api/utils.ts

@@ -10,24 +10,24 @@ declare const Lit: typeof LitNamespace;
 /**
  * Helper function to decrypt a Vincent Solana Wrapped Key and initialize a Solana Keypair.
  *
- * @param delegatorPkpTokenId - The PKP token ID of the vincent delegator
+ * @param delegatorAddress - The PKP ethereum address of the vincent delegator
  * @param ciphertext - The encrypted wrapped key
  * @param dataToEncryptHash - Hash of the encrypted data
  * @returns A Solana Keypair instance
  * @throws Error if the decrypted private key is not prefixed with 'lit_' or if decryption fails
  */
 export async function getSolanaKeyPairFromWrappedKey({
-  delegatorPkpTokenId,
+  delegatorAddress,
   ciphertext,
   dataToEncryptHash,
 }: {
-  delegatorPkpTokenId: string;
+  delegatorAddress: string;
   ciphertext: string;
   dataToEncryptHash: string;
 }): Promise<Keypair> {
   const accessControlConditions = [
     await getVincentRegistryAccessControlCondition({
-      delegatorPkpTokenId,
+      delegatorAddress,
     }),
   ];