Merge fork

.all-contributorsrc

@@ -392,6 +392,20 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4",
       "profile": "https://github.com/tchataigner",
       "contributions": ["code"]
+    },
+    {
+      "login": "kalaninja",
+      "name": "Alexander Kalankhodzhaev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18083464?v=4",
+      "profile": "https://github.com/kalaninja",
+      "contributions": ["code"]
+    },
+    {
+      "login": "antiyro",
+      "name": "antiyro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74653697?v=4",
+      "profile": "https://github.com/antiyro",
+      "contributions": ["code"]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/coverage.yml

@@ -11,18 +11,10 @@ jobs:
     runs-on: ubuntu-latest-32-cores
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: Swatinem/rust-cache@v2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key:
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
-            github.run_id }}
-          fail-on-cache-miss: true
+          shared-key: "cache"
+          save-if: false
       - name: Setup build deps
         run: |
           sudo apt-get update

.github/workflows/linters-cargo.yml

@@ -15,24 +15,10 @@ jobs:
     runs-on: ubuntu-latest-32-cores
     steps:
       - uses: actions/checkout@v3
-      - name: Retrieve cached build
-        uses: actions/cache@v3
+      - uses: Swatinem/rust-cache@v2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key:
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
-            github.run_id }}
-          fail-on-cache-miss: true
-          restore-keys: |
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
-            github.run_id }}
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-            ${{ runner.os }}-cargo
+          shared-key: "cache"
+          save-if: false
       - name: Setup build deps
         run: |
           sudo apt-get update

.github/workflows/madara-commands.yml

@@ -12,22 +12,29 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
+          path: target/release/madara
           key:
             ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
             github.run_id }}
           fail-on-cache-miss: true
       - name: Run setup
         run: |
-          target/release/madara setup
+          target/release/madara setup --chain local --from-remote
       - name: Create build-spec (plain)
         run: |
           target/release/madara build-spec --chain local > chain-plain.json
       - name: Create build-spec (raw)
         run: |
           target/release/madara build-spec --chain chain-plain.json --raw > chain-raw.json
+      - name: Generate Sr25519 key for Aura (Leader Election)
+        id: key-gen
+        run: |
+          target/release/madara key generate --scheme Sr25519
+          echo "SEED_PHRASE=$(target/release/madara key generate --scheme Sr25519 | sed -n 's/Secret phrase:\s*//p')" >> "$GITHUB_OUTPUT"
+      - name: Derive Ed25519 key for Grandpa (Finality)
+        run: |
+          target/release/madara key inspect --scheme Ed25519 "${{ steps.key-gen.outputs.SEED_PHRASE }}"
+      - name: Add keys to the node keystore
+        run: |
+          target/release/madara key insert --scheme Sr25519 --suri "${{ steps.key-gen.outputs.SEED_PHRASE }}" --key-type aura
+          target/release/madara key insert --scheme Ed25519 --suri "${{ steps.key-gen.outputs.SEED_PHRASE }}" --key-type gran

.github/workflows/pull-request.yml

@@ -20,26 +20,30 @@ jobs:
     uses: ./.github/workflows/linters.yml
     needs: [changelog, configs-verifier]
 
-  rust_build:
-    name: Build Rust project
-    uses: ./.github/workflows/rust-build.yml
+  rust_build_test:
+    name: Build & Integration Tests
+    uses: ./.github/workflows/rust-build-test.yml
     needs: [changelog, configs-verifier]
 
   madara_commands:
     name: Test Madara commands
     uses: ./.github/workflows/madara-commands.yml
-    needs: rust_build
+    needs: [linters, rust_build_test]
 
   linters_cargo:
     name: Run Cargo linters
     uses: ./.github/workflows/linters-cargo.yml
-    needs: rust_build
+    needs: madara_commands
 
-  # TODO: Unlock when rust tests are working on main
-  # coverage:
-  #   name: Run coverage
-  #   uses: ./.github/workflows/coverage.yml
-  #   needs: [madara_commands, linters_cargo]
+  rpc-tests:
+    name: Run rpc tests
+    uses: ./.github/workflows/starknet-rpc-tests.yml
+    needs: madara_commands
+
+  starknet-js-tests:
+    name: Run starknet-js compatibility tests
+    uses: ./.github/workflows/starknet-js-tests.yml
+    needs: madara_commands
 
   # https://github.com/keep-starknet-strange/madara/issues/1097
   # benchmark:

.github/workflows/push.yml

@@ -11,15 +11,31 @@ jobs:
     name: Run linters
     uses: ./.github/workflows/linters.yml
 
-  rust_build:
-    name: Build Rust project
-    uses: ./.github/workflows/rust-build.yml
+  rust_build_test:
+    name: Build & Integration Tests
+    uses: ./.github/workflows/rust-build-test.yml
+
+  madara_commands:
+    name: Test Madara commands
+    uses: ./.github/workflows/madara-commands.yml
+    needs: [linters, rust_build_test]
 
   linters_cargo:
     name: Run Cargo linters
     uses: ./.github/workflows/linters-cargo.yml
-    needs: rust_build
+    needs: madara_commands
+
+  rpc-tests:
+    name: Run rpc tests
+    uses: ./.github/workflows/starknet-rpc-tests.yml
+    needs: madara_commands
+
+  starknet-js-tests:
+    name: Run starknet-js compatibility tests
+    uses: ./.github/workflows/starknet-js-tests.yml
+    needs: madara_commands
 
+  # https://github.com/keep-starknet-strange/madara/issues/1097
   # benchmark:
   #   name: Run benchmarks
   #   uses: ./.github/workflows/benchmarks.yml
@@ -32,7 +48,6 @@ jobs:
   #     # post on the pull-request page
   #     pull-requests: write
 
-  # TODO change it to benchmark when enabled
   rustdoc:
     name: Deploy docs to GitHub Pages
     uses: ./.github/workflows/rustdoc.yml

.github/workflows/rust-build.yml → .github/workflows/rust-build-test.yml

@@ -1,33 +1,27 @@
 ---
-name: Task - Build Rust
+name: Task - Build & Integration Tests
 
 on:
   workflow_dispatch:
   workflow_call:
 
 jobs:
-  rust_build:
+  rust_build_test:
     runs-on: ubuntu-latest-32-cores
     steps:
       - uses: actions/checkout@v3
-
-      - name: Cache Cargo registry and git trees
-        uses: actions/cache@v3
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "cache"
+      - uses: actions/cache@v3
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
+          path: target/release/madara
           key:
             ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
             github.run_id }}
           restore-keys: |
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
-            github.run_id }}
             ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-            ${{ runner.os }}-cargo
+            ${{ runner.os }}-cargo-
 
       - name: Setup rust toolchain
         if: steps.cache.outputs.cache-hit != 'true'
@@ -41,3 +35,6 @@ jobs:
       - name: Build the project
         run: |
           cargo build --release --workspace
+
+      - name: Run integration tests
+        run: cargo test --release

.github/workflows/starknet-js-tests.yml

@@ -0,0 +1,33 @@
+name: Starknet-js Compatibility Tests
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      BINARY_PATH: ../target/release/madara
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: target/release/madara
+          key:
+            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
+            github.run_id }}
+          fail-on-cache-miss: true
+      - name: Setup dev chain
+        run: |
+          ./target/release/madara setup --chain=dev --from-remote
+      - name: Run starknet-js test
+        run: |-
+          ./target/release/madara --dev --execution native &
+          NATIVE_RUN_PID=$!
+          while ! echo exit | nc localhost 9944; do sleep 1; done
+          git clone https://github.com/keep-starknet-strange/sequencer-js-compatibility-tests.git
+          cd sequencer-js-compatibility-tests
+          npm install
+          npm test
+          kill $NATIVE_RUN_PID

.github/workflows/starknet-rpc-tests.yml

@@ -0,0 +1,48 @@
+---
+name: Task - Rpc Tests
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  rpc-tests:
+    runs-on: ubuntu-latest
+    env:
+      BINARY_PATH: ../target/release/madara
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "cache"
+          save-if: false
+      - uses: actions/cache@v3
+        with:
+          path: target/release/madara
+          key:
+            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
+            github.run_id }}
+          fail-on-cache-miss: true
+      - name: Setup build deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang llvm libudev-dev protobuf-compiler
+      - name: Setup dev chain
+        run: |
+          ./target/release/madara setup --chain=dev --from-remote
+      - name: Run rpc native test
+        run: |-
+          ./target/release/madara --dev --sealing=manual --execution=Native &
+          NATIVE_RUN_PID=$!
+          while ! echo exit | nc localhost 9944; do sleep 1; done
+          cd starknet-rpc-test
+          cargo test
+          kill $NATIVE_RUN_PID
+      - name: Run rpc wasm test
+        run: |-
+          ./target/release/madara --dev --sealing=manual --execution=Wasm &
+          WASM_RUN_PID=$!
+          while ! echo exit | nc localhost 9944; do sleep 1; done
+          cd starknet-rpc-test
+          cargo test
+          kill $WASM_RUN_PID

.github/workflows/tests.yml

@@ -0,0 +1,24 @@
+---
+name: Task - Integration Tests
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  integration-tests:
+    runs-on: ubuntu-latest
+    env:
+      BINARY_PATH: ../target/release/madara
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "cache"
+          save-if: false
+      - name: Setup build deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang llvm libudev-dev protobuf-compiler
+      - name: Run crates test
+        run: cargo test --release

.vscode/settings.json

@@ -1,8 +1,3 @@
 {
-  "eslint.workingDirectories": ["tests"],
-  "workbench.colorCustomizations": {
-    "activityBar.background": "#561529",
-    "titleBar.activeBackground": "#781E3A",
-    "titleBar.activeForeground": "#FEFBFC"
-  }
+  "eslint.workingDirectories": ["tests"]
 }