Merge branch 'main' into NWNT-379-track-blockaid-metrics

zone-live · web-flow · commit 60c3ea91b508 · 2025-07-02T09:21:59.000+01:00
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     ]
   },
   "resolutions": {
-    "@metamask/snaps-sdk": "8.1.0"
+    "@metamask/snaps-sdk": "9.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
diff --git a/packages/snap/locales/de.json b/packages/snap/locales/de.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/el.json b/packages/snap/locales/el.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/es.json b/packages/snap/locales/es.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/fr.json b/packages/snap/locales/fr.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/hi.json b/packages/snap/locales/hi.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/id.json b/packages/snap/locales/id.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/ja.json b/packages/snap/locales/ja.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/ko.json b/packages/snap/locales/ko.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/pt.json b/packages/snap/locales/pt.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/ru.json b/packages/snap/locales/ru.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/tl.json b/packages/snap/locales/tl.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/tr.json b/packages/snap/locales/tr.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/vi.json b/packages/snap/locales/vi.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/locales/zh.json b/packages/snap/locales/zh.json
@@ -266,4 +266,4 @@
       "message": "An unknown error occurred."
     }
   }
-}
+}
diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -45,7 +45,7 @@
     "@metamask/keyring-snap-sdk": "^4.0.0",
     "@metamask/snaps-cli": "^8.1.0",
     "@metamask/snaps-jest": "9.2.0",
-    "@metamask/snaps-sdk": "^8.1.0",
+    "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "11.4.0",
     "@noble/ed25519": "2.1.0",
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snap-solana-wallet.git"
   },
   "source": {
-    "shasum": "EBrVuE+uXKdUKPSGja1momxWXqItfVGppjHtfMaDo+I=",
+    "shasum": "Ghld8TVzBnwQn+kQ4nQzKTDiPuWcDVQlhKMlyhfX7wo=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
@@ -90,6 +90,6 @@
     "snap_dialog": {},
     "snap_getPreferences": {}
   },
-  "platformVersion": "8.1.0",
+  "platformVersion": "9.0.0",
   "manifestVersion": "0.1"
 }
diff --git a/packages/snap/src/core/handlers/onAssetHistoricalPrice/onAssetHistoricalPrice.ts b/packages/snap/src/core/handlers/onAssetHistoricalPrice/onAssetHistoricalPrice.ts
@@ -15,23 +15,15 @@ import logger from '../../utils/logger';
 export const onAssetHistoricalPrice: OnAssetHistoricalPriceHandler = async (
   params,
 ) => {
-  try {
-    logger.log('[📈 onAssetHistoricalPrice]', params);
+  logger.log('[📈 onAssetHistoricalPrice]', params);
 
-    const { from, to } = params;
-    assert(from, CaipAssetTypeStruct);
-    assert(to, CaipAssetTypeStruct);
+  const { from, to } = params;
+  assert(from, CaipAssetTypeStruct);
+  assert(to, CaipAssetTypeStruct);
 
-    const historicalPrice = await tokenPricesService.getHistoricalPrice(
-      from,
-      to,
-    );
+  const historicalPrice = await tokenPricesService.getHistoricalPrice(from, to);
 
-    return {
-      historicalPrice,
-    };
-  } catch (error: any) {
-    logger.error('[📈 onAssetHistoricalPrice]', error);
-    return null;
-  }
+  return {
+    historicalPrice,
+  };
 };
diff --git a/packages/snap/src/core/handlers/onAssetsConversion/onAssetsConversion.ts b/packages/snap/src/core/handlers/onAssetsConversion/onAssetsConversion.ts
@@ -1,28 +1,17 @@
-import {
-  InternalError,
-  type OnAssetsConversionHandler,
-} from '@metamask/snaps-sdk';
+import { type OnAssetsConversionHandler } from '@metamask/snaps-sdk';
 
 import { tokenPricesService } from '../../../snapContext';
 import logger from '../../utils/logger';
 
 export const onAssetsConversion: OnAssetsConversionHandler = async (params) => {
-  try {
-    logger.log('[💱 onAssetsConversion]', params);
+  logger.log('[💱 onAssetsConversion]', params);
 
-    const { conversions, includeMarketData } = params;
+  const { conversions } = params;
 
-    const conversionRates =
-      await tokenPricesService.getMultipleTokenConversions(
-        conversions,
-        includeMarketData,
-      );
+  const conversionRates =
+    await tokenPricesService.getMultipleTokenConversions(conversions);
 
-    return {
-      conversionRates,
-    };
-  } catch (error: any) {
-    logger.error('[💱 onAssetsConversion]', error);
-    throw new InternalError(error) as Error;
-  }
+  return {
+    conversionRates,
+  };
 };
diff --git a/packages/snap/src/core/handlers/onAssetsLookup/onAssetsLookup.ts b/packages/snap/src/core/handlers/onAssetsLookup/onAssetsLookup.ts
@@ -1,8 +1,11 @@
-import type { OnAssetsLookupHandler } from '@metamask/snaps-sdk';
+import { type OnAssetsLookupHandler } from '@metamask/snaps-sdk';
 
 import { tokenMetadataClient } from '../../../snapContext';
+import logger from '../../utils/logger';
 
 export const onAssetsLookup: OnAssetsLookupHandler = async (params) => {
+  logger.log('[🔍 onAssetsLookup]', params);
+
   const { assets } = params;
 
   const metadata =
diff --git a/packages/snap/src/core/handlers/onAssetsMarketData/onAssetsMarketData.test.ts b/packages/snap/src/core/handlers/onAssetsMarketData/onAssetsMarketData.test.ts
diff --git a/packages/snap/src/core/handlers/onAssetsMarketData/onAssetsMarketData.ts b/packages/snap/src/core/handlers/onAssetsMarketData/onAssetsMarketData.ts
diff --git a/packages/snap/src/core/services/assets/AssetsService.test.ts b/packages/snap/src/core/services/assets/AssetsService.test.ts
diff --git a/packages/snap/src/core/services/assets/AssetsService.ts b/packages/snap/src/core/services/assets/AssetsService.ts
diff --git a/packages/snap/src/core/services/token-prices/TokenPrices.test.ts b/packages/snap/src/core/services/token-prices/TokenPrices.test.ts
diff --git a/packages/snap/src/core/services/token-prices/TokenPrices.ts b/packages/snap/src/core/services/token-prices/TokenPrices.ts
diff --git a/packages/snap/src/core/test/mocks/market-data.ts b/packages/snap/src/core/test/mocks/market-data.ts
diff --git a/packages/snap/src/snapContext.ts b/packages/snap/src/snapContext.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`]`
`37`	`37`	`},`
`38`	`38`	`"resolutions": {`
`39`		`- "@metamask/snaps-sdk": "8.1.0"`
	`39`	`+ "@metamask/snaps-sdk": "9.0.0"`
`40`	`40`	`},`
`41`	`41`	`"devDependencies": {`
`42`	`42`	`"@commitlint/cli": "^17.7.1",`
Original file line number	Diff line number	Diff line change
`@@ -266,4 +266,4 @@`
`266`	`266`	`"message": "An unknown error occurred."`
`267`	`267`	`}`
`268`	`268`	`}`
`269`		`-}`
	`269`	`+}`