From 2d47b072d6cde50d967c8097fcbf23ca209cebef Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 27 Jan 2025 13:32:47 +0100 Subject: [PATCH 1/3] fix: Correct validation for assets scopes --- packages/snaps-utils/src/manifest/validation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snaps-utils/src/manifest/validation.ts b/packages/snaps-utils/src/manifest/validation.ts index becb3073b0..663a7c2071 100644 --- a/packages/snaps-utils/src/manifest/validation.ts +++ b/packages/snaps-utils/src/manifest/validation.ts @@ -191,7 +191,7 @@ export const PermissionsStruct: Describe = type({ 'endowment:assets': optional( mergeStructs( HandlerCaveatsStruct, - object({ scopes: size(array(ChainIdsStruct), 1, Infinity) }), + object({ scopes: size(array(ChainIdStruct), 1, Infinity) }), ), ), 'endowment:cronjob': optional( From cddf9d95513429e0f3ca702aeff1f7d62564c750 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 27 Jan 2025 13:36:19 +0100 Subject: [PATCH 2/3] Simplify Co-authored-by: Maarten Zuidhoorn --- packages/snaps-utils/src/manifest/validation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snaps-utils/src/manifest/validation.ts b/packages/snaps-utils/src/manifest/validation.ts index 663a7c2071..ec058c43b2 100644 --- a/packages/snaps-utils/src/manifest/validation.ts +++ b/packages/snaps-utils/src/manifest/validation.ts @@ -191,7 +191,7 @@ export const PermissionsStruct: Describe = type({ 'endowment:assets': optional( mergeStructs( HandlerCaveatsStruct, - object({ scopes: size(array(ChainIdStruct), 1, Infinity) }), + object({ scopes: ChainIdsStruct }), ), ), 'endowment:cronjob': optional( From 4074c8916a2036bb8cb074d4b7ce0f6c624cef98 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 27 Jan 2025 13:41:49 +0100 Subject: [PATCH 3/3] Fix lint --- packages/snaps-utils/src/manifest/validation.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/snaps-utils/src/manifest/validation.ts b/packages/snaps-utils/src/manifest/validation.ts index ec058c43b2..2721bb2cc8 100644 --- a/packages/snaps-utils/src/manifest/validation.ts +++ b/packages/snaps-utils/src/manifest/validation.ts @@ -189,10 +189,7 @@ export const EmptyObjectStruct = object({}) as unknown as Struct< /* eslint-disable @typescript-eslint/naming-convention */ export const PermissionsStruct: Describe = type({ 'endowment:assets': optional( - mergeStructs( - HandlerCaveatsStruct, - object({ scopes: ChainIdsStruct }), - ), + mergeStructs(HandlerCaveatsStruct, object({ scopes: ChainIdsStruct })), ), 'endowment:cronjob': optional( mergeStructs(