[chore] History fix / signoff

.github/dependabot.yml

@@ -25,12 +25,6 @@ updates:
     schedule:
       interval: "daily"
 
-  - package-ecosystem: "cargo"
-    target-branch: "iroha2-dev"
-    directory: "/wasm/"
-    schedule:
-      interval: "daily"
-
   - package-ecosystem: "cargo"
     target-branch: "iroha2-dev"
     directory: "/default_validator/"

.github/workflows/iroha2-dev-pr-label.yml

@@ -5,7 +5,6 @@ on:
     branches: [iroha-dev]
     paths:
       - 'docs/source/references/schema.json'
-      - 'docs/source/references/api_spec.md'
       - 'docs/source/references/config.md'
 
 jobs:
@@ -17,7 +16,7 @@ jobs:
         continue-on-error: true
         id: api_label
       - uses: actions-ecosystem/action-add-labels@v1
-        if: contains(steps.api_label.outputs.added_modified, 'docs/source/references/schema.json') || contains(steps.api_label.outputs.added_modified, 'docs/source/references/api_spec.md')
+        if: contains(steps.api_label.outputs.added_modified, 'docs/source/references/schema.json')
         with:
           github_token: ${{ secrets.github_token }}
           labels: |

.github/workflows/iroha2-dev-pr-static.yml

@@ -9,9 +9,6 @@ on:
       - '**.toml'
       - '.github/workflows/**.yml'
 
-      # Not part of the workspace
-      - '!wasm/**'
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -32,10 +29,10 @@ jobs:
         run: cargo fmt --all -- --check
       - name: Lints without features
         if: always()
-        run: cargo lints clippy --workspace --benches --tests --examples --no-default-features --quiet
+        run: cargo clippy -Zlints --workspace --benches --tests --examples --no-default-features --quiet
       - name: Lints with all features enabled
         if: always()
-        run: cargo lints clippy --workspace --benches --tests --examples --all-features --quiet
+        run: cargo clippy -Zlints --workspace --benches --tests --examples --all-features --quiet
       - name: Documentation
         if: always()
         run: cargo doc --no-deps --quiet

.github/workflows/iroha2-dev-pr-ui.yml

@@ -26,6 +26,10 @@ jobs:
       matrix:
         feature_flag: [all-features, no-default-features]
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - name: Run tests, with ${{ matrix.feature_flag }}

.github/workflows/iroha2-dev-pr-wasm.yaml

@@ -1,20 +1,19 @@
 name: I2::Dev::Wasm
 
-defaults:
-  run:
-    working-directory: wasm
-
 on:
   pull_request:
     branches: [iroha2-dev]
     paths:
-      - 'wasm/**.rs'
-      - 'wasm/**.json'
-      - 'wasm/**.toml'
-      - 'wasm/**.yml'
       - 'data_model/**.rs'
+      - 'data_model/**.yml'
+      - 'data_model/**.json'
       - 'data_model/**.toml'
 
+      - 'smart_contract/**.rs'
+      - 'smart_contract/**.yml'
+      - 'smart_contract/**.json'
+      - 'smart_contract/**.toml'
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -23,29 +22,15 @@ env:
   RUSTUP_TOOLCHAIN: nightly-2023-06-25
 
 jobs:
-  static-analysis:
-    runs-on: ubuntu-latest
-    container:
-      image: hyperledger/iroha2-ci:nightly-2023-06-25
-    steps:
-      - uses: actions/checkout@v3
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Format
-        run: cargo fmt --all -- --check
-      - name: Lints
-        if: always()
-        run: cargo lints clippy --workspace --benches --tests --examples --quiet
-      - name: Documentation
-        if: always()
-        run: cargo doc --no-deps --quiet
-
   tests:
     runs-on: ubuntu-latest #[self-hosted, Linux]
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
-      - name: Run tests
-        run: mold --run cargo test --tests --no-fail-fast --quiet
+      - name: Install iroha_wasm_test_runner
+        run: cargo install --path tools/wasm_test_runner
+      - name: Run smart contract tests on WebAssembly VM
+        working-directory: smart_contract
+        run: mold --run cargo test --tests --target wasm32-unknown-unknown --no-fail-fast --quiet

.github/workflows/iroha2-dev-pr.yml

@@ -9,9 +9,6 @@ on:
       - '**.toml'
       - '.github/workflows/**.yml'
 
-      # Not part of the workspace
-      - '!wasm/**'
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -20,7 +17,7 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  check:
+  consistency:
     runs-on: [self-hosted, Linux, iroha2ci]
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
@@ -29,26 +26,22 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Check config.md
         if: always()
-        run: ./scripts/check.sh docs
+        run: ./scripts/tests/consistency.sh docs
       - name: Check genesis.json
         if: always()
-        run: ./scripts/check.sh genesis
+        run: ./scripts/tests/consistency.sh genesis
       - name: Check client/config.json
         if: always()
-        run: ./scripts/check.sh client
+        run: ./scripts/tests/consistency.sh client
       - name: Check peer/config.json
         if: always()
-        run: ./scripts/check.sh peer
+        run: ./scripts/tests/consistency.sh peer
       - name: Check schema.json
         if: always()
-        run: ./scripts/check.sh schema
+        run: ./scripts/tests/consistency.sh schema
       - name: Check Docker Compose configurations
         if: always()
-        run: ./scripts/check.sh docker-compose
-      - name: Wasm build check
-        if: always()
-        working-directory: wasm
-        run: mold --run cargo build --target wasm32-unknown-unknown --quiet
+        run: ./scripts/tests/consistency.sh docker-compose
 
   with_coverage:
     runs-on: [self-hosted, Linux, iroha2ci]
@@ -137,3 +130,46 @@ jobs:
           file: Dockerfile
           # This context specification is required
           context: .
+
+  client-cli-test:
+    runs-on: [self-hosted, Linux, iroha2ci]
+    container:
+      image: hyperledger/iroha2-ci:nightly-2023-06-25
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Swatinem/rust-cache@v2
+      - name: Build binaries
+        run: |
+          cargo build --bin iroha_client_cli
+          cargo build --bin kagami
+          cargo build --bin iroha
+
+      - name: Mark binaries as executable
+        run: |
+          chmod +x $CLIENT_CLI_DIR/
+
+      - name: Run Iroha 2 on bare metal
+        run: |
+          ./scripts/test_env.py setup
+
+      - name: Copy Iroha 2 client config
+        run: |
+          cp ./configs/client/config.json $CLIENT_CLI_DIR/
+
+      - name: Set up .env for client_cli tests
+        run: |
+          echo "CLIENT_CLI_DIR=$CLIENT_CLI_DIR" >> ./client_cli/pytests/.env
+          echo "TORII_API_PORT_MIN=8080" >> ./client_cli/pytests/.env
+          echo "TORII_API_PORT_MAX=8083" >> ./client_cli/pytests/.env
+
+      - name: Install dependencies using Poetry
+        working-directory: client_cli/pytests
+        run: |
+          poetry install
+
+      - name: Run client cli tests
+        working-directory: client_cli/pytests
+        run: |
+          poetry run pytest

.github/workflows/iroha2-release-pr.yml

@@ -17,6 +17,10 @@ jobs:
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - name: Build iroha
@@ -50,6 +54,10 @@ jobs:
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - name: Run benchmarks
@@ -62,6 +70,10 @@ jobs:
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/[email protected]
@@ -112,6 +124,10 @@ jobs:
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - name: Run long tests
         run: mold --run cargo test --workspace --no-fail-fast -- --ignored --test-threads=1 long

.github/workflows/iroha2-release.yml

@@ -59,22 +59,23 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: hyperledger/iroha2-ci:nightly-2023-06-25
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
         with:
           ref: iroha2-dev
-      - name: Setup git config
-        run: |
-          cd .git
-          git config --local user.name "sorabot"
-          git config --local user.email "<>"
+          token: ${{ secrets.G_ACCESS_TOKEN }}
       - name: Update configs
         run: |
           ./scripts/update_configs.sh lts
           ./scripts/update_configs.sh stable
       - name: Commit config changes
-        run: |
-          git config --global --add safe.directory /__w/iroha/iroha
-          git add -A
-          git diff-index --quiet HEAD || git commit -m "[documentation]: Update lts/stable configs following a release" --signoff
-          git push origin iroha2-dev
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: '[documentation]: Update lts/stable configs following a release'
+          branch: iroha2-dev
+          commit_options: '--signoff'
+          commit_user_name: sorabot
+          commit_user_email: <>
+          commit_author: sorabot <[email protected]>

CONTRIBUTING.md

@@ -304,7 +304,7 @@ Code guidelines:
 - Avoid `Box<dyn Error>` if possible (we prefer strong typing).
 - If your function is a getter/setter, mark it `#[inline]`.
 - If your function is a constructor (i.e., it's creating a new value from the input parameters and calls `default()`), mark it `#[inline]`.
-- Avoid tying your code to concrete data structures; `rustc` is smart enough to turn a `Vec<InstructionBox>` into `impl IntoIterator<Item = InstructionBox>` and vice versa when it needs to.
+- Avoid tying your code to concrete data structures; `rustc` is smart enough to turn a `Vec<InstructionExpr>` into `impl IntoIterator<Item = InstructionExpr>` and vice versa when it needs to.
 
 Naming guidelines:
 - Use only full words in *public* structure, variable, method, trait, constant, and module names. However, abbreviations are allowed if: