From 28f285845795240abc7c11ceefe049f466e80174 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:21:38 +0000 Subject: [PATCH 1/5] chore(deps): bump smoldot from 2.0.17 to 2.0.18 Bumps [smoldot](https://github.com/smol-dot/smoldot) from 2.0.17 to 2.0.18. - [Commits](https://github.com/smol-dot/smoldot/compare/light-js-deno-v2.0.17...light-js-deno-v2.0.18) --- updated-dependencies: - dependency-name: smoldot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../package.json | 2 +- packages/connect/package.json | 2 +- pnpm-lock.yaml | 21 +++++++++++++------ projects/extension/package.json | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/examples/light-client-extension-helpers-extension/package.json b/examples/light-client-extension-helpers-extension/package.json index a84c4a50e..635e615e5 100644 --- a/examples/light-client-extension-helpers-extension/package.json +++ b/examples/light-client-extension-helpers-extension/package.json @@ -16,7 +16,7 @@ "dependencies": { "@polkadot-api/substrate-client": "0.0.1-12c4b0432a814086c3c1a3b8052b31c72c2c9ad3.1.0", "@substrate/light-client-extension-helpers": "workspace:*", - "smoldot": "2.0.17" + "smoldot": "2.0.18" }, "devDependencies": { "@playwright/test": "^1.41.1", diff --git a/packages/connect/package.json b/packages/connect/package.json index f12749144..9ac7ee852 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -45,7 +45,7 @@ "@substrate/light-client-extension-helpers": "workspace:^", "@substrate/connect-extension-protocol": "workspace:^", "@substrate/connect-known-chains": "workspace:^", - "smoldot": "2.0.17" + "smoldot": "2.0.18" }, "devDependencies": { "eslint": "^8.53.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b02f33c4..90fa21cda 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -139,8 +139,8 @@ importers: specifier: workspace:* version: link:../../packages/light-client-extension-helpers smoldot: - specifier: 2.0.17 - version: 2.0.17 + specifier: 2.0.18 + version: 2.0.18 devDependencies: '@playwright/test': specifier: ^1.41.1 @@ -170,8 +170,8 @@ importers: specifier: workspace:^ version: link:../light-client-extension-helpers smoldot: - specifier: 2.0.17 - version: 2.0.17 + specifier: 2.0.18 + version: 2.0.18 devDependencies: eslint: specifier: ^8.53.0 @@ -366,8 +366,8 @@ importers: specifier: ^7.8.1 version: 7.8.1 smoldot: - specifier: 2.0.17 - version: 2.0.17 + specifier: 2.0.18 + version: 2.0.18 devDependencies: '@playwright/test': specifier: ^1.41.1 @@ -9179,6 +9179,15 @@ packages: - utf-8-validate dev: false + /smoldot@2.0.18: + resolution: {integrity: sha512-JkmhNczZ1yOav4stfMU4W6NPesrHXVpefHXsRZgFhWIRCawuavNPFH8p11igNumG0ax3dTrc4nW9+iOvNuUe1g==} + dependencies: + ws: 8.16.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + dev: false + /sonic-boom@3.7.0: resolution: {integrity: sha512-IudtNvSqA/ObjN97tfgNmOKyDOs4dNcg4cUUsHDebqsgb8wGBBwb31LIgShNO8fye0dFI52X1+tFoKKI6Rq1Gg==} dependencies: diff --git a/projects/extension/package.json b/projects/extension/package.json index f34154ba1..b9a5ea7a1 100644 --- a/projects/extension/package.json +++ b/projects/extension/package.json @@ -56,6 +56,6 @@ "react-dom": "^18.2.0", "react-icons": "^4.11.0", "rxjs": "^7.8.1", - "smoldot": "2.0.17" + "smoldot": "2.0.18" } } From 2e98482d34c1c7bf7c27fc65a87fd9bffa5d51aa Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 25 Jan 2024 15:06:52 -0300 Subject: [PATCH 2/5] fix(light-client-extension-helpers-extension): header check timeout --- .../light-client-extension-helpers-extension/package.json | 1 + .../playwright.config.ts | 2 +- .../tests/dapp.spec.ts | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/light-client-extension-helpers-extension/package.json b/examples/light-client-extension-helpers-extension/package.json index 635e615e5..b7d111f5a 100644 --- a/examples/light-client-extension-helpers-extension/package.json +++ b/examples/light-client-extension-helpers-extension/package.json @@ -11,6 +11,7 @@ "start": "web-ext run --source-dir ./dist -t chromium --start-url http://localhost:5173", "playwright": "playwright test --ui", "playwright:install": "playwright install --with-deps chromium", + "playwright:chrome": "playwright test --project=chrome", "playwright:chromium": "playwright test --project=chromium" }, "dependencies": { diff --git a/examples/light-client-extension-helpers-extension/playwright.config.ts b/examples/light-client-extension-helpers-extension/playwright.config.ts index 34dbf3810..b0c9a059c 100644 --- a/examples/light-client-extension-helpers-extension/playwright.config.ts +++ b/examples/light-client-extension-helpers-extension/playwright.config.ts @@ -37,7 +37,7 @@ export default defineConfig({ use: { ...devices["Desktop Chrome"] }, }, { - name: "Google Chrome", + name: "chrome", use: { ...devices["Desktop Chrome"], channel: "chrome" }, }, ], diff --git a/examples/light-client-extension-helpers-extension/tests/dapp.spec.ts b/examples/light-client-extension-helpers-extension/tests/dapp.spec.ts index 04ff17f4e..059a22aae 100644 --- a/examples/light-client-extension-helpers-extension/tests/dapp.spec.ts +++ b/examples/light-client-extension-helpers-extension/tests/dapp.spec.ts @@ -5,7 +5,9 @@ test("sanity", async ({ page }) => { await page.goto("/") await expect(page).toHaveTitle(/extension-dapp/) - await expect(page.locator("h1")).toHaveText("Extension Test DApp") + await expect(page.locator("h1")).toHaveText("Extension Test DApp", { + timeout: 30 * 1000, + }) for (const chainName of ["Polkadot", "Kusama", "Westend"]) { const chain = page.getByTestId(`chain${chainName}`) From 018f783b1e036f07c02bf48b47c5fa6b5585dbab Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 25 Jan 2024 16:13:29 -0300 Subject: [PATCH 3/5] chore(zombienet-tests): add more logs --- zombienet-tests/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zombienet-tests/src/utils.ts b/zombienet-tests/src/utils.ts index 6347158f9..c2dc6de88 100644 --- a/zombienet-tests/src/utils.ts +++ b/zombienet-tests/src/utils.ts @@ -18,7 +18,7 @@ const isWellKnownChain = (input: string): input is WellKnownChain => let client: ScClient const noop = () => {} const ScProvider = (input: string, relayChainSpec?: string) => { - client ??= createScClient() + client ??= createScClient({ embeddedNodeConfig: { maxLogLevel: 4 } }) const addChain = (input: string, jsonRpcCallback?: JsonRpcCallback) => isWellKnownChain(input) ? client.addWellKnownChain(input, jsonRpcCallback) From d0c2a8c05b126450fbf9e8e688da3d7fc3ef3b9b Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 25 Jan 2024 16:25:07 -0300 Subject: [PATCH 4/5] chore(zombienet-tests): add client.destroy() --- zombienet-tests/src/0001-checkSync.ts | 10 ++++++---- zombienet-tests/src/0002-checkSync.ts | 10 ++++++---- zombienet-tests/src/0003-test-against-chainspecs.ts | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/zombienet-tests/src/0001-checkSync.ts b/zombienet-tests/src/0001-checkSync.ts index d2c858335..2dd343ad9 100644 --- a/zombienet-tests/src/0001-checkSync.ts +++ b/zombienet-tests/src/0001-checkSync.ts @@ -1,19 +1,21 @@ import { connect } from "./utils" export async function run(nodeName: string, networkInfo: any) { - const { chainHead } = await connect(nodeName, networkInfo) + const client = await connect(nodeName, networkInfo) let count = 0 - await new Promise(async (resolve, reject) => { - const chainHeadFollower = chainHead( + await new Promise(async (resolve, reject) => { + const chainHeadFollower = client.chainHead( true, (event) => { if (event.type === "finalized" && ++count === 2) { - resolve(chainHeadFollower.unfollow()) + chainHeadFollower.unfollow() + resolve() } }, reject, ) }) + client.destroy() return count } diff --git a/zombienet-tests/src/0002-checkSync.ts b/zombienet-tests/src/0002-checkSync.ts index 6632f96cc..efed9610f 100644 --- a/zombienet-tests/src/0002-checkSync.ts +++ b/zombienet-tests/src/0002-checkSync.ts @@ -1,19 +1,21 @@ import { connect } from "./utils" export async function run(nodeName: string, networkInfo: any) { - const { chainHead } = await connect(nodeName, networkInfo, "100") + const client = await connect(nodeName, networkInfo, "100") let count = 0 - await new Promise(async (resolve, reject) => { - const chainHeadFollower = chainHead( + await new Promise(async (resolve, reject) => { + const chainHeadFollower = client.chainHead( true, (event) => { if (event.type === "finalized" && ++count === 2) { - resolve(chainHeadFollower.unfollow()) + chainHeadFollower.unfollow() + resolve() } }, reject, ) }) + client.destroy() return count } diff --git a/zombienet-tests/src/0003-test-against-chainspecs.ts b/zombienet-tests/src/0003-test-against-chainspecs.ts index 18e1452f1..2da8d8aed 100644 --- a/zombienet-tests/src/0003-test-against-chainspecs.ts +++ b/zombienet-tests/src/0003-test-against-chainspecs.ts @@ -10,18 +10,20 @@ export async function run(nodeName: string) { chainSpecPath: `../../packages/connect-known-chains/specs/${name}.json`, } - const { chainHead } = await connect("light-client", networkInfo) + const client = await connect("light-client", networkInfo) let count = 0 - await new Promise(async (resolve, reject) => { - const chainHeadFollower = chainHead( + await new Promise(async (resolve, reject) => { + const chainHeadFollower = client.chainHead( true, (event) => { if (event.type === "finalized" && ++count === 2) { - resolve(chainHeadFollower.unfollow()) + chainHeadFollower.unfollow() + resolve() } }, reject, ) }) + client.destroy() return count } From 664fd836cba50906625adf9e7e928dc1f2553845 Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 25 Jan 2024 16:41:34 -0300 Subject: [PATCH 5/5] chore: use zombienet@1.3.91 and polkadot@1.6.0 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bcf3ba29..a1eaf3b52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,23 +51,23 @@ jobs: - uses: ./.github/actions/turbo-build - name: Get zombienet run: | - curl -L -O https://github.com/paritytech/zombienet/releases/download/v1.3.68/zombienet-linux-x64 + curl -L -O https://github.com/paritytech/zombienet/releases/download/v1.3.91/zombienet-linux-x64 chmod +x zombienet-linux-x64 - name: Get polkadot run: | - curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.1.0/polkadot + curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.6.0/polkadot chmod +x polkadot - name: Get polkadot execute worker run: | - curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.1.0/polkadot-execute-worker + curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.6.0/polkadot-execute-worker chmod +x polkadot-execute-worker - name: Get polkadot prepare worker run: | - curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.1.0/polkadot-prepare-worker + curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.6.0/polkadot-prepare-worker chmod +x polkadot-prepare-worker - name: Get polkadot-parachain run: | - curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.1.0/polkadot-parachain + curl -L -O https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.6.0/polkadot-parachain chmod +x polkadot-parachain - name: Run test run: |