From ffa786507b7bbf501cb98362210955b013c2d865 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 17 Feb 2025 12:19:28 +0100
Subject: [PATCH] fix(controllers): Properly pass down execution service
 constructor args

---
 .../src/services/AbstractExecutionService.test.ts              | 3 ++-
 .../src/services/iframe/IframeExecutionService.ts              | 2 ++
 .../src/services/offscreen/OffscreenExecutionService.ts        | 2 ++
 .../src/services/proxy/ProxyExecutionService.ts                | 2 ++
 .../src/services/webview/WebViewExecutionService.ts            | 2 ++
 .../src/services/webworker/WebWorkerExecutionService.ts        | 2 ++
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/snaps-controllers/src/services/AbstractExecutionService.test.ts b/packages/snaps-controllers/src/services/AbstractExecutionService.test.ts
index b1b817f4a5..093411b3db 100644
--- a/packages/snaps-controllers/src/services/AbstractExecutionService.test.ts
+++ b/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),
diff --git a/packages/snaps-controllers/src/services/iframe/IframeExecutionService.ts b/packages/snaps-controllers/src/services/iframe/IframeExecutionService.ts
index 33fd9cbe4b..bca9cfafb1 100644
--- a/packages/snaps-controllers/src/services/iframe/IframeExecutionService.ts
+++ b/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,
     });
diff --git a/packages/snaps-controllers/src/services/offscreen/OffscreenExecutionService.ts b/packages/snaps-controllers/src/services/offscreen/OffscreenExecutionService.ts
index 887715250e..f1e03bbb8a 100644
--- a/packages/snaps-controllers/src/services/offscreen/OffscreenExecutionService.ts
+++ b/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({
diff --git a/packages/snaps-controllers/src/services/proxy/ProxyExecutionService.ts b/packages/snaps-controllers/src/services/proxy/ProxyExecutionService.ts
index 0e80bee1d4..47aa82ab6a 100644
--- a/packages/snaps-controllers/src/services/proxy/ProxyExecutionService.ts
+++ b/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,
diff --git a/packages/snaps-controllers/src/services/webview/WebViewExecutionService.ts b/packages/snaps-controllers/src/services/webview/WebViewExecutionService.ts
index 8f5a9166c6..053119c9bd 100644
--- a/packages/snaps-controllers/src/services/webview/WebViewExecutionService.ts
+++ b/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({
diff --git a/packages/snaps-controllers/src/services/webworker/WebWorkerExecutionService.ts b/packages/snaps-controllers/src/services/webworker/WebWorkerExecutionService.ts
index 4fb843b6f0..01c2c94db6 100644
--- a/packages/snaps-controllers/src/services/webworker/WebWorkerExecutionService.ts
+++ b/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,
     });