updates (#552)

* updates * use defaults * update cmd * update deps
AcalaNetwork · Nov 21, 2023 · b590f31 · b590f31
1 parent eb369ab
commit b590f31
Show file tree

Hide file tree

Showing 25 changed files with 3,909 additions and 5,089 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vendor/smoldot"]
 	path = vendor/smoldot
-	url = https://github.com/smol-dot/smoldot.git
+	url = https://github.com/ermalkaleci/smoldot.git
diff --git a/.yarn/patches/@polkadot-rpc-provider-npm-10.10.1-c60ba50fe2.patch b/.yarn/patches/@polkadot-rpc-provider-npm-10.10.1-c60ba50fe2.patch
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-typescript.cjs b/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-version.cjs b/.yarn/plugins/@yarnpkg/plugin-version.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.5.0.cjs b/.yarn/releases/yarn-3.5.0.cjs
diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -6,14 +6,4 @@ npmPublishRegistry: "https://registry.npmjs.org/"
 
 npmRegistryServer: "https://registry.npmjs.org/"
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/executor/Cargo.lock b/executor/Cargo.lock
diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chopsticks-executor"
-version = "0.9.2"
+version = "0.9.3-1"
 description = "Chopsticks executor"
 repository = "https://github.com/AcalaNetwork/chopsticks"
 license = "Apache-2.0"

diff --git a/executor/package.json b/executor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@acala-network/chopsticks-executor",
 	"description": "Chopsticks executor",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"license": "Apache-2.0",
 	"type": "module",
 	"repository": {
@@ -20,8 +20,8 @@
 		"@polkadot/wasm-util": "^7.2.2"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
 		"fflate": "^0.8.1"
 	},
 	"files": [

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "chopsticks-monorepo",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
-	"packageManager": "yarn@3.5.0",
+	"packageManager": "yarn@4.0.2",
 	"private": true,
 	"type": "module",
 	"workspaces": [
@@ -13,8 +13,8 @@
 		"lint": "tsc --noEmit --project tsconfig.lint.json && eslint . --ext .js,.ts && prettier --check .",
 		"fix": "eslint . --ext .js,.ts --fix && prettier -w .",
 		"prepare": "husky install",
-		"clean": "yarn workspaces foreach -pvit run clean",
-		"build": "yarn workspaces foreach -pvit --include '@acala-network/*' run build",
+		"clean": "yarn workspaces foreach --all -pvit run clean",
+		"build": "yarn workspaces foreach --all -pvit --include '@acala-network/*' run build",
 		"build-wasm": "yarn workspace @acala-network/chopsticks-executor run build",
 		"build:web-test": "yarn build && yarn workspace web-test run build",
 		"check": "cd executor && cargo check --locked",
@@ -23,7 +23,7 @@
 		"start": "NODE_OPTIONS='--loader ts-node/esm --loader ./loader.js --no-warnings' node packages/chopsticks/src/cli.ts",
 		"dev": "NODE_OPTIONS='--loader ts-node/esm --loader ./loader.js --no-warnings' LOG_LEVEL=trace node packages/chopsticks/src/cli.ts -- --config=configs/dev.yml",
 		"script:start": "yarn start",
-		"docs:prep": "yarn workspaces foreach -pvit run docs:prep && cp docs/* docs-src",
+		"docs:prep": "yarn workspaces foreach --all -pvit run docs:prep && cp docs/* docs-src",
 		"docs:dev": "yarn docs:prep && vitepress dev",
 		"docs:build": "yarn docs:prep && vitepress build",
 		"docs:preview": "yarn docs:build && vitepress preview"
@@ -41,18 +41,18 @@
 		"*.{js,ts,css,md}": "prettier --write"
 	},
 	"devDependencies": {
-		"@swc/core": "^1.3.96",
-		"@types/node": "^20.9.0",
+		"@swc/core": "^1.3.99",
+		"@types/node": "^20.9.3",
 		"@types/prettier": "^3.0.0",
-		"@typescript-eslint/eslint-plugin": "^6.10.0",
-		"@typescript-eslint/parser": "^6.10.0",
-		"eslint": "^8.53.0",
+		"@typescript-eslint/eslint-plugin": "^6.12.0",
+		"@typescript-eslint/parser": "^6.12.0",
+		"eslint": "^8.54.0",
 		"eslint-config-prettier": "^9.0.0",
 		"eslint-import-resolver-typescript": "^3.6.1",
 		"eslint-plugin-import": "^2.29.0",
 		"eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
 		"husky": "^8.0.3",
-		"prettier": "^3.0.3",
+		"prettier": "^3.1.0",
 		"ts-node": "^10.9.1",
 		"typedoc": "^0.25.3",
 		"typedoc-plugin-markdown": "^3.17.1",
@@ -62,8 +62,5 @@
 		"vitepress": "^1.0.0-rc.23",
 		"vitest": "^0.34.6",
 		"wasm-pack": "^0.12.1"
-	},
-	"resolutions": {
-		"@polkadot/rpc-provider@10.10.1": "patch:@polkadot/rpc-provider@npm%3A10.10.1#./.yarn/patches/@polkadot-rpc-provider-npm-10.10.1-c60ba50fe2.patch"
 	}
 }
diff --git a/packages/chopsticks/package.json b/packages/chopsticks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"bin": "./chopsticks.cjs",
@@ -21,7 +21,7 @@
 		"@polkadot/types": "^10.10.1",
 		"@polkadot/util": "^12.5.1",
 		"@polkadot/util-crypto": "^12.5.1",
-		"axios": "^1.6.0",
+		"axios": "^1.6.2",
 		"dotenv": "^16.3.1",
 		"global-agent": "^3.0.0",
 		"js-yaml": "^4.1.0",
@@ -32,14 +32,14 @@
 		"zod": "^3.22.4"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
 		"@types/global-agent": "^2.1.3",
 		"@types/js-yaml": "^4.0.9",
-		"@types/lodash": "^4.14.201",
-		"@types/node": "^20.9.0",
-		"@types/ws": "^8.5.9",
-		"@types/yargs": "^17.0.31",
+		"@types/lodash": "^4.14.202",
+		"@types/node": "^20.9.3",
+		"@types/ws": "^8.5.10",
+		"@types/yargs": "^17.0.32",
 		"typescript": "^5.2.2",
 		"vitest": "^0.34.6"
 	},

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -14,7 +14,6 @@
 	},
 	"dependencies": {
 		"@acala-network/chopsticks-executor": "workspace:*",
-		"@polkadot/api": "^10.10.1",
 		"@polkadot/rpc-provider": "^10.10.1",
 		"@polkadot/types": "^10.10.1",
 		"@polkadot/types-codec": "^10.10.1",
@@ -24,16 +23,16 @@
 		"comlink": "^4.4.1",
 		"eventemitter3": "^5.0.1",
 		"lodash": "^4.17.21",
-		"lru-cache": "^10.0.1",
-		"pino": "^8.16.1",
+		"lru-cache": "^10.0.3",
+		"pino": "^8.16.2",
 		"pino-pretty": "^10.2.3",
 		"rxjs": "^7.8.1",
 		"zod": "^3.22.4"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
-		"@types/lodash": "^4.14.201",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
+		"@types/lodash": "^4.14.202",
 		"typescript": "^5.2.2",
 		"vitest": "^0.34.6"
 	},

diff --git a/packages/core/src/utils/time-travel.ts b/packages/core/src/utils/time-travel.ts
@@ -28,8 +28,8 @@ export const getSlotDuration = async (chain: Blockchain) => {
   return meta.consts.babe
     ? (meta.consts.babe.expectedBlockTime as any as BN).toNumber()
     : meta.query.aura
-    ? getAuraSlotDuration(await chain.head.wasm)
-    : 12_000
+      ? getAuraSlotDuration(await chain.head.wasm)
+      : 12_000
 }
 
 export const timeTravel = async (chain: Blockchain, timestamp: number) => {

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-db",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -19,8 +19,8 @@
 		"typeorm": "^0.3.17"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
 		"typescript": "^5.2.2"
 	},
 	"files": [

diff --git a/packages/e2e/src/__snapshots__/hrmp.test.ts.snap b/packages/e2e/src/__snapshots__/hrmp.test.ts.snap
@@ -33,3 +33,20 @@ exports[`HRMP > Statemine handles horizonal messages > system events 1`] = `
   },
 ]
 `;
+
+exports[`HRMP > Statemine handles horizonal messages block#5,800,000 > system events 1`] = `
+[
+  {
+    "data": {
+      "messageHash": "(hash)",
+      "messageId": "(hash)",
+      "weight": {
+        "proofSize": "(rounded 3600)",
+        "refTime": "(rounded 310000000)",
+      },
+    },
+    "method": "Success",
+    "section": "xcmpQueue",
+  },
+]
+`;
diff --git a/packages/e2e/src/hrmp.test.ts b/packages/e2e/src/hrmp.test.ts
@@ -35,4 +35,11 @@ describe('HRMP', () => {
     await matchSystemEvents(acala, 'xcmpQueue', 'Success')
     await acala.teardown()
   })
+
+  it('Statemine handles horizonal messages block#5,800,000', async () => {
+    const statemine = await setupContext({ endpoint: 'wss://statemine-rpc.polkadot.io', blockNumber: 5_800_000 })
+    await statemine.chain.newBlock({ horizontalMessages: statemineHRMP })
+    await matchSystemEvents(statemine, 'xcmpQueue', 'Success')
+    await statemine.teardown()
+  })
 })
diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-testing",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -20,9 +20,9 @@
 		"vitest": "^0.34.0"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
-		"@types/chai": "^4.3.10",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
+		"@types/chai": "^4.3.11",
 		"typescript": "^5.2.2"
 	},
 	"files": [

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-utils",
-	"version": "0.9.2",
+	"version": "0.9.3-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -12,11 +12,13 @@
 		"build:types": "tsc -p tsconfig.json --emitDeclarationOnly --outDir dist/types"
 	},
 	"dependencies": {
-		"@acala-network/chopsticks": "workspace:*"
+		"@acala-network/chopsticks": "workspace:*",
+		"@polkadot/api": "^10.10.1",
+		"@polkadot/types": "^10.10.1"
 	},
 	"devDependencies": {
-		"@swc/cli": "0.1.62",
-		"@swc/core": "^1.3.96",
+		"@swc/cli": "0.1.63",
+		"@swc/core": "^1.3.99",
 		"typescript": "^5.2.2"
 	},
 	"files": [

diff --git a/packages/web-test/package.json b/packages/web-test/package.json
@@ -16,16 +16,18 @@
 		"@acala-network/chopsticks-db": "workspace:*",
 		"@emotion/react": "^11.11.1",
 		"@emotion/styled": "^11.11.0",
-		"@mui/material": "^5.14.17",
-		"@playwright/test": "^1.39.0",
-		"@types/react": "^18.2.37",
-		"@types/react-dom": "^18.2.15",
-		"@vitejs/plugin-react": "^4.1.1",
+		"@mui/material": "^5.14.18",
+		"@playwright/test": "^1.40.0",
+		"@types/react": "^18.2.38",
+		"@types/react-dom": "^18.2.16",
+		"@vitejs/plugin-react": "^4.2.0",
 		"crypto-browserify": "^3.12.0",
 		"path-browserify": "^1.0.1",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"stream-browserify": "^3.0.0",
-		"typescript": "^5.2.2"
+		"typescript": "^5.2.2",
+		"vite": "^4.5.0",
+		"vite-tsconfig-paths": "^4.2.1"
 	}
 }