@metamask/snaps-controllers 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.1]
+### Fixed
+- Fix a few issues with allowlist version resolving ([#1888](https://github.com/MetaMask/snaps/pull/1888))
+
 ## [3.1.0]
 ### Added
 - Add static file API ([#1836](https://github.com/MetaMask/snaps/pull/1836))
@@ -90,7 +94,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.1.1...HEAD
+[3.1.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.1.0...@metamask/snaps-controllers@3.1.1
 [3.1.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.0.0...@metamask/snaps-controllers@3.1.0
 [3.0.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@2.0.2...@metamask/snaps-controllers@3.0.0
 [2.0.2]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@2.0.1...@metamask/snaps-controllers@2.0.2

package/dist/cjs/snaps/SnapController.js

@@ -597,16 +597,15 @@ class SnapController extends _basecontroller.BaseControllerV2 {
         try {
             for (const [snapId, { version: rawVersion }] of Object.entries(requestedSnaps)){
                 (0, _snapsutils.assertIsValidSnapId)(snapId);
-                const [error, resolvedVersion] = (0, _snapsutils.resolveVersionRange)(rawVersion);
+                const [error, version] = (0, _snapsutils.resolveVersionRange)(rawVersion);
                 if (error) {
                     throw _rpcerrors.rpcErrors.invalidParams(`The "version" field must be a valid SemVer version range if specified. Received: "${rawVersion}".`);
                 }
-                // If we are running in allowlist mode, try to match the version with an allowlist version.
-                const version = _class_private_field_get(this, _featureFlags).requireAllowlist ? await _class_private_method_get(this, _resolveAllowlistVersion, resolveAllowlistVersion).call(this, snapId, resolvedVersion) : resolvedVersion;
                 const location = _class_private_field_get(this, _detectSnapLocation).call(this, snapId, {
                     versionRange: version,
                     fetch: _class_private_field_get(this, _fetchFunction),
-                    allowLocal: _class_private_field_get(this, _featureFlags).allowLocalSnaps
+                    allowLocal: _class_private_field_get(this, _featureFlags).allowLocalSnaps,
+                    resolveVersion: async (range)=>_class_private_field_get(this, _featureFlags).requireAllowlist ? await _class_private_method_get(this, _resolveAllowlistVersion, resolveAllowlistVersion).call(this, snapId, range) : range
                 });
                 // Existing snaps may need to be updated, unless they should be re-installed (e.g. local snaps)
                 // Everything else is treated as an install