Merge remote-tracking branch 'origin/master' into laz/ethexe/3-blocks/network-announce

# Conflicts:
#	ethexe/common/src/injected.rs
#	ethexe/consensus/src/tx_validation.rs
#	ethexe/consensus/src/validator/producer.rs
#	ethexe/consensus/src/validator/tx_pool.rs
#	ethexe/network/src/validator/topic.rs
#	ethexe/service/src/tests/mod.rs

Author: Lazark0x

.cargo/config.toml

@@ -3,3 +3,8 @@ GEAR_WORKSPACE_DIR = { value = "", relative = true }
 
 [alias]
 gbuild = "run -p cargo-gbuild --"
+
+[registries]
+# crates.io registry to hack `substrate-wasm-builder` patch section
+# so runtimes do not use `gear-workspace-hack`
+crates-io-patch-hack = { index = "sparse+https://index.crates.io/" }

.config/hakari.toml

@@ -0,0 +1,74 @@
+# This file contains settings for `cargo hakari`.
+# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
+
+hakari-package = "gear-workspace-hack"
+
+# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
+dep-format-version = "4"
+
+# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended.
+# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from
+# hakari's perspective, so you're welcome to set either.)
+#
+# For more about the new feature resolver, see:
+# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
+resolver = "3"
+
+# Add triples corresponding to platforms commonly used by developers here.
+# https://doc.rust-lang.org/rustc/platform-support.html
+platforms = [
+    "x86_64-unknown-linux-gnu",
+    "aarch64-unknown-linux-gnu",
+    "aarch64-apple-darwin"
+]
+
+# Write out exact versions rather than a semver range. (Defaults to false.)
+# exact-versions = true
+
+workspace-hack-line-style = "workspace-dotted"
+
+[final-excludes]
+third-party = [
+    # we have to exclude these deps because of their `try-runtime` and `runtime-benchmarks` features,
+    # because we cannot, for example, run `cargo build --package gear-cli` without `--all-features` flag
+    { name = "frame-benchmarking", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-benchmarking-cli", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-election-provider-support", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-executive", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-support", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-system", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "frame-try-runtime", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-authority-discovery", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-authorship", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-babe", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-bags-list", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-balances", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-bounties", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-child-bounties", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-conviction-voting", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-election-provider-multi-phase", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-grandpa", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-identity", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-im-online", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-multisig", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-nomination-pools", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-offences", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-preimage", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-proxy", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-ranked-collective", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-referenda", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-scheduler", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-session", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-staking", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-sudo", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-timestamp", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-transaction-payment", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-treasury", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-utility", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-vesting", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "pallet-whitelist", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "sc-client-db", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "sc-service", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "sp-runtime", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+    { name = "sp-staking", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409-wasm32v1-none" },
+]

.config/nextest.toml

@@ -10,22 +10,24 @@ chmod +x target/release/gear
 leak-timeout = { period = "5s", result = "fail" }
 slow-timeout = { period = "1m", terminate-after = 5 }
 
+[profile.default.junit]
+path = "junit.xml"
+store-success-output = false
+store-failure-output = true
+
 [profile.ci]
 fail-fast = false
 archive.include = [
   { path = "wasm32-gear", relative-to = "target", on-missing = "warn" },
 ]
 
-[profile.ci.junit]
-path = "junit.xml"
-
 # sdk
 [[profile.ci.overrides]]
-filter = 'package(gclient) or package(gsdk) or package(gcli)'
+filter = 'package(gsdk) or package(gcli)'
 retries = 5
 
 [[profile.ci.scripts]]
-filter = 'package(gclient) or package(gsdk) or package(gcli)'
+filter = 'package(gsdk) or package(gcli)'
 platform = "cfg(unix)"
 setup = "replace-node-and-runtime"
 

.ethexe.example.local.toml

@@ -11,6 +11,10 @@
 # (optional, default: false).
 # tmp = false
 
+# Flag to run node in development mode.
+# (optional, default: false).
+# dev = false
+
 # Public key of the validator, if node should act as one.
 # Provided in the format of 33-byte hex string:
 # - `yParityCompressed`, compressed `publicKeyY`,
@@ -83,11 +87,11 @@ canonical-quarantine = 0
 
 # Maximum allowed deepness of the chain for validating commitments.
 # (optional, must be non-zero u32, default: 10_000).
-validate-chain-deepness-limit = 10_000
+# validate-chain-deepness-limit = 10_000
 
 # Threshold for producer to submit commitment despite of no transitions.
 # (optional, must be non-zero u32, default: 500).
-chain-deepness-threshold = 500
+# chain-deepness-threshold = 500
 
 ##########################################################################################
 
@@ -98,7 +102,7 @@ chain-deepness-threshold = 500
 rpc = "ws://localhost:8545"
 
 # Ethereum Beacon RPC endpoint.
-# (optional, default: http://localhost:5052).
+# (optional, default: http://localhost:8545).
 beacon-rpc = "http://localhost:8545"
 
 # Ethereum router contract address.
@@ -107,7 +111,7 @@ router = "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
 
 # Ethereum block time in seconds.
 # (optional, default: 12).
-# block-time = 12
+block-time = 1
 
 ##########################################################################################
 

.ethexe.example.toml

@@ -11,6 +11,10 @@
 # (optional, default: false).
 # tmp = false
 
+# Flag to run node in development mode.
+# (optional, default: false).
+# dev = false
+
 # Public key of the validator, if node should act as one.
 # Provided in the format of 33-byte hex string:
 # - `yParityCompressed`, compressed `publicKeyY`,
@@ -98,8 +102,8 @@
 # rpc = "ws://localhost:8545"
 
 # Ethereum Beacon RPC endpoint.
-# (optional, default: http://localhost:5052).
-# beacon-rpc = "http://localhost:5052"
+# (optional, default: http://localhost:8545).
+# beacon-rpc = "http://localhost:8545"
 
 # Ethereum router contract address.
 # (optional).

.github/actions/cargo-hakari/action.yml

@@ -0,0 +1,37 @@
+name: cargo-hakari
+author: ark0f
+description: Run `cargo hakari`
+
+inputs:
+  args:
+    required: true
+    description: Arguments for `cargo hakari`
+
+runs:
+  using: composite
+  steps:
+    - id: host-target
+      run: "echo value=$(rustc -vV | grep host: | cut -d ' ' -f 2) >> $GITHUB_OUTPUT"
+      shell: bash
+
+    - id: already-installed
+      run: |
+        if cargo hakari --version; then
+          echo "value=true"  >> $GITHUB_OUTPUT
+        else
+          echo "value=false" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
+
+    - uses: taiki-e/install-action@v2
+      if: ${{ steps.already-installed.outputs.value == 'false' }}
+      with:
+        tool: cargo-hakari
+      env:
+        CARGO_BUILD_TARGET: ${{ steps.host-target.outputs.value }}
+        CARGO_ENCODED_RUSTFLAGS: ""
+
+    - run: cargo hakari ${{ inputs.args }}
+      shell: bash
+      env:
+        CARGO_ENCODED_RUSTFLAGS: ""

.github/actions/rust-cache/action.yml

@@ -19,10 +19,26 @@ inputs:
   cache-all-crates:
     required: false
     description: Whether to cache every crate
+  keep-workspace-hack:
+    required: false
+    description: Whether to keep workspace hack enabled
+    default: 'false'
 
 runs:
   using: composite
   steps:
+    # disable workspace hack because we cache only specific build commands and don't want the cache to blow up
+    - uses: ./.github/actions/cargo-hakari
+      if: ${{ inputs.keep-workspace-hack == 'false' }}
+      with:
+        args: disable
+
+    # we have manually written deps in our hack so we also should remove the hack as dependency
+    - uses: ./.github/actions/cargo-hakari
+      if: ${{ inputs.keep-workspace-hack == 'false' }}
+      with:
+        args: remove-deps --yes
+
     - run: |
         if [[ "${{ runner.environment }}" == "github-hosted" ]]; then
           echo "AWS_ACCESS_KEY_ID=${{ inputs.us-access-key-id }}" >> $GITHUB_ENV
@@ -59,7 +75,7 @@ runs:
 
     - uses: gear-tech/rust-cache@wasm
       with:
-        prefix-key: 'rust-cache/date-${{ steps.date.outputs.value }}'
+        prefix-key: 'rust-cache/date-${{ steps.date.outputs.value }}-workspace-hack'
         key: ${{ inputs.key }}
         workspaces: |
           . -> target

.github/actions/setup-compilation-env/action.yml

@@ -84,11 +84,11 @@ runs:
 
         wget -qO - https://raw.githubusercontent.com/ScoopInstaller/Main/refs/heads/master/bucket/openssl.json | jq -r '.architecture."64bit".url' | xargs wget -qO openssl_installer.exe
         innoextract -d ${{ runner.temp }}/openssl_extracted -I app/include -I app/lib/VC/x64/MT openssl_installer.exe
-
-        echo "OPENSSL_NO_VENDOR=1" >> $GITHUB_ENV
-        echo "OPENSSL_INCLUDE_DIR=${{ runner.temp }}/openssl_extracted/app/include" >> $GITHUB_ENV
-        echo "OPENSSL_LIB_DIR=${{ runner.temp }}/openssl_extracted/app/lib/VC/x64/MT" >> $GITHUB_ENV
-
+        rm openssl_installer.exe
+        
+        echo "X86_64_PC_WINDOWS_MSVC_OPENSSL_NO_VENDOR=1" >> $GITHUB_ENV
+        echo "X86_64_PC_WINDOWS_MSVC_OPENSSL_INCLUDE_DIR=${{ runner.temp }}/openssl_extracted/app/include" >> $GITHUB_ENV
+        echo "X86_64_PC_WINDOWS_MSVC_OPENSSL_LIB_DIR=${{ runner.temp }}/openssl_extracted/app/lib/VC/x64/MT" >> $GITHUB_ENV
         cargo xwin env | sed -e 's/^export //' -e 's/;$//' -e 's/="\(.*\)"$/=\1/' >> $GITHUB_ENV
       shell: bash
 

.github/workflows/build-windows.yml

@@ -58,7 +58,6 @@ jobs:
         run: >-
           cargo nextest archive --archive-file=workspace.tar.zst 
           -p gsdk
-          -p gclient
           -p "pallet-*" -p gear-lazy-pages -p gear-runtime-interface
           --zstd-level=6
           --target=x86_64-pc-windows-msvc
@@ -118,9 +117,3 @@ jobs:
           cargo nextest run --archive-file=workspace.tar.zst
           -E 'platform(target) and package(gsdk)'
           --workspace-remap=${{ github.workspace }}
-
-      - name: "Test: Client tests"
-        run: >-
-          cargo nextest run --archive-file=workspace.tar.zst
-          -E 'platform(target) and package(gclient)'
-          --workspace-remap=${{ github.workspace }}

.github/workflows/build.yml

@@ -294,7 +294,7 @@ jobs:
       - name: "Install: Foundry"
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: v1.5.0-rc1
+          version: v1.5.0
 
       - name: "Show: Versioning"
         run: |
@@ -382,25 +382,25 @@ jobs:
         # check that perf benchmarks works. `--steps=5` need to test, that benchmarks works for different input number.
         run: >-
           ./target/release/gear benchmark pallet
-          --chain=dev --steps=5 --repeat=0 --heap-pages=4096
+          --chain=dev --steps=5 --repeat=0 --heap-pages=16384
           --pallet="*" --extrinsic="*"
 
       - name: "Test: Extra `read_big_state` benchmark"
         run: >-
           ./target/release/gear benchmark pallet
-          --chain=dev --repeat=0 --heap-pages=4096
+          --chain=dev --repeat=0 --heap-pages=16384
           --pallet=pallet_gear --extrinsic="read_big_state" --extra
 
       - name: "Test: Extra `signal_stack_limit_exceeded_works` benchmark"
         run: >-
           ./target/release/gear benchmark pallet
-          --chain=dev --repeat=0 --heap-pages=4096
+          --chain=dev --repeat=0 --heap-pages=16384
           --pallet=pallet_gear --extrinsic="signal_stack_limit_exceeded_works" --extra
 
       - name: "Test: Extra `check_all` benchmark"
         run: >-
           ./target/release/gear benchmark pallet
-          --chain=dev --repeat=0 --heap-pages=4096
+          --chain=dev --repeat=0 --heap-pages=16384
           --pallet=pallet_gear --extrinsic="check_all" --extra
 
   try-runtime:
@@ -552,6 +552,18 @@ jobs:
           name: examples-release-wasm32-gear
           path: examples-artifact
 
+      - name: "ACTIONS: Disable workspace hack"
+        uses: ./.github/actions/cargo-hakari
+        with:
+          # production binaries should not have additional features enabled for deps, too
+          args: disable
+
+      - name: "ACTIONS: Disable workspace hack"
+        uses: ./.github/actions/cargo-hakari
+        with:
+          # also don't compile manually written deps in the hack
+          args: remove-deps --yes
+
       - name: "Build: Production binaries"
         run: cargo build -p wasm-proc -p gear-cli -F cli --profile production