Merge branch 'main' into hm/update-notification-example

Author: hmalik88

.github/workflows/main.yml

@@ -96,7 +96,7 @@ jobs:
   re-run:
     name: Re-run failed jobs
     needs: lint-build-test
-    if: failure() && fromJSON(github.run_attempt) < 3
+    if: failure() && fromJSON(github.run_attempt) < 3 && github.event.pull_request.user.login != 'dependabot[bot]'
     runs-on: ubuntu-latest
     permissions:
       actions: write

packages/snaps-controllers/package.json

@@ -85,9 +85,9 @@
     "@metamask/json-rpc-middleware-stream": "^8.0.5",
     "@metamask/key-tree": "^10.0.1",
     "@metamask/object-multiplex": "^2.0.0",
-    "@metamask/permission-controller": "^11.0.3",
+    "@metamask/permission-controller": "^11.0.4",
     "@metamask/phishing-controller": "^12.3.1",
-    "@metamask/post-message-stream": "^8.1.1",
+    "@metamask/post-message-stream": "^9.0.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/snaps-registry": "^3.2.2",
     "@metamask/snaps-rpc-methods": "workspace:^",

packages/snaps-controllers/src/cronjob/CronjobController.ts

@@ -122,8 +122,6 @@ export class CronjobController extends BaseController<
   CronjobControllerState,
   CronjobControllerMessenger
 > {
-  #messenger: CronjobControllerMessenger;
-
   #dailyTimer!: Timer;
 
   #timers: Map<string, Timer>;
@@ -147,7 +145,6 @@ export class CronjobController extends BaseController<
     });
     this.#timers = new Map();
     this.#snapIds = new Map();
-    this.#messenger = messenger;
 
     this._handleSnapRegisterEvent = this._handleSnapRegisterEvent.bind(this);
     this._handleSnapUnregisterEvent =
@@ -227,7 +224,7 @@ export class CronjobController extends BaseController<
    * @returns Array of Cronjob specifications.
    */
   #getSnapJobs(snapId: SnapId): Cronjob[] | undefined {
-    const permissions = this.#messenger.call(
+    const permissions = this.messagingSystem.call(
       'PermissionController:getPermissions',
       snapId,
     );
@@ -303,7 +300,7 @@ export class CronjobController extends BaseController<
    */
   async #executeCronjob(job: Cronjob) {
     this.#updateJobLastRunState(job.id, Date.now());
-    await this.#messenger.call('SnapController:handleRequest', {
+    await this.messagingSystem.call('SnapController:handleRequest', {
       snapId: job.snapId,
       origin: '',
       handler: HandlerType.OnCronjob,
@@ -387,7 +384,7 @@ export class CronjobController extends BaseController<
 
     const timer = new Timer(ms);
     timer.start(() => {
-      this.#messenger
+      this.messagingSystem
         .call('SnapController:handleRequest', {
           snapId: event.snapId,
           origin: '',

packages/snaps-execution-environments/package.json

@@ -66,7 +66,7 @@
   "dependencies": {
     "@metamask/json-rpc-engine": "^10.0.1",
     "@metamask/object-multiplex": "^2.0.0",
-    "@metamask/post-message-stream": "^8.1.1",
+    "@metamask/post-message-stream": "^9.0.0",
     "@metamask/providers": "^18.1.1",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/snaps-sdk": "workspace:^",

packages/snaps-rpc-methods/package.json

@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@metamask/key-tree": "^10.0.1",
-    "@metamask/permission-controller": "^11.0.3",
+    "@metamask/permission-controller": "^11.0.4",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",

packages/snaps-sdk/src/types/permissions.ts

@@ -37,7 +37,7 @@ export type RequestedSnap = {
 
 export type InitialPermissions = Partial<{
   'endowment:cronjob': {
-    jobs: Cronjob[];
+    jobs?: Cronjob[];
     maxRequestTime?: number;
   };
   'endowment:ethereum-provider': EmptyObject;

packages/snaps-simulation/package.json

@@ -60,7 +60,7 @@
     "@metamask/json-rpc-engine": "^10.0.1",
     "@metamask/json-rpc-middleware-stream": "^8.0.5",
     "@metamask/key-tree": "^10.0.1",
-    "@metamask/permission-controller": "^11.0.3",
+    "@metamask/permission-controller": "^11.0.4",
     "@metamask/phishing-controller": "^12.3.1",
     "@metamask/snaps-controllers": "workspace:^",
     "@metamask/snaps-execution-environments": "workspace:^",

packages/snaps-simulator/package.json

@@ -51,7 +51,7 @@
     "@metamask/json-rpc-engine": "^10.0.1",
     "@metamask/json-rpc-middleware-stream": "^8.0.5",
     "@metamask/key-tree": "^10.0.1",
-    "@metamask/permission-controller": "^11.0.3",
+    "@metamask/permission-controller": "^11.0.4",
     "@metamask/snaps-controllers": "workspace:^",
     "@metamask/snaps-execution-environments": "workspace:^",
     "@metamask/snaps-rpc-methods": "workspace:^",

packages/snaps-utils/package.json

@@ -81,7 +81,7 @@
     "@babel/types": "^7.23.0",
     "@metamask/base-controller": "^7.0.2",
     "@metamask/key-tree": "^10.0.1",
-    "@metamask/permission-controller": "^11.0.3",
+    "@metamask/permission-controller": "^11.0.4",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/slip44": "^4.1.0",
     "@metamask/snaps-registry": "^3.2.2",
@@ -110,7 +110,7 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
-    "@metamask/post-message-stream": "^8.1.1",
+    "@metamask/post-message-stream": "^9.0.0",
     "@swc/core": "1.3.78",
     "@swc/jest": "^0.2.26",
     "@ts-bridge/cli": "^0.6.1",

packages/snaps-utils/src/manifest/validation.ts

@@ -191,7 +191,7 @@ export const PermissionsStruct: Describe<InitialPermissions> = type({
   'endowment:cronjob': optional(
     mergeStructs(
       HandlerCaveatsStruct,
-      object({ jobs: CronjobSpecificationArrayStruct }),
+      object({ jobs: optional(CronjobSpecificationArrayStruct) }),
     ),
   ),
   'endowment:ethereum-provider': optional(EmptyObjectStruct),