Merge branch 'master' into feat/add-ipfs-hash-helper

Author: Ansonhkg

.github/workflows/ci.yml

@@ -25,7 +25,11 @@ jobs:
           node-version: '20'
           cache: 'yarn'
       - name: Install rust
-        uses: dtolnay/[email protected]
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.83.0
+          override: true
+          components: rust-std
       - uses: jetli/[email protected]
         with:
           # Optional version of wasm-pack to install(eg. 'v0.9.1', 'latest')

lerna.json

@@ -2,5 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true,
-  "version": "7.0.4"
+  "version": "7.0.6"
 }

local-tests/setup/session-sigs/get-pkp-session-sigs.ts

@@ -12,7 +12,8 @@ export const getPkpSessionSigs = async (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson,
   resourceAbilityRequests?: LitResourceAbilityRequest[],
-  expiration?: string
+  expiration?: string,
+  domain?: string
 ) => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
@@ -39,6 +40,7 @@ export const getPkpSessionSigs = async (
     pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
     authMethods: [alice.authMethod],
     expiration,
+    domain,
     resourceAbilityRequests: _resourceAbilityRequests,
 
     ...(centralisation === 'decentralised' && {

local-tests/test.ts

@@ -1,3 +1,7 @@
+import { ethers } from 'ethers';
+
+import { log } from '@lit-protocol/misc';
+import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
 import { TinnyEnvironment } from './setup/tinny-environment';
 import { runInBand, runTestsParallel } from './setup/tinny-operations';
 // import { testBundleSpeed } from './tests/test-bundle-speed';
@@ -109,6 +113,7 @@ import { testFailBatchGeneratePrivateKeysAtomic } from './tests/wrapped-keys/tes
 
 import { setLitActionsCodeToLocal } from './tests/wrapped-keys/util';
 import { testUseEoaSessionSigsToRequestSingleResponse } from './tests/testUseEoaSessionSigsToRequestSingleResponse';
+import { testPkpSessionSigsDomain } from './tests/testPkpSessionSigsDomain';
 
 // Use the current LIT action code to test against
 setLitActionsCodeToLocal();
@@ -185,6 +190,7 @@ setLitActionsCodeToLocal();
     testUsePkpSessionSigsToExecuteJsConsoleLog,
     testUsePkpSessionSigsToEncryptDecryptString,
     testUsePkpSessionSigsToEncryptDecryptFile,
+    testPkpSessionSigsDomain,
   };
 
   const litActionSessionSigsTests = {

local-tests/tests/testPkpSessionSigsDomain.ts

@@ -0,0 +1,59 @@
+import { log } from '@lit-protocol/misc';
+import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
+import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
+
+/**
+ * Test Commands:
+ * ✅ NETWORK=datil-dev yarn test:local --filter=testPkpSessionSigsDomain
+ * ✅ NETWORK=datil-test yarn test:local --filter=testPkpSessionSigsDomain
+ * ✅ NETWORK=custom yarn test:local --filter=testPkpSessionSigsDomain
+ */
+export const testPkpSessionSigsDomain = async (devEnv: TinnyEnvironment) => {
+  const alice = await devEnv.createRandomPerson();
+  const testDomain = 'test.domain.com';
+
+  // AuthNeededCallback props:
+  // props: {
+  //   chain: 'ethereum',
+  //   statement: 'I further authorize the stated URI to perform the following actions on my behalf:',
+  //   resources: [ 'urn:recap:eyJhdHQiOnt9LCJwcmYiOltdfQ' ],
+  //   expiration: '2025-02-01T16:51:50.358Z',
+  //   uri: 'lit:session:e43c4bdff81bb83e7bedf079f5546f237d6e1344c9981735fe8d3a0bbc07c371',
+  //   sessionKey: {
+  //     publicKey: 'e43c4bdff81bb83e7bedf079f5546f237d6e1344c9981735fe8d3a0bbc07c371',
+  //     secretKey: 'a5f43862612394a59f64708a847825255d66839fd6972d3538cb5dffce7228aee43c4bdff81bb83e7bedf079f5546f237d6e1344c9981735fe8d3a0bbc07c371'
+  //   },
+  //   nonce: '0x53e14ac177c02e4b460432ef2bd639519c589137f16136027505c58793608ef7',
+  //   domain: 'test.domain.com',
+  //   resourceAbilityRequests: [
+  //     { resource: [LitPKPResource], ability: 'pkp-signing' },
+  //     { resource: [LitActionResource], ability: 'lit-action-execution' }
+  //   ]
+  // }
+  const pkpSessionSigs = await getPkpSessionSigs(
+    devEnv,
+    alice,
+    undefined,
+    undefined,
+    testDomain
+  );
+
+  // Get the first session sig to verify
+  const firstNodeAddress = Object.keys(pkpSessionSigs)[0];
+  const firstSessionSig = pkpSessionSigs[firstNodeAddress];
+
+  // Parse the signed message to verify domain
+  const signedMessage = firstSessionSig.signedMessage;
+
+  // Verify that the domain is present in the signed message
+  if (!signedMessage.includes(testDomain)) {
+    throw new Error(
+      `Expected domain "${testDomain}" in signed message, but it was not found. Signed message: ${signedMessage}`
+    );
+  }
+
+  log('✅ Domain parameter successfully passed through in sessionSigs');
+
+  // Clean up
+  devEnv.releasePrivateKeyFromUser(alice);
+};

packages/access-control-conditions/package.json

@@ -21,7 +21,7 @@
   "tags": [
     "universal"
   ],
-  "version": "7.0.4",
+  "version": "7.0.6",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/auth-browser/package.json

@@ -31,7 +31,7 @@
   "tags": [
     "browser"
   ],
-  "version": "7.0.4",
+  "version": "7.0.6",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/auth-helpers/package.json

@@ -25,7 +25,7 @@
     "crypto": false,
     "stream": false
   },
-  "version": "7.0.4",
+  "version": "7.0.6",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/constants/package.json

@@ -20,7 +20,7 @@
   "tags": [
     "universal"
   ],
-  "version": "7.0.4",
+  "version": "7.0.6",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/constants/src/lib/version.ts

@@ -1 +1 @@
-export const version = '7.0.4';
+export const version = '7.0.6';