Merge branch 'main' into ink-4-1

Achim Schneider · Achim Schneider · commit 0af9976951d4 · 2023-04-05T15:49:55.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 ################################################################################
 
 # Start from a rust base image
-FROM rust:1.68.0 as base
+FROM rust:1.68.2 as base
 
 # Set the current directory
 WORKDIR /app
diff --git a/crates/backend/Cargo.toml b/crates/backend/Cargo.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 actix-web = "4.3.1"
 actix-web-prom = "0.6.0"
 actix-files = "0.6.2"
-clap = { version = "4.1.8" , features = [ "derive", "env" ]}
+clap = { version = "4.2.1" , features = [ "derive", "env" ]}
 serde_json = "1.0.94"
 serde = "1.0.155"
 actix-cors = "0.6.4"
diff --git a/crates/contract/Cargo.toml b/crates/contract/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 ink = { version = "4.1.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
-scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
 ink_e2e = { version = "4.1.0" }
diff --git a/crates/crate_extractor/Cargo.toml b/crates/crate_extractor/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Achim Schneider <achim@parity.io>"]
 license = "Apache-2.0"
 
 [dependencies]
-clap = { version =  "4.1.8", features = [ "derive" ] }
+clap = { version =  "4.2.1", features = [ "derive" ] }
 serde = { version = "1.0.155", features = ["derive"] }
 serde_json = { version = "1.0.94", features = ["preserve_order"] }
 crossbeam-channel = "0.5.7"
diff --git a/crates/generate-bindings/Cargo.toml b/crates/generate-bindings/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 readme = "README.md"
 
 [dependencies]
-clap = { version = "4.1.8", features = [ "derive" ] }
+clap = { version = "4.2.1", features = [ "derive" ] }
 serde = "1"
 backend = { path = "../backend" }
 typescript-type-def = "0.5.6"
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@typescript-eslint/parser": "^5.48.1",
     "cspell": "^5.21.2",
     "css-minimizer-webpack-plugin": "^4.0.0",
-    "eslint": "^8.31.0",
+    "eslint": "^8.37.0",
     "markdown-magic": "^2.6.1",
     "prettier": "^2.8.2"
   },
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -22,6 +22,6 @@
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.4"
+    "ts-jest": "^29.1.0"
   }
 }
diff --git a/packages/docker-tests/package.json b/packages/docker-tests/package.json
@@ -4,7 +4,7 @@
     "@types/jest": "^29.2.5",
     "axios": "^1.2.2",
     "jest": "^29.3.1",
-    "ts-jest": "^29.0.4",
+    "ts-jest": "^29.1.0",
     "typescript": "^4.9.4"
   },
   "scripts": {
diff --git a/packages/ink-editor/package.json b/packages/ink-editor/package.json
@@ -22,6 +22,6 @@
     "mini-css-extract-plugin": "^2.7.2",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "ts-loader": "^9.4.2",
-    "webpack": "^5.75.0"
+    "webpack": "^5.77.0"
   }
 }
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -49,10 +49,10 @@
     "remove": "^0.1.5",
     "rimraf": "^3.0.2",
     "tailwindcss": "^3.0.24",
-    "ts-jest": "^29.0.4",
+    "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
     "typescript": "^4.9.4",
-    "webpack": "^5.75.0",
+    "webpack": "^5.77.0",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1",
diff --git a/yarn.lock b/yarn.lock
@@ -2183,20 +2183,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "@eslint/eslintrc@npm:1.4.1"
+"@eslint-community/eslint-utils@npm:^4.2.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "@eslint-community/regexpp@npm:4.5.0"
+  checksum: 99c01335947dbd7f2129e954413067e217ccaa4e219fe0917b7d2bd96135789384b8fedbfb8eb09584d5130b27a7b876a7150ab7376f51b3a0c377d5ce026a10
+  languageName: node
+  linkType: hard
+
+"@eslint/eslintrc@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@eslint/eslintrc@npm:2.0.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
-    espree: ^9.4.0
+    espree: ^9.5.1
     globals: ^13.19.0
     ignore: ^5.2.0
     import-fresh: ^3.2.1
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: cd3e5a8683db604739938b1c1c8b77927dc04fce3e28e0c88e7f2cd4900b89466baf83dfbad76b2b9e4d2746abdd00dd3f9da544d3e311633d8693f327d04cd7
+  checksum: cfcf5e12c7b2c4476482e7f12434e76eae16fcd163ee627309adb10b761e5caa4a4e52ed7be464423320ff3d11eca5b50de5bf8be3e25834222470835dd5c801
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.37.0":
+  version: 8.37.0
+  resolution: "@eslint/js@npm:8.37.0"
+  checksum: 7a07fb085c94ce1538949012c292fd3a6cd734f149bc03af6157dfbd8a7477678899ef57b4a27e15b36470a997389ad79a0533d5880c71e67720ae1a7de7c62d
   languageName: node
   linkType: hard
 
@@ -2673,7 +2698,7 @@ __metadata:
     primereact: ^8.1.1
     react-transition-group: ^4.4.5
     rimraf: ^3.0.2
-    ts-jest: ^29.0.4
+    ts-jest: ^29.1.0
   languageName: unknown
   linkType: soft
 
@@ -2689,7 +2714,7 @@ __metadata:
     react-dom: ^18.2.0
     react-monaco-editor: ^0.49.0
     ts-loader: ^9.4.2
-    webpack: ^5.75.0
+    webpack: ^5.77.0
   languageName: unknown
   linkType: soft
 
@@ -5717,7 +5742,7 @@ __metadata:
     "@types/jest": ^29.2.5
     axios: ^1.2.2
     jest: ^29.3.1
-    ts-jest: ^29.0.4
+    ts-jest: ^29.1.0
     typescript: ^4.9.4
   languageName: unknown
   linkType: soft
@@ -6074,11 +6099,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.31.0":
-  version: 8.31.0
-  resolution: "eslint@npm:8.31.0"
+"eslint-visitor-keys@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "eslint-visitor-keys@npm:3.4.0"
+  checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^8.37.0":
+  version: 8.37.0
+  resolution: "eslint@npm:8.37.0"
   dependencies:
-    "@eslint/eslintrc": ^1.4.1
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.4.0
+    "@eslint/eslintrc": ^2.0.2
+    "@eslint/js": 8.37.0
     "@humanwhocodes/config-array": ^0.11.8
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
@@ -6089,10 +6124,9 @@ __metadata:
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
     eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.4.0
-    esquery: ^1.4.0
+    eslint-visitor-keys: ^3.4.0
+    espree: ^9.5.1
+    esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
     file-entry-cache: ^6.0.1
@@ -6113,24 +6147,23 @@ __metadata:
     minimatch: ^3.1.2
     natural-compare: ^1.4.0
     optionator: ^0.9.1
-    regexpp: ^3.2.0
     strip-ansi: ^6.0.1
     strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 5e5688bb864edc6b12d165849994812eefa67fb3fc44bb26f53659b63edcd8bcc68389d27cc6cc9e5b79ee22f24b6f311fa3ed047bddcafdec7d84c1b5561e4f
+  checksum: 80f3d5cdce2d671f4794e392d234a78d039c347673defb0596268bd481e8f30a53d93c01ff4f66a546c87d97ab4122c0e9cafe1371f87cb03cee6b7d5aa97595
   languageName: node
   linkType: hard
 
-"espree@npm:^9.4.0":
-  version: 9.4.1
-  resolution: "espree@npm:9.4.1"
+"espree@npm:^9.5.1":
+  version: 9.5.1
+  resolution: "espree@npm:9.5.1"
   dependencies:
     acorn: ^8.8.0
     acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 4d266b0cf81c7dfe69e542c7df0f246e78d29f5b04dda36e514eb4c7af117ee6cfbd3280e560571ed82ff6c9c3f0003c05b82583fc7a94006db7497c4fe4270e
+    eslint-visitor-keys: ^3.4.0
+  checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88
   languageName: node
   linkType: hard
 
@@ -6144,12 +6177,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "esquery@npm:1.4.0"
+"esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
   dependencies:
     estraverse: ^5.1.0
-  checksum: a0807e17abd7fbe5fbd4fab673038d6d8a50675cdae6b04fbaa520c34581be0c5fa24582990e8acd8854f671dd291c78bb2efb9e0ed5b62f33bac4f9cf820210
+  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
   languageName: node
   linkType: hard
 
@@ -9604,11 +9637,11 @@ __metadata:
     remove: ^0.1.5
     rimraf: ^3.0.2
     tailwindcss: ^3.0.24
-    ts-jest: ^29.0.4
+    ts-jest: ^29.1.0
     ts-loader: ^9.4.2
     typescript: ^4.9.4
     use-reducer-logger: ^1.0.2
-    webpack: ^5.75.0
+    webpack: ^5.77.0
     webpack-bundle-analyzer: ^4.7.0
     webpack-cli: ^5.0.1
     webpack-dev-server: ^4.11.1
@@ -10971,7 +11004,7 @@ __metadata:
     "@typescript-eslint/parser": ^5.48.1
     cspell: ^5.21.2
     css-minimizer-webpack-plugin: ^4.0.0
-    eslint: ^8.31.0
+    eslint: ^8.37.0
     markdown-magic: ^2.6.1
     prettier: ^2.8.2
   languageName: unknown
@@ -11853,9 +11886,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:^29.0.4":
-  version: 29.0.4
-  resolution: "ts-jest@npm:29.0.4"
+"ts-jest@npm:^29.1.0":
+  version: 29.1.0
+  resolution: "ts-jest@npm:29.1.0"
   dependencies:
     bs-logger: 0.x
     fast-json-stable-stringify: 2.x
@@ -11870,7 +11903,7 @@ __metadata:
     "@jest/types": ^29.0.0
     babel-jest: ^29.0.0
     jest: ^29.0.0
-    typescript: ">=4.3"
+    typescript: ">=4.3 <6"
   peerDependenciesMeta:
     "@babel/core":
       optional: true
@@ -11882,7 +11915,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: c3daa71835fabd0c98eefc8611edc083cd2c78cbe9a02c1edea707a907afffafc1e61051f4746c0634904d4c68cd70736d0875ae644f55c6ed8beb950bf78689
+  checksum: 535dc42ad523cbe1e387701fb2e448518419b515c082f09b25411f0b3dd0b854cf3e8141c316d6f4b99883aeb4a4f94159cbb1edfb06d7f77ea6229fadb2e1bf
   languageName: node
   linkType: hard
 
@@ -12441,9 +12474,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:^5.75.0":
-  version: 5.75.0
-  resolution: "webpack@npm:5.75.0"
+"webpack@npm:^5.77.0":
+  version: 5.77.0
+  resolution: "webpack@npm:5.77.0"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^0.0.51
@@ -12474,7 +12507,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a
+  checksum: 21341bb72cbbf61dfb3af91eabe9290a6c05139f268eff3c419e5339deb6c79f2f36de55d9abf017d3ccbad290a535c02325001b2816acc393f3c022e67ac17c
   languageName: node
   linkType: hard
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`"jest": "^29.3.1",`
`23`	`23`	`"jest-environment-jsdom": "^29.3.1",`
`24`	`24`	`"rimraf": "^3.0.2",`
`25`		`- "ts-jest": "^29.0.4"`
	`25`	`+ "ts-jest": "^29.1.0"`
`26`	`26`	`}`
`27`	`27`	`}`