Merge branch 'develop' into feature/runWithchops

.dockerignore

@@ -1,18 +1,5 @@
-.git
-.github
-target
-devops
-!devops/dockerfiles/parachain-registrator/src
-launch
-scripts
-workflows
-Makefile
-Tiltfile
-**/target/
-**/*.txt
-**/*.md
-./docker-cargo
-./mvr/docker-cargo
+*
+
 !/target/release/polkadot-collator
 !/docker-cargo/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.compact.compressed.wasm
 !/docker-cargo/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.compact.compressed.wasm.md5
@@ -38,6 +25,3 @@ Tiltfile
 
 !target/release/mangata-node
 !target/release/wbuild/mangata*
-
-# dotfiles in the repo root
-/.*

.github/workflows/reusable-build-and-test.yml

@@ -13,7 +13,7 @@ on:
         required: true
         type: string
       builder_image:
-        default: mangatasolutions/node-builder:multi-nightly-2022-11-15
+        default: mangatasolutions/node-builder:multi-nightly-2023-05-22
         description: Docker image used for Rust builds
         required: false
         type: string
@@ -249,11 +249,14 @@ jobs:
             ~/.cache/sccache
           key: cargo-try-runtime-${{ inputs.cache_version }}-${{ hashFiles('Cargo.lock') }}
 
+      - name: Build try-runtime Rococo & Kusama node
+        run: cargo build --release --features=try-runtime,mangata-rococo,mangata-kusama
+
       - name: Run try-runtime Rococo testnet
-        run: cargo run --release --features=try-runtime,mangata-rococo try-runtime --chain=rococo --runtime=target/release/wbuild/mangata-rococo-runtime/mangata_rococo_runtime.wasm on-runtime-upgrade live --uri wss://collator-01-ws-rococo.mangata.online:443
+        run: try-runtime --runtime=target/release/wbuild/mangata-rococo-runtime/mangata_rococo_runtime.wasm on-runtime-upgrade live --uri wss://collator-01-ws-rococo.mangata.online:443
 
       - name: Run try-runtime Kusama Mainnet
-        run: cargo run --release --features=try-runtime try-runtime --chain=kusama --runtime=target/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.wasm on-runtime-upgrade live --uri wss://kusama-rpc.mangata.online:443
+        run: try-runtime --runtime=target/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.wasm on-runtime-upgrade live --uri wss://kusama-rpc.mangata.online:443
 
   run-benchmarks:
     name: Run runtime benchmarks
@@ -296,7 +299,7 @@ jobs:
         run: |
           mkdir ./benchmarks && target/release/mangata-node benchmark pallet \
           -l=info,xyk=error,collective-mangata=warn,bootstrap=warn \
-          --chain kusama \
+          --chain mangata-kusama \
           --execution wasm \
           --wasm-execution compiled \
           --pallet '*' \
@@ -308,7 +311,7 @@ jobs:
 
       - name: Run block & extrinsic overhead benchmarks
         run: |
-          target/release/mangata-node benchmark overhead --execution native --chain kusama-local -lblock_builder=debug --max-ext-per-block 50000 --base-path .
+          target/release/mangata-node benchmark overhead --execution native --chain mangata-kusama-local -lblock_builder=debug --max-ext-per-block 50000 --base-path .
           cp block_weights.rs extrinsic_weights.rs ./benchmarks
 
       - name: Upload logs and docker images to GitHub
@@ -351,12 +354,12 @@ jobs:
 
       - name: Export wasms
         run: |
-          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=kusama -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=kusama -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=kusama-local -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=kusama-local -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=rococo -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=rococo -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=rococo-local -l=info,xyk=error > /dev/null'
-          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=rococo-local -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=mangata-kusama -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=mangata-kusama -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=mangata-kusama-local -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=mangata-kusama-local -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=mangata-rococo -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=mangata-rococo -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-state --chain=mangata-rococo-local -l=info,xyk=error > /dev/null'
+          /bin/bash -c 'target/release/mangata-node export-genesis-wasm --chain=mangata-rococo-local -l=info,xyk=error > /dev/null'
 

.github/workflows/reusable-e2e-tests.yml

@@ -221,6 +221,10 @@ jobs:
         working-directory: devops/parachain-launch
         run: npx @open-web3/parachain-launch generate config.yml
 
+      - name: Remove obsolete node run args from generated docker-compose.yml
+        working-directory: devops/parachain-launch/output
+        run: sed -i '/ws-external/d' docker-compose.yml
+
       - run: docker ps --no-trunc
       - name: Start mangata-node parachain
         working-directory: devops/parachain-launch/output
@@ -300,13 +304,13 @@ jobs:
       - name: Add GCP bucket URL link for stored node data on job failure
         if: failure()
         run: echo '[GCP Bucket link](https://console.cloud.google.com/storage/browser/mangata-node-ci-cache/${{ github.sha }}/${{ env.MATRIX_COMMAND_PATH }})' >> $GITHUB_STEP_SUMMARY
-      
+
       - name: Stop previous parachain if running
         working-directory: devops/parachain-launch/output
         run: |
           docker kill $(docker ps -q) 2>/dev/null && echo $?
           docker-compose down -v
-        
+
   test-complete:
     needs: [setup-report, e2e-test-matrix]
     if: always()
@@ -324,7 +328,7 @@ jobs:
           TESTMO_URL: ${{ secrets.TESTMO_URL }}
           TESTMO_TOKEN: ${{ secrets.TESTMO_TOKEN }}
         continue-on-error: true
-        
+
   slack-notify-nook:
     needs: [e2e-test-matrix]
     if: failure()

.gitignore

@@ -29,4 +29,4 @@ build_rs_cov.profraw
 .actrc
 
 # Ignore generated credentials from google-github-actions/auth
-gha-creds-*.json
+gha-creds-*.json