From eda06c9e5d4bb0aa25a53beec927836c3b6abd2d Mon Sep 17 00:00:00 2001 From: Howard Tam Date: Wed, 17 Sep 2025 17:40:49 -0700 Subject: [PATCH 1/6] Match hashing scheme on server side Refer to https://github.com/LIT-Protocol/lit-assets/pull/2116 --- packages/wasm/rust/src/sev_snp.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/wasm/rust/src/sev_snp.rs b/packages/wasm/rust/src/sev_snp.rs index 71588d86fb..a1ac6526bf 100644 --- a/packages/wasm/rust/src/sev_snp.rs +++ b/packages/wasm/rust/src/sev_snp.rs @@ -130,21 +130,27 @@ fn get_expected_report_data( ) -> JsResult<[u8; 64]> { let mut hasher = Sha512::new(); hasher.update("noonce"); + hasher.update(&(challenge.len() as u64).to_be_bytes()); hasher.update(challenge); hasher.update("data"); + hasher.update(&(data.len() as u64).to_be_bytes()); for (key, value) in data { + hasher.update(&(key.len() as u64).to_be_bytes()); hasher.update(key); + hasher.update(&(value.len() as u64).to_be_bytes()); hasher.update(value); } if !signatures.is_empty() { hasher.update("signatures"); + hasher.update(&(signatures.len() as u64).to_be_bytes()); - for idx in 0..((signatures.len() - 1) as usize) { + for idx in 0..=((signatures.len() - 1) as usize) { let sig = signatures.get(idx); match sig { Some(s) => { + hasher.update(&(s.len() as u64).to_be_bytes()); hasher.update(s.clone()); } None => { From 25edb4c6012a4b1d96a01ee12197f5ae533a2e86 Mon Sep 17 00:00:00 2001 From: Howard Tam Date: Thu, 18 Sep 2025 14:19:05 -0700 Subject: [PATCH 2/6] Use version of contracts with correct addresses --- package.json | 2 +- packages/networks/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e3dd9279da..5de665296c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "private": true, "dependencies": { "@dotenvx/dotenvx": "^1.6.4", - "@lit-protocol/contracts": "^0.5.0", + "@lit-protocol/contracts": "^0.5.1", "@lit-protocol/nacl": "7.1.1", "@lit-protocol/uint8arrays": "7.1.1", "@metamask/eth-sig-util": "5.0.2", diff --git a/packages/networks/package.json b/packages/networks/package.json index fea67bdb99..e5b0bd8c2a 100644 --- a/packages/networks/package.json +++ b/packages/networks/package.json @@ -18,7 +18,7 @@ "directory": "../../dist/packages/networks" }, "dependencies": { - "@lit-protocol/contracts": "^0.4.0", + "@lit-protocol/contracts": "^0.5.1", "@lit-protocol/nacl": "7.1.1", "@noble/curves": "^1.8.1", "@wagmi/core": "^2.17.1", From 600f581ab4e902b04aaea1206a07ae5d775d6993 Mon Sep 17 00:00:00 2001 From: Howard Tam Date: Thu, 18 Sep 2025 14:23:21 -0700 Subject: [PATCH 3/6] Restore keyset changes --- .../LitChainClient/apis/highLevelApis/mintPKP/mintPKP.ts | 1 + .../apis/highLevelApis/mintPKP/mintWithMultiAuths.ts | 1 + .../LitChainClient/apis/rawContractApis/pkp/write/mintNext.ts | 2 +- .../apis/rawContractApis/pkp/write/mintNextAndAddAuthMethods.ts | 1 + .../shared/managers/LitChainClient/schemas/MintRequestSchema.ts | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintPKP.ts b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintPKP.ts index 0c9eb2495d..110693bed5 100644 --- a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintPKP.ts +++ b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintPKP.ts @@ -45,6 +45,7 @@ export const mintPKP = async ( const tx = await mintNextAndAddAuthMethods( { keyType: 2, + keySetId: 'naga-keyset1', permittedAuthMethodTypes: [validatedRequest.authMethodType], permittedAuthMethodIds: [validatedRequest.authMethodId], permittedAuthMethodPubkeys: [validatedRequest.pubkey], diff --git a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintWithMultiAuths.ts b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintWithMultiAuths.ts index 3dd4f026c3..48911680eb 100644 --- a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintWithMultiAuths.ts +++ b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/mintPKP/mintWithMultiAuths.ts @@ -115,6 +115,7 @@ export const mintWithMultiAuths = async ( const tx = await mintNextAndAddAuthMethods( { keyType: 2, + keySetId: 'naga-keyset1', permittedAuthMethodTypes: validatedRequest.authMethodTypes, permittedAuthMethodIds: validatedRequest.authMethodIds, permittedAuthMethodPubkeys: validatedRequest.pubkeys, diff --git a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNext.ts b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNext.ts index 581f8e3f4d..77c68bd3e9 100644 --- a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNext.ts +++ b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNext.ts @@ -22,7 +22,7 @@ export async function mintNext( const hash = await callWithAdjustedOverrides( pkpNftContract, 'mintNext', - [2], + [2, 'naga-keyset1'], { value: mintCost, } diff --git a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNextAndAddAuthMethods.ts b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNextAndAddAuthMethods.ts index de9dbb881a..384e63f816 100644 --- a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNextAndAddAuthMethods.ts +++ b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/pkp/write/mintNextAndAddAuthMethods.ts @@ -69,6 +69,7 @@ export async function mintNextAndAddAuthMethods( 'mintNextAndAddAuthMethods', [ validatedRequest.keyType, + validatedRequest.keySetId, validatedRequest.permittedAuthMethodTypes, validatedRequest.permittedAuthMethodIds, validatedRequest.permittedAuthMethodPubkeys, diff --git a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema.ts b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema.ts index 77ce533822..313d06d947 100644 --- a/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema.ts +++ b/packages/networks/src/networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema.ts @@ -10,6 +10,7 @@ import { export const MintRequestSchema = z.object({ keyType: toBigInt, + keySetId: z.literal('naga-keyset1'), permittedAuthMethodTypes: toBigIntArray, permittedAuthMethodIds: toHexStringArray, permittedAuthMethodPubkeys: toHexStringArray, From 27aa4f9ab4a426834bdb836fa015cef884f45b27 Mon Sep 17 00:00:00 2001 From: Howard Tam Date: Thu, 18 Sep 2025 15:07:00 -0700 Subject: [PATCH 4/6] Use version of contracts with correct addresses --- packages/auth-services/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth-services/package.json b/packages/auth-services/package.json index 1cd3373acc..b4ba6eb10c 100644 --- a/packages/auth-services/package.json +++ b/packages/auth-services/package.json @@ -20,7 +20,7 @@ "@elysiajs/cors": "^1.2.0", "@elysiajs/static": "^1.3.0", "@elysiajs/swagger": "^1.2.0", - "@lit-protocol/contracts": "^0.4.0", + "@lit-protocol/contracts": "^0.5.1", "@simplewebauthn/server": "6.2.1", "@simplewebauthn/typescript-types": "^8.3.4", "@t3-oss/env-core": "^0.12.0", From e23ce169f4394c9045be4983e8bbb19731af6dac Mon Sep 17 00:00:00 2001 From: anson Date: Fri, 19 Sep 2025 15:55:03 +0100 Subject: [PATCH 5/6] fix(e2e): fund accounts before creating PKP auth context --- bun.lock | 42 +++++++++---------- e2e/src/init.ts | 39 ++++++++--------- package.json | 2 +- .../envs/naga-staging/naga-staging.module.ts | 2 +- 4 files changed, 39 insertions(+), 46 deletions(-) diff --git a/bun.lock b/bun.lock index 39c9727e66..e49c2bf54a 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "name": "@lit-protocol/js-sdk", "dependencies": { "@dotenvx/dotenvx": "^1.6.4", - "@lit-protocol/contracts": "^0.5.0", + "@lit-protocol/contracts": "0.5.1", "@lit-protocol/nacl": "7.1.1", "@lit-protocol/uint8arrays": "7.1.1", "@metamask/eth-sig-util": "5.0.2", @@ -96,7 +96,7 @@ }, "packages/access-control-conditions": { "name": "@lit-protocol/access-control-conditions", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "ethers": "^5.7.1", "zod": "3.24.3", @@ -104,14 +104,14 @@ }, "packages/access-control-conditions-schemas": { "name": "@lit-protocol/access-control-conditions-schemas", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "zod": "3.24.3", }, }, "packages/auth": { "name": "@lit-protocol/auth", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "@noble/curves": "^1.8.1", "@simplewebauthn/browser": "^7.2.0", @@ -133,7 +133,7 @@ }, "packages/auth-helpers": { "name": "@lit-protocol/auth-helpers", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "@wagmi/core": "^2.17.1", "ethers": "^5.7.1", @@ -145,13 +145,13 @@ }, "packages/auth-services": { "name": "@lit-protocol/auth-services", - "version": "2.0.0-beta.9", + "version": "2.0.0-beta.1", "dependencies": { "@elysiajs/bearer": "^1.2.0", "@elysiajs/cors": "^1.2.0", "@elysiajs/static": "^1.3.0", "@elysiajs/swagger": "^1.2.0", - "@lit-protocol/contracts": "^0.4.0", + "@lit-protocol/contracts": "^0.5.1", "@simplewebauthn/server": "6.2.1", "@simplewebauthn/typescript-types": "^8.3.4", "@t3-oss/env-core": "^0.12.0", @@ -184,7 +184,7 @@ }, "packages/constants": { "name": "@lit-protocol/constants", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "@openagenda/verror": "^3.1.4", "zod": "3.24.3", @@ -192,7 +192,7 @@ }, "packages/crypto": { "name": "@lit-protocol/crypto", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "@lit-protocol/nacl": "7.1.1", "@lit-protocol/uint8arrays": "7.1.1", @@ -203,7 +203,7 @@ }, "packages/lit-client": { "name": "@lit-protocol/lit-client", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "@lit-protocol/uint8arrays": "7.1.1", "bs58": "^6.0.0", @@ -213,16 +213,16 @@ }, "packages/logger": { "name": "@lit-protocol/logger", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "pino": "^9.6.0", }, }, "packages/networks": { "name": "@lit-protocol/networks", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { - "@lit-protocol/contracts": "^0.4.0", + "@lit-protocol/contracts": "^0.5.1", "@lit-protocol/nacl": "7.1.1", "@noble/curves": "^1.8.1", "@wagmi/core": "^2.17.1", @@ -238,7 +238,7 @@ }, "packages/schemas": { "name": "@lit-protocol/schemas", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "ethers": "^5.7.1", "siwe": "^2.3.2", @@ -248,7 +248,7 @@ }, "packages/types": { "name": "@lit-protocol/types", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "ethers": "^5.7.1", "zod": "3.24.3", @@ -256,7 +256,7 @@ }, "packages/wasm": { "name": "@lit-protocol/wasm", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", "dependencies": { "ethers": "^5.7.1", "pako": "^2.1.0", @@ -264,11 +264,11 @@ }, "packages/wrapped-keys": { "name": "@lit-protocol/wrapped-keys", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", }, "packages/wrapped-keys-lit-actions": { "name": "@lit-protocol/wrapped-keys-lit-actions", - "version": "8.0.0-beta.6", + "version": "8.0.0-beta.1", }, }, "packages": { @@ -1090,7 +1090,7 @@ "@lit-protocol/constants": ["@lit-protocol/constants@workspace:packages/constants"], - "@lit-protocol/contracts": ["@lit-protocol/contracts@0.5.0", "", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-dXQkG5elAME73DulVEKUu/z43nfrCXj5F5rHW/2TsNbj/Da0206fWoeikHm6lJtfqeKpXkaPn6BN98LY6hwWpQ=="], + "@lit-protocol/contracts": ["@lit-protocol/contracts@0.5.1", "", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-2j4tQ5ZxNpQakXn7kEmepftlHrqYc5Gc6albDd1EewWvcNYtX32sLEgRGh5/qqYQKvAbA9/9kPFIE+g3p61rrw=="], "@lit-protocol/crypto": ["@lit-protocol/crypto@workspace:packages/crypto"], @@ -5028,8 +5028,6 @@ "@lerna/write-log-file/write-file-atomic": ["write-file-atomic@4.0.2", "", { "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" } }, "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="], - "@lit-protocol/auth-services/@lit-protocol/contracts": ["@lit-protocol/contracts@0.4.0", "", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-+PLkQNab2+n7AS6gLUD+b2JoVMTMSB2BDFRoO5epQuli/wd4HBH7XiwBb15111Ta7fn/+TR0R27YJLoDPNYCPg=="], - "@lit-protocol/auth-services/@simplewebauthn/typescript-types": ["@simplewebauthn/typescript-types@8.3.4", "", {}, "sha512-38xtca0OqfRVNloKBrFB5LEM6PN5vzFbJG6rAutPVrtGHFYxPdiV3btYWq0eAZAZmP+dqFPYJxJWeJrGfmYHng=="], "@lit-protocol/auth-services/ethers": ["ethers@5.7.2", "", { "dependencies": { "@ethersproject/abi": "5.7.0", "@ethersproject/abstract-provider": "5.7.0", "@ethersproject/abstract-signer": "5.7.0", "@ethersproject/address": "5.7.0", "@ethersproject/base64": "5.7.0", "@ethersproject/basex": "5.7.0", "@ethersproject/bignumber": "5.7.0", "@ethersproject/bytes": "5.7.0", "@ethersproject/constants": "5.7.0", "@ethersproject/contracts": "5.7.0", "@ethersproject/hash": "5.7.0", "@ethersproject/hdnode": "5.7.0", "@ethersproject/json-wallets": "5.7.0", "@ethersproject/keccak256": "5.7.0", "@ethersproject/logger": "5.7.0", "@ethersproject/networks": "5.7.1", "@ethersproject/pbkdf2": "5.7.0", "@ethersproject/properties": "5.7.0", "@ethersproject/providers": "5.7.2", "@ethersproject/random": "5.7.0", "@ethersproject/rlp": "5.7.0", "@ethersproject/sha2": "5.7.0", "@ethersproject/signing-key": "5.7.0", "@ethersproject/solidity": "5.7.0", "@ethersproject/strings": "5.7.0", "@ethersproject/transactions": "5.7.0", "@ethersproject/units": "5.7.0", "@ethersproject/wallet": "5.7.0", "@ethersproject/web": "5.7.1", "@ethersproject/wordlists": "5.7.0" } }, "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg=="], @@ -5040,8 +5038,6 @@ "@lit-protocol/nacl/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="], - "@lit-protocol/networks/@lit-protocol/contracts": ["@lit-protocol/contracts@0.4.0", "", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-+PLkQNab2+n7AS6gLUD+b2JoVMTMSB2BDFRoO5epQuli/wd4HBH7XiwBb15111Ta7fn/+TR0R27YJLoDPNYCPg=="], - "@lit-protocol/uint8arrays/@lit-protocol/constants": ["@lit-protocol/constants@7.1.1", "", { "dependencies": { "@ethersproject/abstract-provider": "5.7.0", "@lit-protocol/accs-schemas": "^0.0.24", "@lit-protocol/contracts": "^0.0.74", "@lit-protocol/types": "7.1.1", "@openagenda/verror": "^3.1.4", "depd": "^2.0.0", "ethers": "^5.7.1", "siwe": "^2.3.2", "tslib": "1.14.1" } }, "sha512-wJY5r8D0FdvtkQtcjx5JfPC3Qeb5SZ1m72HTcvJdqaJaBgaPP4eg2JSUg9uNJ+knOCyfdiBPl47XlWTGqe1X4Q=="], "@lit-protocol/uint8arrays/@lit-protocol/contracts": ["@lit-protocol/contracts@0.0.74", "", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-8uV038gzBp7ew7a4884SVt9Zhu8CtiTb+A8dKNnByxVoT1kFt4O4DmsaniV8p9AGjNR13IWfpU1NFChmPHVIpQ=="], diff --git a/e2e/src/init.ts b/e2e/src/init.ts index 5b8075672c..59200cedbe 100644 --- a/e2e/src/init.ts +++ b/e2e/src/init.ts @@ -150,6 +150,17 @@ export const init = async ( }); console.log('✅ Master Payment Balance:', masterPaymentBalance); + async function masterDepositForUser(userAddress: string) { + await masterPaymentManager.depositForUser({ + userAddress: userAddress, + amountInEth: LIVE_NETWORK_LEDGER_DEPOSIT_AMOUNT, + }); + console.log( + `✅ New ${userAddress} Ledger Balance:`, + await masterPaymentManager.getBalance({ userAddress: userAddress }) + ); + } + /** * ==================================== * Initialise the AuthManager @@ -185,6 +196,12 @@ export const init = async ( ), ]); + // Making sure all signers have sufficient ledger balance before calling the signSessionKey endpoint + await masterDepositForUser(aliceViemAccount.address); + await masterDepositForUser(bobViemAccount.address); + await masterDepositForUser(aliceViemAccountPkp.ethAddress); + await masterDepositForUser(bobViemAccountPkp.ethAddress); + /** * ==================================== * Create the auth context @@ -247,29 +264,9 @@ export const init = async ( * ==================================== */ - async function masterDepositForUser(userAddress: string) { - await masterPaymentManager.depositForUser({ - userAddress: userAddress, - amountInEth: LIVE_NETWORK_LEDGER_DEPOSIT_AMOUNT, - }); - console.log( - `✅ New ${userAddress} Ledger Balance:`, - await masterPaymentManager.getBalance({ userAddress: userAddress }) - ); - } - - // Deposit to the Alice EOA Ledger - await masterDepositForUser(aliceViemAccount.address); - - // Deposit to the PKP Ledger + // Deposit to the PKP Viem account Ledger await masterDepositForUser(alicePkpViemAccount.address); - // Deposit to the Bob EOA Ledger - await masterDepositForUser(bobViemAccount.address); - - // Deposit to the Bob PKP Ledger - await masterDepositForUser(bobViemAccountPkp.ethAddress); - // const alicePkpViemAccountPermissionsManager = await litClient.getPKPPermissionsManager({ // pkpIdentifier: { // tokenId: aliceViemAccountPkp.tokenId, diff --git a/package.json b/package.json index 5de665296c..3c9a9f0f88 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "private": true, "dependencies": { "@dotenvx/dotenvx": "^1.6.4", - "@lit-protocol/contracts": "^0.5.1", + "@lit-protocol/contracts": "0.5.1", "@lit-protocol/nacl": "7.1.1", "@lit-protocol/uint8arrays": "7.1.1", "@metamask/eth-sig-util": "5.0.2", diff --git a/packages/networks/src/networks/vNaga/envs/naga-staging/naga-staging.module.ts b/packages/networks/src/networks/vNaga/envs/naga-staging/naga-staging.module.ts index 21691df038..b6d214f080 100644 --- a/packages/networks/src/networks/vNaga/envs/naga-staging/naga-staging.module.ts +++ b/packages/networks/src/networks/vNaga/envs/naga-staging/naga-staging.module.ts @@ -5,7 +5,7 @@ import type { ExpectedAccountOrWalletClient } from '../../shared/managers/contra const nagaStaging = createBaseModule({ networkConfig: nagaStagingEnvironment.getConfig(), - moduleName: 'naga-staging', + moduleName: nagaStagingEnvironment.getNetworkName(), createChainManager: (account: ExpectedAccountOrWalletClient) => createChainManager(account), }); From 7bdc77e96af3eb3112d868b249dbfa0679a93500 Mon Sep 17 00:00:00 2001 From: anson Date: Mon, 22 Sep 2025 18:42:07 +0100 Subject: [PATCH 6/6] fix(custom-auth): surface payment errors and fund eve accounts --- e2e/src/e2e.spec.ts | 13 +++---------- e2e/src/init.ts | 2 ++ .../vNaga/shared/factories/BaseModuleFactory.ts | 8 ++++++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/e2e/src/e2e.spec.ts b/e2e/src/e2e.spec.ts index 66ef13c71b..f7c350b530 100644 --- a/e2e/src/e2e.spec.ts +++ b/e2e/src/e2e.spec.ts @@ -58,10 +58,7 @@ describe('all', () => { createExecuteJsTest(ctx, () => ctx.aliceEoaAuthContext)()); it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)()); it('viewPKPsByAuthData', () => - createViewPKPsByAuthDataTest( - ctx, - ctx.aliceViemAccountAuthData - )()); + createViewPKPsByAuthDataTest(ctx, ctx.aliceViemAccountAuthData)()); it('pkpEncryptDecrypt', () => createPkpEncryptDecryptTest(ctx, () => ctx.aliceEoaAuthContext)()); it('encryptDecryptFlow', () => @@ -99,13 +96,9 @@ describe('all', () => { createPkpSignTest(ctx, () => ctx.alicePkpAuthContext)()); it('executeJs', () => createExecuteJsTest(ctx, () => ctx.alicePkpAuthContext)()); - it('viewPKPsByAddress', () => - createViewPKPsByAddressTest(ctx)()); + it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)()); it('viewPKPsByAuthData', () => - createViewPKPsByAuthDataTest( - ctx, - ctx.aliceViemAccountAuthData - )()); + createViewPKPsByAuthDataTest(ctx, ctx.aliceViemAccountAuthData)()); it('pkpEncryptDecrypt', () => createPkpEncryptDecryptTest(ctx, () => ctx.alicePkpAuthContext)()); it('encryptDecryptFlow', () => diff --git a/e2e/src/init.ts b/e2e/src/init.ts index cff051724e..9d29e8694c 100644 --- a/e2e/src/init.ts +++ b/e2e/src/init.ts @@ -253,6 +253,8 @@ export const init = async ( await masterDepositForUser(bobViemAccount.address); await masterDepositForUser(aliceViemAccountPkp.ethAddress); await masterDepositForUser(bobViemAccountPkp.ethAddress); + await masterDepositForUser(eveViemAccount.address); + await masterDepositForUser(eveViemAccountPkp.ethAddress); /** * ==================================== diff --git a/packages/networks/src/networks/vNaga/shared/factories/BaseModuleFactory.ts b/packages/networks/src/networks/vNaga/shared/factories/BaseModuleFactory.ts index 8f849c4548..6f979713fe 100644 --- a/packages/networks/src/networks/vNaga/shared/factories/BaseModuleFactory.ts +++ b/packages/networks/src/networks/vNaga/shared/factories/BaseModuleFactory.ts @@ -905,6 +905,14 @@ export function createBaseModule(config: BaseModuleConfig) { jitContext: NagaJitContext, requestId?: string ) => { + if (!result.success) { + E2EERequestManager.handleEncryptedError( + result, + jitContext, + 'Sign Custom Session Key' + ); + } + const decryptedValues = E2EERequestManager.decryptBatchResponse( result, jitContext,