From ea5822658b646b7e1209b5d82220dada76988ee7 Mon Sep 17 00:00:00 2001 From: Anton Lykhoyda Date: Thu, 4 Jan 2024 18:05:47 +0100 Subject: [PATCH 1/4] update tj actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5db556..7007ca7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: run: yarn --immutable - name: Build run: yarn build - - uses: tj-actions/verify-changed-files@v9 + - uses: tj-actions/verify-changed-files@v17 id: verify-changed-files with: files: | From 5a6c6aa3937e87566b8d3732b3f46f3806e8341c Mon Sep 17 00:00:00 2001 From: Anton Lykhoyda Date: Thu, 4 Jan 2024 18:26:37 +0100 Subject: [PATCH 2/4] set dappeteer version --- .../snap/test/integration/general.test.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/snap/test/integration/general.test.ts b/packages/snap/test/integration/general.test.ts index 2038c82..475a550 100644 --- a/packages/snap/test/integration/general.test.ts +++ b/packages/snap/test/integration/general.test.ts @@ -2,8 +2,8 @@ import { expect, use } from "chai"; import sinonChai from "sinon-chai"; import chaiAsPromised from "chai-as-promised"; import { Dappeteer, DappeteerPage, initSnapEnv } from "@chainsafe/dappeteer"; -import { buildSnap } from "./utils"; import { Methods } from "@chainsafe/aleo-snap-shared"; +import { buildSnap } from "./utils"; use(sinonChai); use(chaiAsPromised); @@ -27,6 +27,7 @@ describe("Integration tests", function () { seed: LOCAL_PREFUNDED_MNEMONIC, automation: AUTOMATION, metaMaskFlask: true, + metaMaskVersion: "v11.0.0", snapIdOrLocation: builtSnapDir, }); @@ -111,7 +112,8 @@ describe("Integration tests", function () { snapId, Methods.Decrypt, { - cipherText: "record1qyqspcvr3q75x5klxaa88ysjcpx36gz0zalsx7hjn5mtttqndcffxmgzqyxx66trwfhkxun9v35hguerqqpqzq83z5d5jpqwwhdglt05lnaq83dnnkfukg2upfwzywx849s5mkklqssure3s6926z2us892c84dqjm8qarn64z0pcqqw2l3t29jen4cs6c0qfnm", + cipherText: + "record1qyqspcvr3q75x5klxaa88ysjcpx36gz0zalsx7hjn5mtttqndcffxmgzqyxx66trwfhkxun9v35hguerqqpqzq83z5d5jpqwwhdglt05lnaq83dnnkfukg2upfwzywx849s5mkklqssure3s6926z2us892c84dqjm8qarn64z0pcqqw2l3t29jen4cs6c0qfnm", } ); @@ -132,17 +134,15 @@ describe("Integration tests", function () { await metaMask.snaps.dialog.accept(); const result = await invokeAction; - expect((result as string).length).to.deep.eq( - 216 - ); - expect((result as string).slice(0,4)).to.deep.eq( - "sign" - ); + expect((result as string).length).to.deep.eq(216); + expect((result as string).slice(0, 4)).to.deep.eq("sign"); }); it("fail sign on user decline", async function () { const expectPromise = expect( - metaMask.snaps.invokeSnap(testPage, snapId, Methods.Sign, { message: "Hello world!" }) + metaMask.snaps.invokeSnap(testPage, snapId, Methods.Sign, { + message: "Hello world!", + }) ).to.be.rejectedWith("Transaction not confirmed"); await metaMask.snaps.dialog.reject(); @@ -156,9 +156,10 @@ describe("Integration tests", function () { testPage, snapId, Methods.Verify, - { - message: "Message to verify", - signature: "sign1l4tgm3pdmrqxx9gtz3etp0x9crg6lvtk00980egxdlln7te9qqqnfj7g6zft0ma6f9suj3trwaydhhqt4mhd7zmpxz3ap7jhmnaa6q4g73h4v52d44n48d96eljqhtd2608f3su43qsz40wjelvpwfrwqdxyl7qkskdmghqr6etfu68jshkrlvt5z6hsujg53l927azv5qyssnmcsw9" + { + message: "Message to verify", + signature: + "sign1l4tgm3pdmrqxx9gtz3etp0x9crg6lvtk00980egxdlln7te9qqqnfj7g6zft0ma6f9suj3trwaydhhqt4mhd7zmpxz3ap7jhmnaa6q4g73h4v52d44n48d96eljqhtd2608f3su43qsz40wjelvpwfrwqdxyl7qkskdmghqr6etfu68jshkrlvt5z6hsujg53l927azv5qyssnmcsw9", } ); From 5123835d0c12bc4368ee0f51e0168c3a7cbb8d06 Mon Sep 17 00:00:00 2001 From: Anton Lykhoyda Date: Fri, 5 Jan 2024 16:35:58 +0100 Subject: [PATCH 3/4] set version of metamask --- packages/snap/test/integration/general.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snap/test/integration/general.test.ts b/packages/snap/test/integration/general.test.ts index 475a550..c68454b 100644 --- a/packages/snap/test/integration/general.test.ts +++ b/packages/snap/test/integration/general.test.ts @@ -27,7 +27,7 @@ describe("Integration tests", function () { seed: LOCAL_PREFUNDED_MNEMONIC, automation: AUTOMATION, metaMaskFlask: true, - metaMaskVersion: "v11.0.0", + metaMaskVersion: "v10.32.0", snapIdOrLocation: builtSnapDir, }); From facf1e9cb1942cb32d5215d658f928a913b74a0e Mon Sep 17 00:00:00 2001 From: Anton Lykhoyda Date: Tue, 16 Jan 2024 15:45:12 +0100 Subject: [PATCH 4/4] update dapeteer version --- packages/snap/package.json | 2 +- packages/snap/test/integration/general.test.ts | 1 - yarn.lock | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/snap/package.json b/packages/snap/package.json index bb1a125..7291cd1 100644 --- a/packages/snap/package.json +++ b/packages/snap/package.json @@ -37,7 +37,7 @@ "homepage": "https://github.com/chainsafe/aleo-snap#readme", "devDependencies": { "@aleohq/sdk": "^0.4.3", - "@chainsafe/dappeteer": "^5.2", + "@chainsafe/dappeteer": "^5.2.1", "@metamask/snaps-cli": "^2.0.1", "@metamask/snaps-types": "^2.0.0", "@metamask/snaps-ui": "^2.0.0", diff --git a/packages/snap/test/integration/general.test.ts b/packages/snap/test/integration/general.test.ts index c68454b..b8e564d 100644 --- a/packages/snap/test/integration/general.test.ts +++ b/packages/snap/test/integration/general.test.ts @@ -27,7 +27,6 @@ describe("Integration tests", function () { seed: LOCAL_PREFUNDED_MNEMONIC, automation: AUTOMATION, metaMaskFlask: true, - metaMaskVersion: "v10.32.0", snapIdOrLocation: builtSnapDir, }); diff --git a/yarn.lock b/yarn.lock index 96e88de..186cf07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2065,7 +2065,7 @@ __metadata: "@aleohq/sdk": ^0.4.3 "@chainsafe/aleo-snap-shared": "workspace:^" "@chainsafe/aleo-snap-wasm": "workspace:^" - "@chainsafe/dappeteer": ^5.2 + "@chainsafe/dappeteer": ^5.2.1 "@metamask/snaps-cli": ^2.0.1 "@metamask/snaps-types": ^2.0.0 "@metamask/snaps-ui": ^2.0.0 @@ -2096,9 +2096,9 @@ __metadata: languageName: node linkType: hard -"@chainsafe/dappeteer@npm:^5.2": - version: 5.2.0 - resolution: "@chainsafe/dappeteer@npm:5.2.0" +"@chainsafe/dappeteer@npm:^5.2.1": + version: 5.2.1 + resolution: "@chainsafe/dappeteer@npm:5.2.1" dependencies: "@metamask/providers": ^9.1.0 fs-extra: ^11.1.0 @@ -2115,7 +2115,7 @@ __metadata: optional: true bin: mmd: ./bin/metamask_downloader.js - checksum: e83b2e90d8027b0fddc06063098df4928f2f30249040d4306ba1b43598a231fe247622195101d85db5246e72582f643a449c32213c2242f8e0c940f61bf9845c + checksum: 0fc13829505c4ce5b5f4d0f7f4cc3aa825bda1dc3505da7b6584f615b7a8891bfcbfb2ef0a582c84909a7ef16078a598f742626249d7580e036e91c09f43fcc2 languageName: node linkType: hard