From 3d8772f2be3812141771e196e3f220cb2ea8fc02 Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Tue, 15 Apr 2025 14:47:39 +0200 Subject: [PATCH 1/3] pass `includeMarketData` to handler arguments --- .../src/common/commands.test.ts | 22 +++++++++++++++++++ .../src/common/commands.ts | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/snaps-execution-environments/src/common/commands.test.ts b/packages/snaps-execution-environments/src/common/commands.test.ts index 068914e495..079a569bf2 100644 --- a/packages/snaps-execution-environments/src/common/commands.test.ts +++ b/packages/snaps-execution-environments/src/common/commands.test.ts @@ -41,6 +41,28 @@ describe('getHandlerArguments', () => { ).toThrow('Invalid request params'); }); + it('validates the request params for the OnAssetsConversion handler', () => { + expect(() => + getHandlerArguments(MOCK_ORIGIN, HandlerType.OnAssetsConversion, { + id: 1, + jsonrpc: '2.0', + method: 'foo', + params: {}, + }), + ).toThrow('Invalid request params'); + }); + + it('validates the request params for the OnAssetsLookup handler', () => { + expect(() => + getHandlerArguments(MOCK_ORIGIN, HandlerType.OnAssetsLookup, { + id: 1, + jsonrpc: '2.0', + method: 'foo', + params: {}, + }), + ).toThrow('Invalid request params'); + }); + it('validates the request params for the OnAssetHistoricalPrice handler', () => { expect(() => getHandlerArguments(MOCK_ORIGIN, HandlerType.OnAssetHistoricalPrice, { diff --git a/packages/snaps-execution-environments/src/common/commands.ts b/packages/snaps-execution-environments/src/common/commands.ts index 588c7fe8f4..333ab29897 100644 --- a/packages/snaps-execution-environments/src/common/commands.ts +++ b/packages/snaps-execution-environments/src/common/commands.ts @@ -74,8 +74,8 @@ export function getHandlerArguments( } case HandlerType.OnAssetsConversion: { assertIsOnAssetsConversionRequestArguments(request.params); - const { conversions } = request.params; - return { conversions }; + const { conversions, includeMarketData } = request.params; + return { conversions, includeMarketData }; } case HandlerType.OnNameLookup: { assertIsOnNameLookupRequestArguments(request.params); From 097185baf37ec6fd01a3dab1794e9cbf73c8d449 Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Tue, 15 Apr 2025 14:54:43 +0200 Subject: [PATCH 2/3] update changelog --- packages/snaps-execution-environments/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/snaps-execution-environments/CHANGELOG.md b/packages/snaps-execution-environments/CHANGELOG.md index 0176b7ec96..7be6ded22d 100644 --- a/packages/snaps-execution-environments/CHANGELOG.md +++ b/packages/snaps-execution-environments/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Pass forgotten `includeMarkeData` param in `onAssetsConversion` handler to the Snap ([#3323](https://github.com/MetaMask/snaps/pull/3323)) + ## [7.2.0] ### Added From 2fd647b2db10172e6c0a7cfcec586579d80ce06e Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Tue, 15 Apr 2025 15:05:13 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Maarten Zuidhoorn --- packages/snaps-execution-environments/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snaps-execution-environments/CHANGELOG.md b/packages/snaps-execution-environments/CHANGELOG.md index 7be6ded22d..2e02d2b122 100644 --- a/packages/snaps-execution-environments/CHANGELOG.md +++ b/packages/snaps-execution-environments/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Pass forgotten `includeMarkeData` param in `onAssetsConversion` handler to the Snap ([#3323](https://github.com/MetaMask/snaps/pull/3323)) +- Add missing `includeMarketData` param to `onAssetsConversion` handler ([#3323](https://github.com/MetaMask/snaps/pull/3323)) ## [7.2.0]