keep worker alive (#554)

* do not terminate worker on chain close

* teardown timeout

* update node test

* bump

* use latest vitest

* fix

* extend expect

* update endpoints

configs/statemine.yml

@@ -1,4 +1,4 @@
-endpoint: wss://statemine-rpc.polkadot.io
+endpoint: wss://statemine-rpc.dwellir.com
 mock-signature-host: true
 block: ${env.STATEMINE_BLOCK_NUMBER}
 db: ./db.sqlite

configs/statemint.yml

@@ -1,4 +1,4 @@
-endpoint: wss://statemint-rpc.polkadot.io
+endpoint: wss://statemint-rpc.dwellir.com
 mock-signature-host: true
 block: ${env.STATEMINT_BLOCK_NUMBER}
 db: ./db.sqlite

executor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chopsticks-executor"
-version = "0.9.3-1"
+version = "0.9.3-2"
 description = "Chopsticks executor"
 repository = "https://github.com/AcalaNetwork/chopsticks"
 license = "Apache-2.0"

executor/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@acala-network/chopsticks-executor",
 	"description": "Chopsticks executor",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"license": "Apache-2.0",
 	"type": "module",
 	"repository": {

package.json

@@ -60,7 +60,7 @@
 		"unplugin-swc": "^1.4.3",
 		"vite-tsconfig-paths": "^4.2.1",
 		"vitepress": "^1.0.0-rc.23",
-		"vitest": "^0.34.6",
+		"vitest": "^1.0.0-beta.5",
 		"wasm-pack": "^0.12.1"
 	}
 }

packages/chopsticks/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
 	"bin": "./chopsticks.cjs",
@@ -41,7 +41,7 @@
 		"@types/ws": "^8.5.10",
 		"@types/yargs": "^17.0.32",
 		"typescript": "^5.2.2",
-		"vitest": "^0.34.6"
+		"vitest": "^1.0.0-beta.5"
 	},
 	"files": [
 		"dist/esm/**",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -34,7 +34,7 @@
 		"@swc/core": "^1.3.99",
 		"@types/lodash": "^4.14.202",
 		"typescript": "^5.2.2",
-		"vitest": "^0.34.6"
+		"vitest": "^1.0.0-beta.5"
 	},
 	"files": [
 		"dist/esm/**",

packages/core/src/blockchain/index.ts

@@ -16,7 +16,7 @@ import { Database } from '../database.js'
 import { HeadState } from './head-state.js'
 import { InherentProvider } from './inherent/index.js'
 import { OffchainWorker } from '../offchain.js'
-import { RuntimeVersion, releaseWorker } from '../wasm-executor/index.js'
+import { RuntimeVersion } from '../wasm-executor/index.js'
 import { StorageValue } from './storage-layer.js'
 import { compactHex } from '../utils/index.js'
 import { defaultLogger } from '../logger.js'
@@ -536,10 +536,9 @@ export class Blockchain {
   }
 
   /**
-   * Close the db and release worker.
+   * Close the db and disconnect api.
    */
   async close() {
-    await releaseWorker()
     await this.api.disconnect()
     await this.db?.close()
   }

packages/core/src/wasm-executor/index.ts

@@ -213,12 +213,10 @@ export const getAuraSlotDuration = _.memoize(async (wasm: HexString): Promise<nu
   return u8aToBn(hexToU8a(result.Call.result).subarray(0, 8 /* u64: 8 bytes */)).toNumber()
 })
 
-export const releaseWorker = async () => {
+export const destroyWorker = async () => {
   if (!__executor_worker) return
   const executor = await __executor_worker
   executor.remote[Comlink.releaseProxy]()
-  // this delay seems to fix hanging tests
-  // https://github.com/vitest-dev/vitest/issues/3077
   await new Promise((resolve) => setTimeout(resolve, 50))
   await executor.terminate()
   __executor_worker = undefined

packages/db/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-db",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
 	"type": "module",

packages/e2e/package.json

@@ -15,6 +15,6 @@
 		"@acala-network/chopsticks-testing": "workspace:*",
 		"@polkadot/api": "^10.10.1",
 		"typescript": "^5.2.2",
-		"vitest": "^0.34.6"
+		"vitest": "^1.0.0-beta.5"
 	}
 }

packages/e2e/src/__snapshots__/decoder.test.ts.snap

@@ -66,7 +66,7 @@ exports[`decoder > with acala > decode key-value 4`] = `
   "tokens": {
     "accounts": {
       "25fqepuLngYL2DK9ApTejNzqPadUUZ9ALYyKWX2jyvEiuZLa": {
-        "{\\"token\\":\\"ACA\\"}": {
+        "{"token":"ACA"}": {
           "free": "10,000,000,000",
           "frozen": "0",
           "reserved": "0",

packages/e2e/src/build-block.test.ts

@@ -14,12 +14,12 @@ const KUSAMA_STORAGE = {
 
 describe.runIf(process.env.CI).each([
   { chain: 'Polkadot', endpoint: 'https://rpc.polkadot.io' },
-  { chain: 'Statemint', endpoint: 'wss://statemint-rpc.polkadot.io' },
+  { chain: 'Statemint', endpoint: 'wss://statemint-rpc.dwellir.com' },
   { chain: 'Polkadot Collectives', endpoint: 'wss://polkadot-collectives-rpc.polkadot.io' },
   { chain: 'Acala', endpoint: 'wss://acala-rpc-1.aca-api.network' },
 
   { chain: 'Kusama', endpoint: 'wss://kusama-rpc.polkadot.io', storage: KUSAMA_STORAGE },
-  { chain: 'Statemine', endpoint: 'wss://statemine-rpc.polkadot.io' },
+  { chain: 'Statemine', endpoint: 'wss://statemine-rpc.dwellir.com' },
   { chain: 'Karura', endpoint: 'wss://karura-rpc-3.aca-api.network' },
 
   { chain: 'Westend', endpoint: 'wss://westend-rpc.polkadot.io' },

packages/e2e/src/hrmp.test.ts

@@ -23,7 +23,7 @@ const acalaHRMP: Record<number, HorizontalMessage[]> = {
 
 describe('HRMP', () => {
   it('Statemine handles horizonal messages', async () => {
-    const statemine = await setupContext({ endpoint: 'wss://statemine-rpc.polkadot.io' })
+    const statemine = await setupContext({ endpoint: 'wss://statemine-rpc.dwellir.com' })
     await statemine.chain.newBlock({ horizontalMessages: statemineHRMP })
     await matchSystemEvents(statemine, 'xcmpQueue', 'Success')
     await statemine.teardown()
@@ -37,7 +37,7 @@ describe('HRMP', () => {
   })
 
   it('Statemine handles horizonal messages block#5,800,000', async () => {
-    const statemine = await setupContext({ endpoint: 'wss://statemine-rpc.polkadot.io', blockNumber: 5_800_000 })
+    const statemine = await setupContext({ endpoint: 'wss://statemine-rpc.dwellir.com', blockNumber: 5_800_000 })
     await statemine.chain.newBlock({ horizontalMessages: statemineHRMP })
     await matchSystemEvents(statemine, 'xcmpQueue', 'Success')
     await statemine.teardown()

packages/e2e/src/import-storage/index.test.ts

@@ -5,7 +5,7 @@ import { api, chain, setupApi } from '../helper.js'
 import { overrideStorage, overrideWasm } from '@acala-network/chopsticks/utils/override.js'
 
 setupApi({
-  endpoint: 'wss://acala-rpc-1.aca-api.network',
+  endpoint: 'wss://acala-rpc.aca-api.network',
   blockHash: '0x663c25dc86521f4b7f74dcbc26224bb0fac40e316e6b0bcf6a51de373f37afac', // 2_000_000
 })
 
@@ -34,14 +34,14 @@ describe('import-storage', () => {
   })
 
   it('wasm override works', async () => {
-    expect(await chain.head.runtimeVersion).toContain({ specVersion: 2096 })
+    expect(await chain.head.runtimeVersion).toEqual(expect.objectContaining({ specVersion: 2096 }))
     const oldWasm = await chain.head.wasm
     await overrideWasm(chain, path.join(__dirname, '../../blobs/acala-runtime-2101.txt'))
     expect(await chain.head.wasm).not.eq(oldWasm)
-    expect(await chain.head.runtimeVersion).toContain({ specVersion: 2101 })
+    expect(await chain.head.runtimeVersion).toEqual(expect.objectContaining({ specVersion: 2101 }))
     const blockNumber = chain.head.number
     // can produce blocks
-    await expect(chain.newBlock()).resolves.toContain({ number: blockNumber + 1 })
+    await expect(chain.newBlock()).resolves.toEqual(expect.objectContaining({ number: blockNumber + 1 }))
   })
 
   it('able to reset storage map', async () => {

packages/e2e/src/upgrade.test.ts

@@ -28,10 +28,10 @@ describe('upgrade', async () => {
 
     const runtime = readFileSync(path.join(__dirname, '../blobs/acala-runtime-2101.txt')).toString().trim()
 
-    expect(await chain.head.runtimeVersion).toContain({ specVersion: 2096 })
+    expect(await chain.head.runtimeVersion).toEqual(expect.objectContaining({ specVersion: 2096 }))
     await api.tx.sudo.sudoUncheckedWeight(api.tx.system.setCode(runtime), '0').signAndSend(alice)
     await dev.newBlock({ count: 3 })
-    expect(await chain.head.runtimeVersion).toContain({ specVersion: 2101 })
+    expect(await chain.head.runtimeVersion).toEqual(expect.objectContaining({ specVersion: 2101 }))
     expect(api.runtimeVersion.specVersion).toMatchInlineSnapshot(`2101`)
 
     await api.tx.balances.transfer(bob.address, 1e12).signAndSend(alice)

packages/node-test/index.cjs

@@ -1,8 +1,9 @@
-const { setupWithServer } = require('@acala-network/chopsticks')
+const { setupWithServer, destroyWorker } = require('@acala-network/chopsticks')
 
 async function main() {
 	const server = await setupWithServer({ endpoint: 'wss://rpc.polkadot.io', db: 'db.sqlite' })
 	await server.chain.newBlock()
 	await server.close()
+	await destroyWorker()
 }
 main()

packages/node-test/index.mjs

@@ -1,5 +1,6 @@
-import { setupWithServer } from '@acala-network/chopsticks'
+import { setupWithServer, destroyWorker } from '@acala-network/chopsticks'
 
 const server = await setupWithServer({ endpoint: 'wss://rpc.polkadot.io', db: 'db.sqlite' })
 await server.chain.newBlock()
 await server.close()
+await destroyWorker()

packages/testing/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-testing",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -17,7 +17,7 @@
 		"@polkadot/types": "^10.10.1"
 	},
 	"peerDependencies": {
-		"vitest": "^0.34.0"
+		"vitest": "*"
 	},
 	"devDependencies": {
 		"@swc/cli": "0.1.63",

packages/testing/src/check.ts

@@ -18,6 +18,8 @@ export type RedactOptions = {
   hash?: boolean // 32 byte hex
   hex?: boolean // any hex with 0x prefix
   address?: boolean // base58 address
+  redactKeys?: RegExp // redact value for keys matching regex
+  removeKeys?: RegExp // filter out keys matching regex
 }
 
 export class Checker {
@@ -140,7 +142,21 @@ export class Checker {
         return obj
       }
       if (typeof obj === 'object') {
-        return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, process(v)]))
+        return Object.fromEntries(
+          Object.entries(obj)
+            .filter(([k]) => {
+              if (this.#redactOptions?.removeKeys?.test(k)) {
+                return false
+              }
+              return true
+            })
+            .map(([k, v]) => {
+              if (this.#redactOptions?.redactKeys?.test(k)) {
+                return [k, '(redacted)']
+              }
+              return [k, process(v)]
+            }),
+        )
       }
       return obj
     }
@@ -216,7 +232,7 @@ export const checkUmp = ({ api }: Api) =>
 export const checkHrmp = ({ api }: Api) =>
   check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value) =>
     (value as any[]).map(({ recipient, data }) => ({
-      data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data),
+      data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
       recipient,
     })),
   )

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-utils",
-	"version": "0.9.3-1",
+	"version": "0.9.3-2",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
 	"type": "module",

packages/web-test/package.json

@@ -26,8 +26,10 @@
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"stream-browserify": "^3.0.0",
-		"typescript": "^5.2.2",
-		"vite": "^4.5.0",
-		"vite-tsconfig-paths": "^4.2.1"
+		"typescript": "^5.2.2"
+	},
+	"peerDependencies": {
+		"vite": "*",
+		"vite-tsconfig-paths": "*"
 	}
 }

tsconfig.base.json

@@ -10,7 +10,7 @@
 		"noUnusedParameters": true,
 		"noImplicitAny": false,
 		"target": "esnext",
-		"skipLibCheck": false,
+		"skipLibCheck": true,
 		"strict": true,
 		"declaration": true,
 		"resolveJsonModule": true,

vitest.config.mts

@@ -4,12 +4,11 @@ import tsconfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
 	test: {
-		minThreads: process.env.CI ? 1 : undefined /* use defaults */,
-		maxThreads: process.env.CI ? 4 : undefined /* use defaults */,
-		hookTimeout: 30000,
-		testTimeout: 120000,
+		hookTimeout: 30_000,
+		testTimeout: 120_000,
 		include: ['packages/**/*.test.ts'],
 		bail: process.env.CI ? 1 : undefined /* use defaults */,
+		pool: 'forks',
 	},
 	plugins: [swc.vite(), tsconfigPaths()],
 })