Merge pull request #5355 from darthsiroftardis/dev

Merge feat-2.1 into dev

Author: darthsiroftardis

.github/workflows/casper-node.yml

@@ -65,3 +65,9 @@ jobs:
 
       - name: test-contracts
         run: make test-contracts CARGO_FLAGS=--release
+
+      - name: vm2 tests
+        run: |
+          ./vm2-build-contracts.sh
+          cargo test -p casper-executor-wasm
+          cargo test -p casper-contract-sdk

.github/workflows/publish-release-and-crates.yml

@@ -35,6 +35,11 @@ jobs:
       - name: Build update package
         run: ./ci/build_update_package.sh
 
+      - name: Publish to crates.io
+        env:
+          CARGO_TOKEN: ${{ secrets.crates_io_token }}
+        run: ./ci/publish_to_crates_io.sh
+
       # Add config.tar.gz, bin.tar.gz to release
       - name: Upload files to release
         uses: svenstaro/upload-release-action@v2
@@ -43,9 +48,4 @@ jobs:
           file: target/upgrade_build/*.tar.gz
           tag: ${{ github.ref }}
           overwrite: true
-          file_glob: true
-
-      - name: Publish to crates.io
-        env:
-          CARGO_TOKEN: ${{ secrets.crates_io_token }}
-        run: ./ci/publish_to_crates.io
+          file_glob: true

.gitignore

@@ -132,6 +132,7 @@ dist
 resources/production/*.wasm
 resources/node-storage/*
 resources/local/chainspec.toml
+resources/flaky/chainspec.toml
 
 execution_engine_testing/test_support/resources/chainspec.toml