Merge branch 'wyatt/sdkv7-bug'

Author: spacesailor24

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/package.json

@@ -13,12 +13,12 @@
   "dependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-    "@lit-protocol/auth-helpers": "^7.0.2",
-    "@lit-protocol/constants": "^7.0.2",
-    "@lit-protocol/contracts-sdk": "^7.0.2",
-    "@lit-protocol/lit-auth-client": "^7.0.2",
-    "@lit-protocol/lit-node-client": "^7.0.2",
-    "@lit-protocol/types": "^7.0.2",
+    "@lit-protocol/auth-helpers": "^6.0.0",
+    "@lit-protocol/constants": "^6.0.0",
+    "@lit-protocol/contracts-sdk": "^6.0.0",
+    "@lit-protocol/lit-auth-client": "^6.0.0",
+    "@lit-protocol/lit-node-client": "^6.0.0",
+    "@lit-protocol/types": "^6.0.0",
     "@react-oauth/google": "^0.12.1",
     "@simplewebauthn/browser": "^10.0.0",
     "@vitejs/plugin-react-swc": "^3.7.0",

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/App.tsx

@@ -6,6 +6,7 @@ import {
 } from '@react-oauth/google';
 import * as jwt_decode from 'jwt-decode';
 import type { SigResponse } from '@lit-protocol/types';
+import { ethers } from 'ethers';
 
 import './App.css';
 import { mintPkp } from './mintPkp';

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/getPkpSessionSigs.ts

@@ -1,13 +1,11 @@
-import { LitNodeClient } from '@lit-protocol/lit-node-client';
-import {
-  LIT_NETWORK as _LIT_NETWORK,
-  LIT_ABILITY,
-} from '@lit-protocol/constants';
+import { disconnectWeb3, LitNodeClient } from '@lit-protocol/lit-node-client';
+import { LIT_NETWORK as _LIT_NETWORK } from '@lit-protocol/constants';
 import { LitPKPResource } from '@lit-protocol/auth-helpers';
 
 import type { MintedPkp } from './types';
 import { litActionCode } from './litAction';
 import { getCapacityCredit, getEthersSigner, getLitNodeClient } from './utils';
+import { LitAbility } from '@lit-protocol/types';
 
 const LIT_NETWORK =
   _LIT_NETWORK[import.meta.env.VITE_LIT_NETWORK as keyof typeof _LIT_NETWORK];
@@ -57,7 +55,7 @@ export const getPkpSessionSigs = async (
       resourceAbilityRequests: [
         {
           resource: new LitPKPResource('*'),
-          ability: LIT_ABILITY.PKPSigning,
+          ability: LitAbility.PKPSigning,
         },
       ],
       expiration: new Date(Date.now() + 1000 * 60 * 10).toISOString(), // 10 minutes
@@ -68,5 +66,8 @@ export const getPkpSessionSigs = async (
     return sessionSignatures;
   } catch (error) {
     console.error(error);
+  } finally {
+    disconnectWeb3();
+    litNodeClient!.disconnect();
   }
 };

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/litAction.ts

@@ -8,7 +8,7 @@ declare global {
 const _litActionCode = async () => {
   // const GOOGLE_JWT_AUTH_METHOD_TYPE = 6;
   const GOOGLE_JWT_AUTH_METHOD_TYPE = ethers.utils.keccak256(
-    ethers.utils.toUtf8Bytes('Lit Developer Guide GitHub Auth Example')
+    ethers.utils.toUtf8Bytes('Lit Developer Guide Google Auth Example')
   );
 
   try {

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/mintPkp.ts

@@ -1,11 +1,10 @@
 import {
   LIT_NETWORK as _LIT_NETWORK,
-  AUTH_METHOD_SCOPE,
-  AUTH_METHOD_TYPE,
+  AuthMethodScope,
+  AuthMethodType,
 } from '@lit-protocol/constants';
-import { ethers } from 'ethers';
 import bs58 from 'bs58';
-
+import { ethers } from 'ethers';
 import {
   getEthersSigner,
   getGoogleAuthMethodInfo,
@@ -27,24 +26,23 @@ export const mintPkp = async (googleUser: GoogleUser) => {
     const { authMethodType, authMethodId } =
       getGoogleAuthMethodInfo(googleUser);
 
+    const GOOGLE_JWT_AUTH_METHOD_TYPE = ethers.utils.keccak256(
+      ethers.utils.toUtf8Bytes('Lit Developer Guide Google Auth Example')
+    );
+
     console.log('🔄 Minting new PKP...');
     const tx =
       await litContracts.pkpHelperContract.write.mintNextAndAddAuthMethods(
-        AUTH_METHOD_TYPE.LitAction, // keyType
-        [
-          AUTH_METHOD_TYPE.LitAction,
-          ethers.utils.keccak256(
-            ethers.utils.toUtf8Bytes('Lit Developer Guide GitHub Auth Example')
-          ),
-        ], // permittedAuthMethodTypes
+        AuthMethodType.LitAction, // keyType
+        [AuthMethodType.LitAction, GOOGLE_JWT_AUTH_METHOD_TYPE], // permittedAuthMethodTypes
         [
           `0x${Buffer.from(
             bs58.decode(await getLitActionCodeIpfsCid())
           ).toString('hex')}`,
           authMethodId,
         ], // permittedAuthMethodIds
         ['0x', '0x'], // permittedAuthMethodPubkeys
-        [[AUTH_METHOD_SCOPE.SignAnything], [AUTH_METHOD_SCOPE.NoPermissions]], // permittedAuthMethodScopes
+        [[AuthMethodScope.SignAnything], [AuthMethodScope.NoPermissions]], // permittedAuthMethodScopes
         true, // addPkpEthAddressAsPermittedAddress
         true, // sendPkpToItself
         { value: pkpMintCost }

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/pkpSign.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { LitNodeClient } from '@lit-protocol/lit-node-client';
+import { disconnectWeb3, LitNodeClient } from '@lit-protocol/lit-node-client';
 import { LIT_NETWORK as _LIT_NETWORK } from '@lit-protocol/constants';
 
 import { getLitNodeClient } from './utils';
@@ -17,8 +17,6 @@ export const pkpSign = async (
     console.log('🔄 Signing data with PKP...');
     litNodeClient = await getLitNodeClient(LIT_NETWORK);
 
-    console.log(litSessionSigs, pkpPublicKey, dataToSign);
-
     const res = await litNodeClient.pkpSign({
       pubKey: pkpPublicKey,
       sessionSigs: litSessionSigs,
@@ -30,5 +28,8 @@ export const pkpSign = async (
     return res;
   } catch (error) {
     console.error(error);
+  } finally {
+    disconnectWeb3();
+    litNodeClient!.disconnect();
   }
 };

session-signatures/generating-a-session/using-pkp/auth-with-google-oauth/src/utils.ts

@@ -1,8 +1,11 @@
 import { ethers } from 'ethers';
 import { LitContracts } from '@lit-protocol/contracts-sdk';
-import { AUTH_METHOD_TYPE, LIT_NETWORK } from '@lit-protocol/constants';
+import { AuthMethodType, LIT_NETWORK } from '@lit-protocol/constants';
 import { LitNodeClient } from '@lit-protocol/lit-node-client';
-import * as IpfsHash from 'typestub-ipfs-only-hash';
+// import * as IpfsHash from 'typestub-ipfs-only-hash';
+// @ts-ignore
+import IpfsHash from 'ipfs-only-hash';
+import bs58 from 'bs58';
 
 import type { GoogleUser } from './types';
 import { litActionCode } from './litAction';
@@ -27,6 +30,7 @@ export const getLitNodeClient = async (
   if (litNodeClient === null) {
     console.log(`🔄 Connecting LitNode client to the ${litNetwork} network...`);
     litNodeClient = new LitNodeClient({
+      // @ts-ignore
       litNetwork,
       debug: Boolean(import.meta.env.VITE_LIT_DEBUG),
     });
@@ -46,6 +50,7 @@ export const getLitContractsClient = async (
     console.log('🔄 Connecting LitContracts client to the network...');
     litContractClient = new LitContracts({
       signer: ethersSigner,
+      // @ts-ignore
       network: litNetwork,
     });
     await litContractClient.connect();
@@ -58,7 +63,7 @@ export const getLitContractsClient = async (
 export const getGoogleAuthMethodInfo = (googleUser: GoogleUser) => {
   console.log('🔄 Generating Auth Method type and ID...');
   const authMethodInfo = {
-    authMethodType: AUTH_METHOD_TYPE.GoogleJwt,
+    authMethodType: AuthMethodType.GoogleJwt,
     // Taken from here:
     // https://github.com/LIT-Protocol/js-sdk/blob/806264ace642c4c3f4fe1dc4f4c1067cdf54ef27/packages/lit-auth-client/src/lib/providers/GoogleProvider.ts#L216C3-L224C4
     authMethodId: ethers.utils.keccak256(
@@ -78,10 +83,22 @@ export const getPkpMintCost = async (litContracts: LitContracts) => {
   return pkpMintCost;
 };
 
+// export const getLitActionCodeIpfsCid = async () => {
+//   console.log('🔄 Calculating the IPFS CID for Lit Action code string...');
+//   const litActionIpfsCid = await IpfsHash.of(litActionCode);
+//   console.log(`✅ Calculated IPFS CID: ${litActionIpfsCid}`);
+
+//   return litActionIpfsCid;
+// };
+
 export const getLitActionCodeIpfsCid = async () => {
   console.log('🔄 Calculating the IPFS CID for Lit Action code string...');
   const litActionIpfsCid = await IpfsHash.of(litActionCode);
-  console.log(`✅ Calculated IPFS CID: ${litActionIpfsCid}`);
+  console.log(
+    `✅ Calculated IPFS CID: ${litActionIpfsCid}. Hexlified version: 0x${Buffer.from(
+      bs58.decode(litActionIpfsCid)
+    ).toString('hex')}`
+  );
 
   return litActionIpfsCid;
 };