Skip to content

Commit

Permalink
Merge branch 'master' into rq/fix-comments
Browse files Browse the repository at this point in the history
  • Loading branch information
RomarQ committed Sep 25, 2024
2 parents a0768a2 + cd7510d commit dc95ac0
Show file tree
Hide file tree
Showing 9 changed files with 7,264 additions and 8,284 deletions.
2 changes: 1 addition & 1 deletion .github/workflow-templates/dev-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 22.8.0
node-version: 20.10.0
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml

Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- name: Run Eslint check
Expand Down Expand Up @@ -594,7 +594,7 @@ jobs:
(github.event_name == 'push' && github.ref == 'refs/heads/master')
runs-on:
labels: bare-metal
needs: ["set-tags", "build"]
needs: ["set-tags", "build", "dev-test"]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -611,7 +611,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- run: |
Expand Down Expand Up @@ -704,9 +704,10 @@ jobs:
lazy-loading-tests:
runs-on:
labels: bare-metal
needs: ["set-tags", "build"]
needs: ["set-tags", "build", "typescript-tracing-tests"]
strategy:
fail-fast: false
max-parallel: 1
matrix:
chain: ["moonbeam"]
env:
Expand All @@ -723,7 +724,7 @@ jobs:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
- name: Create local folders
run: |
mkdir -p target/release/wbuild/${{ matrix.chain }}-runtime/
Expand Down Expand Up @@ -761,7 +762,7 @@ jobs:
chopsticks-upgrade-test:
runs-on:
labels: bare-metal
needs: ["set-tags", "build"]
needs: ["set-tags", "build", "typescript-tracing-tests"]
strategy:
fail-fast: false
matrix:
Expand All @@ -779,7 +780,7 @@ jobs:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- name: Create local folders
Expand Down Expand Up @@ -808,9 +809,10 @@ jobs:
zombie_upgrade_test:
runs-on:
labels: bare-metal
needs: ["set-tags", "build"]
needs: ["set-tags", "build", "typescript-tracing-tests"]
strategy:
fail-fast: false
max-parallel: 1
matrix:
## TODO: add moonriver here when it is ready
chain: ["moonbase", "moonbeam"]
Expand All @@ -828,7 +830,7 @@ jobs:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
- name: Create local folders
run: |
mkdir -p target/release/wbuild/${{ matrix.chain }}-runtime/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
- name: Build typescript API
run: |
cd typescript-api
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
- name: Upgrade polkadotjs for tests
run: |
cd test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20.10.0
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion test/configs/zombieAlphanetRpc.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"command": "../target/release/moonbeam",
"args": [
"--no-hardware-benchmarks",
"-lparachain=debug",
"-lparachain=trace",
"--database=paritydb"
]
}
Expand Down
2 changes: 2 additions & 0 deletions test/moonwall.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
{
"name": "zombie_moonbeam_rpc",
"testFileDir": ["suites/zombie"],
"multiThreads": false,
"runScripts": ["download-polkadot.sh"],
"foundation": {
"rtUpgradePath": "../target/release/wbuild/moonbeam-runtime/moonbeam_runtime.compact.compressed.wasm",
Expand Down Expand Up @@ -88,6 +89,7 @@
{
"name": "zombie_moonbase_rpc",
"testFileDir": ["suites/zombie"],
"multiThreads": false,
"runScripts": ["download-polkadot.sh"],
"foundation": {
"rtUpgradePath": "../target/release/wbuild/moonbase-runtime/moonbase_runtime.compact.compressed.wasm",
Expand Down
26 changes: 13 additions & 13 deletions test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"author": "",
"license": "ISC",
"dependencies": {
"@acala-network/chopsticks": "0.12.2",
"@acala-network/chopsticks": "0.15.0",
"@moonbeam-network/api-augment": "0.2902.0",
"@moonwall/cli": "5.3.3",
"@moonwall/util": "5.3.3",
"@openzeppelin/contracts": "4.9.6",
"@polkadot-api/merkleize-metadata": "1.1.2",
"@polkadot-api/merkleize-metadata": "1.1.4",
"@polkadot/api": "13.0.1",
"@polkadot/api-augment": "13.0.1",
"@polkadot/api-derive": "13.0.1",
Expand All @@ -34,36 +34,36 @@
"@polkadot/util-crypto": "13.1.1",
"@substrate/txwrapper-core": "7.5.1",
"@substrate/txwrapper-substrate": "7.5.1",
"@vitest/ui": "2.0.1",
"@vitest/ui": "2.1.1",
"@zombienet/utils": "0.0.25",
"chalk": "5.3.0",
"eth-object": "github:aurora-is-near/eth-object#master",
"ethers": "6.13.1",
"ethers": "6.13.2",
"json-bigint": "1.0.0",
"json-stable-stringify": "1.1.1",
"merkle-patricia-tree": "4.2.4",
"node-fetch": "3.3.2",
"octokit": "^4.0.2",
"randomness": "1.6.11",
"randomness": "1.6.14",
"rlp": "3.0.0",
"semver": "7.6.2",
"semver": "7.6.3",
"solc": "0.8.25",
"tsx": "4.16.2",
"viem": "2.17.3",
"vitest": "2.0.1",
"web3": "4.10.0",
"yaml": "2.4.5"
"viem": "2.21.14",
"vitest": "2.1.1",
"web3": "4.13.0",
"yaml": "2.5.1"
},
"devDependencies": {
"@types/debug": "4.1.12",
"@types/json-bigint": "^1.0.4",
"@types/node": "22.5.5",
"@types/node": "22.7.0",
"@types/semver": "7.5.8",
"@types/yargs": "17.0.32",
"@types/yargs": "17.0.33",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@typescript-eslint/parser": "7.5.0",
"bottleneck": "2.19.5",
"debug": "4.3.5",
"debug": "4.3.7",
"eslint": "8.57.0",
"eslint-plugin-unused-imports": "3.1.0",
"prettier": "2.8.8",
Expand Down
Loading

0 comments on commit dc95ac0

Please sign in to comment.