Merge branch 'master' into bumb-version

moonbeam-foundation · Nov 21, 2023 · 8b7e227 · 8b7e227
2 parents df8ac59 + 00d16ad
commit 8b7e227
Show file tree

Hide file tree

Showing 3 changed files with 2,140 additions and 2,150 deletions.
diff --git a/scripts/verify-licenses.sh b/scripts/verify-licenses.sh
@@ -7,6 +7,7 @@ LICENSES=(
     "Apache-2.0 AND MIT"
     "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT"
     "Apache-2.0 OR BSD-1-Clause OR MIT"
+    "Apache-2.0 OR BSD-2-Clause OR MIT"
     "Apache-2.0 OR BSD-3-Clause OR MIT"
     "Apache-2.0 OR BSL-1.0"
     "Apache-2.0 OR CC0-1.0 OR MIT-0"
@@ -51,10 +52,10 @@ echo -e "checking licenses with filter:\n$filter\n"
 RESULT=$(jq "[.[] | select($filter)]" licenses.json)
 
 if [[ "$RESULT" == "[]" ]]; then
-  echo "OK !!"
-  exit 0
+    echo "OK !!"
+    exit 0
 else
-  echo -en "$RESULT\n"
-  echo "FAILURE !!"
-  exit 1
+    echo -en "$RESULT\n"
+    echo "FAILURE !!"
+    exit 1
 fi
diff --git a/test/package.json b/test/package.json
@@ -15,58 +15,56 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "devDependencies": {
-    "@moonbeam-network/api-augment": "^0.2600.0",
-    "@moonwall/cli": "^4.2.10",
-    "@moonwall/util": "^4.2.10",
-    "@polkadot/api": "^10.10.1",
-    "@polkadot/api-augment": "^10.10.1",
-    "@polkadot/types": "^10.10.1",
-    "@polkadot/types-codec": "^10.10.1",
-    "@polkadot/util": "^12.5.1",
-    "@types/debug": "^4.1.10",
-    "@types/node": "^20.8.10",
-    "@types/semver": "^7.5.4",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
-    "bottleneck": "^2.19.5",
-    "bun-types": "^0.7.3",
-    "debug": "^4.3.4",
-    "eslint": "^8.52.0",
-    "eslint-plugin-unused-imports": "^3.0.0",
-    "ethers": "^6.8.0",
-    "prettier": "^2.8.8",
-    "tsx": "^3.14.0",
-    "typescript": "^5.2.2",
-    "web3": "4.2.1",
-    "web3-eth": "4.3.1",
-    "web3-providers-ws": "4.0.7",
-    "yargs": "^17.7.2"
-  },
   "dependencies": {
-    "@acala-network/chopsticks": "^0.8.4",
-    "@openzeppelin/contracts": "^4.9.3",
-    "@polkadot/api-derive": "^10.10.1",
-    "@polkadot/apps-config": "^0.132.1",
-    "@polkadot/keyring": "^12.5.1",
-    "@polkadot/rpc-provider": "^10.10.1",
-    "@polkadot/util-crypto": "^12.5.1",
-    "@substrate/txwrapper-core": "^6.0.1",
-    "@substrate/txwrapper-substrate": "^6.0.1",
-    "@types/yargs": "^17.0.29",
-    "@vitest/ui": "1.0.0-beta.2",
-    "@zombienet/utils": "^0.0.19",
-    "chalk": "^5.3.0",
+    "@acala-network/chopsticks": "0.9.2",
+    "@moonbeam-network/api-augment": "0.2600.0",
+    "@moonwall/cli": "4.4.2",
+    "@moonwall/util": "4.4.2",
+    "@openzeppelin/contracts": "4.9.3",
+    "@polkadot/api": "10.11.1",
+    "@polkadot/api-augment": "10.11.1",
+    "@polkadot/api-derive": "10.11.1",
+    "@polkadot/apps-config": "0.133.1",
+    "@polkadot/keyring": "12.6.1",
+    "@polkadot/rpc-provider": "10.11.1",
+    "@polkadot/types": "10.11.1",
+    "@polkadot/types-codec": "10.11.1",
+    "@polkadot/util": "12.6.1",
+    "@polkadot/util-crypto": "12.6.1",
+    "@substrate/txwrapper-core": "7.1.1",
+    "@substrate/txwrapper-substrate": "7.1.1",
+    "@vitest/ui": "1.0.0-beta.5",
+    "@zombienet/utils": "0.0.24",
+    "chalk": "5.3.0",
     "eth-object": "github:aurora-is-near/eth-object#master",
-    "json-bigint": "^1.0.0",
-    "json-stable-stringify": "^1.0.2",
-    "merkle-patricia-tree": "^4.2.4",
-    "node-fetch": "^3.3.2",
-    "randomness": "^1.6.6",
-    "rlp": "^3.0.0",
-    "semver": "^7.5.4",
+    "json-bigint": "1.0.0",
+    "json-stable-stringify": "1.1.0",
+    "merkle-patricia-tree": "4.2.4",
+    "node-fetch": "3.3.2",
+    "randomness": "1.6.6",
+    "rlp": "3.0.0",
+    "semver": "7.5.4",
     "solc": "0.8.21",
-    "viem": "^1.18.1",
-    "vitest": "1.0.0-beta.3"
+    "viem": "1.19.1",
+    "vitest": "1.0.0-beta.5",
+    "web3": "4.2.1"
+  },
+  "devDependencies": {
+    "@types/debug": "4.1.12",
+    "@types/node": "20.9.2",
+    "@types/semver": "7.5.5",
+    "@types/yargs": "17.0.31",
+    "@typescript-eslint/eslint-plugin": "6.11.0",
+    "@typescript-eslint/parser": "6.11.0",
+    "bottleneck": "2.19.5",
+    "bun-types": "1.0.13",
+    "debug": "4.3.4",
+    "eslint": "8.54.0",
+    "eslint-plugin-unused-imports": "3.0.0",
+    "ethers": "6.8.0",
+    "prettier": "2.8.8",
+    "tsx": "3.14.0",
+    "typescript": "5.2.2",
+    "yargs": "17.7.2"
   }
 }