Skip to content

Commit 251a358

Browse files
sirtimidrekmarks
andauthored
chore: Update Ocap kernel packages and patch @endo/env-options (#35526)
## Description Updates the Ocap kernel packages to v5.0.0 and adds a patch for `@endo/env-options` to fix a runtime initialization error. ## Changes - Updated Ocap kernel packages to latest version - Added patch for `@endo/env-options` to resolve `ReferenceError: Cannot access 'Object' before initialization` - The issue was caused by Endo's recent change to place env-options under TCB (Trusted Computing Base) rules - Patch removes the intermediate `localThis` variable and uses `globalThis` directly This update introduces the new control panel layout <img width="1512" height="763" alt="Screenshot 2025-08-29 at 17 13 03" src="https://github.com/user-attachments/assets/e9f0ca96-ed4e-4d94-af7a-84f636086fa1" /> --------- Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
1 parent a9dc8f6 commit 251a358

3 files changed

Lines changed: 284 additions & 234 deletions

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/src/env-options.js b/src/env-options.js
2+
index 97bc7bea5..e254a1856 100644
3+
--- a/src/env-options.js
4+
+++ b/src/env-options.js
5+
@@ -8,10 +8,6 @@
6+
// Prelude of cheap good - enough imitations of things we'd use or
7+
// do differently if we could depend on ses
8+
9+
-// eslint-disable-next-line no-restricted-globals
10+
-const localThis = globalThis;
11+
-
12+
-const { Object, Reflect, Array, String, JSON, Error } = localThis;
13+
const { freeze } = Object;
14+
const { apply } = Reflect;
15+
16+
@@ -146,4 +142,4 @@ export const {
17+
getEnvironmentOption,
18+
getEnvironmentOptionsList,
19+
environmentOptionsListHas,
20+
-} = makeEnvironmentCaptor(localThis, true);
21+
+} = makeEnvironmentCaptor(globalThis, true);

package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,10 @@
238238
"tar-fs@npm:^2.1.0": "^2.1.3",
239239
"lodash.memoize@npm:^4.1.2": "patch:lodash.memoize@npm%3A4.1.2#~/.yarn/patches/lodash.memoize-npm-4.1.2-0e6250041f.patch",
240240
"lodash": "patch:lodash@npm%3A4.17.21#~/.yarn/patches/lodash-npm-4.17.21-6382451519.patch",
241-
"dompurify": "patch:dompurify@npm%3A3.2.5#~/.yarn/patches/dompurify-npm-3.2.5-d9af707abe.patch"
241+
"dompurify": "patch:dompurify@npm%3A3.2.5#~/.yarn/patches/dompurify-npm-3.2.5-d9af707abe.patch",
242+
"@endo/env-options@npm:^1.1.11": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
243+
"@endo/env-options@npm:^1.1.7": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
244+
"@endo/env-options@npm:^1.1.8": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch"
242245
},
243246
"dependencies": {
244247
"@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
@@ -298,16 +301,16 @@
298301
"@metamask/jazzicon": "^2.0.0",
299302
"@metamask/json-rpc-engine": "^10.0.0",
300303
"@metamask/json-rpc-middleware-stream": "^8.0.4",
301-
"@metamask/kernel-browser-runtime": "^0.2.0",
302-
"@metamask/kernel-shims": "^0.2.0",
303-
"@metamask/kernel-ui": "^0.1.0",
304-
"@metamask/kernel-utils": "^0.1.0",
304+
"@metamask/kernel-browser-runtime": "^0.4.0",
305+
"@metamask/kernel-shims": "^0.3.0",
306+
"@metamask/kernel-ui": "^0.3.0",
307+
"@metamask/kernel-utils": "^0.3.0",
305308
"@metamask/keyring-api": "^20.1.1",
306309
"@metamask/keyring-controller": "^22.1.1",
307310
"@metamask/keyring-internal-api": "^8.0.0",
308311
"@metamask/keyring-internal-snap-client": "^6.0.0",
309312
"@metamask/keyring-snap-client": "^7.0.0",
310-
"@metamask/logger": "^0.3.0",
313+
"@metamask/logger": "^0.5.0",
311314
"@metamask/logging-controller": "^6.0.4",
312315
"@metamask/logo": "^4.0.0",
313316
"@metamask/message-manager": "^12.0.1",
@@ -347,7 +350,7 @@
347350
"@metamask/snaps-utils": "^11.5.0",
348351
"@metamask/solana-wallet-snap": "^2.3.3",
349352
"@metamask/solana-wallet-standard": "^0.5.1",
350-
"@metamask/streams": "^0.2.0",
353+
"@metamask/streams": "^0.4.0",
351354
"@metamask/transaction-controller": "^60.1.0",
352355
"@metamask/user-operation-controller": "^38.0.0",
353356
"@metamask/utils": "^11.4.2",

0 commit comments

Comments
 (0)