Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loosen get adapter param types #4835

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Loosen get adapter param types #4835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d81e41
Loosen get adapter param types
jiexi Oct 22, 2024
621ee37
Fix getEthAccounts usage in caip25Permission
jiexi Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ describe('CAIP-25 eth_accounts adapters', () => {
accounts: ['wallet:eip155:0x5'],
},
},
isMultichainOrigin: false,
});

expect(ethAccounts).toStrictEqual([
Expand Down
7 changes: 6 additions & 1 deletion packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ describe('CAIP-25 permittedChains adapters', () => {
accounts: ['eip155:100:0x100'],
},
},
isMultichainOrigin: false,
});

expect(ethChainIds).toStrictEqual(['0x1', '0x5', '0xa', '0x64']);
Expand Down
5 changes: 4 additions & 1 deletion packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import {
} from '../scope/types';

export const getPermittedEthChainIds = (
caip25CaveatValue: Caip25CaveatValue,
caip25CaveatValue: Pick<
Caip25CaveatValue,
'requiredScopes' | 'optionalScopes'
>,
) => {
const ethChainIds: Hex[] = [];
const sessionScopes = mergeScopes(
Expand Down
1 change: 0 additions & 1 deletion packages/multichain/src/caip25Permission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
Expand Down
Loading