Merge branch 'main' into hm/update-get-preferences

Author: hmalik88

.github/workflows/update-pull-request.yml

@@ -197,6 +197,8 @@ jobs:
       - prepare
       - dedupe-yarn-lock
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Restore yarn.lock
         uses: actions/cache/restore@v4
         with:

package.json

@@ -94,7 +94,7 @@
     "@typescript-eslint/eslint-plugin": "^5.42.1",
     "@typescript-eslint/parser": "^6.21.0",
     "@yarnpkg/types": "^4.0.0",
-    "chromedriver": "^133.0.0",
+    "chromedriver": "^133.0.1",
     "depcheck": "^1.4.7",
     "eslint": "^8.27.0",
     "eslint-config-prettier": "^8.5.0",

packages/snaps-controllers/src/services/AbstractExecutionService.test.ts

@@ -8,8 +8,9 @@ import type { ExecutionServiceArgs } from './AbstractExecutionService';
 import { NodeThreadExecutionService } from './node';
 
 class MockExecutionService extends NodeThreadExecutionService {
-  constructor({ messenger, setupSnapProvider }: ExecutionServiceArgs) {
+  constructor({ messenger, setupSnapProvider, ...args }: ExecutionServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
       initTimeout: inMilliseconds(5, Duration.Second),

packages/snaps-controllers/src/services/iframe/IframeExecutionService.ts

@@ -19,8 +19,10 @@ export class IframeExecutionService extends AbstractExecutionService<Window> {
     iframeUrl,
     messenger,
     setupSnapProvider,
+    ...args
   }: IframeExecutionEnvironmentServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
     });

packages/snaps-controllers/src/services/offscreen/OffscreenExecutionService.ts

@@ -25,8 +25,10 @@ export class OffscreenExecutionService extends ProxyExecutionService {
     messenger,
     setupSnapProvider,
     offscreenPromise,
+    ...args
   }: OffscreenExecutionEnvironmentServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
       stream: new BrowserRuntimePostMessageStream({

packages/snaps-controllers/src/services/proxy/ProxyExecutionService.ts

@@ -30,8 +30,10 @@ export class ProxyExecutionService extends AbstractExecutionService<string> {
     stream,
     messenger,
     setupSnapProvider,
+    ...args
   }: ProxyExecutionEnvironmentServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
       usePing: false,

packages/snaps-controllers/src/services/webview/WebViewExecutionService.ts

@@ -14,8 +14,10 @@ export class WebViewExecutionService extends ProxyExecutionService {
     messenger,
     setupSnapProvider,
     getWebView,
+    ...args
   }: WebViewExecutionServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
       stream: new WebViewMessageStream({

packages/snaps-controllers/src/services/webworker/WebWorkerExecutionService.ts

@@ -37,8 +37,10 @@ export class WebWorkerExecutionService extends AbstractExecutionService<string>
     documentUrl,
     messenger,
     setupSnapProvider,
+    ...args
   }: WebWorkerExecutionEnvironmentServiceArgs) {
     super({
+      ...args,
       messenger,
       setupSnapProvider,
     });

packages/snaps-simulation/src/helpers.ts

@@ -141,9 +141,7 @@ export type SnapHelpers = {
    * @param keyringRequest - Keyring request.
    * @returns The response.
    */
-  onKeyringRequest(
-    keyringRequest: KeyringOptions,
-  ): Promise<SnapResponseWithoutInterface>;
+  onKeyringRequest(keyringRequest: KeyringOptions): SnapRequest;
 
   /**
    * Get the response from the Snap's `onInstall` handler.
@@ -270,12 +268,10 @@ export function getHelpers({
     });
   };
 
-  const onKeyringRequest = async (
-    request: KeyringOptions,
-  ): Promise<SnapResponseWithoutInterface> => {
+  const onKeyringRequest = (request: KeyringOptions) => {
     log('Sending keyring request %o.', request);
 
-    const response = await handleRequest({
+    return handleRequest({
       snapId,
       store,
       executionService,
@@ -284,8 +280,6 @@ export function getHelpers({
       handler: HandlerType.OnKeyringRequest,
       request,
     });
-
-    return response;
   };
 
   return {

scripts/install-chrome.sh

@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, run `yarn update-chrome`
-CHROME_VERSION='133.0.6943.53-1'
+CHROME_VERSION='133.0.6943.98-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='5e071dacaa0e7c5c1c858d2389c872c4d45f1568436a9d1a30dbbd34ecbd69f71119154360edfb03682a50704d41202db051b40e6afcb47ea249a558c0c9eb08'
+CHROME_BINARY_SHA512SUM='51475f9b22e1cb0a1411398b437523a80bafb1d22033806ddc51e2f2c2e289a193995f5a1ff6c15a47c9738aff403261f25b50480c58b8dfb290c8e8df4ddc9b'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"