From 5d81e41f63fc5d4a634597ccaaefa5a55a2b57e3 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Tue, 22 Oct 2024 12:03:35 -0700 Subject: [PATCH 1/2] Loosen get adapter param types --- .../adapters/caip-permission-adapter-eth-accounts.test.ts | 1 - .../src/adapters/caip-permission-adapter-eth-accounts.ts | 7 ++++++- .../caip-permission-adapter-permittedChains.test.ts | 1 - .../adapters/caip-permission-adapter-permittedChains.ts | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts b/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts index eb55966678..6f043ed763 100644 --- a/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts +++ b/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts @@ -49,7 +49,6 @@ describe('CAIP-25 eth_accounts adapters', () => { accounts: ['wallet:eip155:0x5'], }, }, - isMultichainOrigin: false, }); expect(ethAccounts).toStrictEqual([ diff --git a/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts b/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts index 6c72f1d07b..87848250b5 100644 --- a/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts +++ b/packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts @@ -19,7 +19,12 @@ const isEip155ScopeString = (scopeString: ScopeString) => { ); }; -export const getEthAccounts = (caip25CaveatValue: Caip25CaveatValue) => { +export const getEthAccounts = ( + caip25CaveatValue: Pick< + Caip25CaveatValue, + 'requiredScopes' | 'optionalScopes' + >, +) => { const ethAccounts: string[] = []; const sessionScopes = mergeScopes( caip25CaveatValue.requiredScopes, diff --git a/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts b/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts index 4020c2442b..6f6fdc78d4 100644 --- a/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts +++ b/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts @@ -46,7 +46,6 @@ describe('CAIP-25 permittedChains adapters', () => { accounts: ['eip155:100:0x100'], }, }, - isMultichainOrigin: false, }); expect(ethChainIds).toStrictEqual(['0x1', '0x5', '0xa', '0x64']); diff --git a/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts b/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts index 6a59efa916..0528a14ea7 100644 --- a/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts +++ b/packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts @@ -13,7 +13,10 @@ import { } from '../scope/types'; export const getPermittedEthChainIds = ( - caip25CaveatValue: Caip25CaveatValue, + caip25CaveatValue: Pick< + Caip25CaveatValue, + 'requiredScopes' | 'optionalScopes' + >, ) => { const ethChainIds: Hex[] = []; const sessionScopes = mergeScopes( From 621ee376fc1e2d4d1c4f5fe05897d5a86f0460e2 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Tue, 22 Oct 2024 12:56:58 -0700 Subject: [PATCH 2/2] Fix getEthAccounts usage in caip25Permission --- packages/multichain/src/caip25Permission.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/multichain/src/caip25Permission.ts b/packages/multichain/src/caip25Permission.ts index e58355c1f4..5914f1687a 100644 --- a/packages/multichain/src/caip25Permission.ts +++ b/packages/multichain/src/caip25Permission.ts @@ -130,7 +130,6 @@ const specificationBuilder: PermissionSpecificationBuilder< const ethAccounts = getEthAccounts({ requiredScopes: normalizedRequiredScopes, optionalScopes: normalizedOptionalScopes, - isMultichainOrigin, }).map((address) => address.toLowerCase() as Hex); const allEthAccountsSupported = ethAccounts.every((address) =>