feat(ethexe): add versioning to contracts, clients

.github/workflows/build.yml

@@ -182,8 +182,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker
@@ -219,8 +217,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: Setup linker
         uses: ./.github/actions/setup-linker
@@ -263,8 +259,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker
@@ -287,7 +281,11 @@ jobs:
       - name: "Install: Foundry"
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: v1.7.0
+          version: v1.7.1
+
+      - name: Install dependencies
+        run: forge soldeer install
+        working-directory: ./ethexe/contracts
 
       - name: "Show: Versioning"
         run: |
@@ -340,8 +338,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with: 
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker
@@ -541,8 +537,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker

.github/workflows/check.yml

@@ -47,8 +47,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-        with:
-          submodules: recursive
       - name: typos-action
         uses: crate-ci/typos@master
 
@@ -57,8 +55,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Rust toolchain"
         uses: ./.github/actions/install-rust
@@ -74,12 +70,16 @@ jobs:
       - name: "Install: Foundry"
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: v1.7.0
+          version: v1.7.1
+
+      - name: Install dependencies
+        run: forge soldeer install
+        working-directory: ./ethexe/contracts
 
       - name: "Install: Node.js"
         uses: actions/setup-node@v6
         with:
-          node-version: 22.x
+          node-version: 24.x
 
       - name: "Show: Versioning"
         run: forge --version
@@ -88,7 +88,7 @@ jobs:
         run: |
           npm cache clean --force
 
-          # version from ethexe/contracts/lib/openzeppelin-foundry-upgrades/src/internal/Versions.sol
+          # version from ethereum/dependencies/openzeppelin-foundry-upgrades-0.4.0/src/internal/Versions.sol
           npx @openzeppelin/upgrades-core@^1.37.0
 
           forge fmt --check
@@ -148,8 +148,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker
@@ -177,8 +175,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker
@@ -228,8 +224,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Setup linker"
         uses: ./.github/actions/setup-linker

.github/workflows/release.yml

@@ -48,7 +48,6 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: ${{ github.event.inputs.tag_name }}
-          submodules: recursive
 
       - name: "Environment: Rust toolchain"
         uses: ./.github/actions/install-rust

.github/workflows/test-measurements.yaml

@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: "ACTIONS: Checkout"
         uses: actions/checkout@v6
-        with:
-          submodules: recursive
 
       - name: "Install: Set cargo path"
         run: echo "/tmp/cargo/bin" >> $GITHUB_PATH

Makefile

@@ -9,15 +9,13 @@ ethexe-pre-commit-no-contracts: fmt clippy-gear
 # Building ethexe contracts
 .PHONY: ethexe-contracts-deps-check
 ethexe-contracts-deps-check:
-	@ echo " > Checking ethexe contract submodules are locked" && \
-		status="$$(git submodule status --recursive -- ethexe/contracts/lib)" && \
-		if printf '%s\n' "$$status" | grep -E '^[+-U]' >/dev/null; then \
-			printf '%s\n' "$$status"; \
-			echo "ethexe contract submodules must be initialized and checked out at the pinned revisions"; \
-			exit 1; \
+	@ echo " > Checking ethexe contracts dependencies" && \
+		if [ ! -d "./ethexe/contracts/dependencies" ]; then \
+			echo "Dependencies folder not found. Installing..." && \
+			(cd ./ethexe/contracts && forge soldeer install); \
+		else \
+			echo "Dependencies folder already exists."; \
 		fi
-	@ echo " > Checking ethexe contract submodules are clean" && \
-		(cd ethexe/contracts/lib && git submodule foreach --recursive 'git diff --quiet && git diff --cached --quiet || { echo "$$sm_path has uncommitted changes"; exit 1; }') >/dev/null
 	@ echo " > Checking ethexe ethereum ABI artifacts are present" && \
 		for artifact in \
 			BatchMulticall \
@@ -59,18 +57,18 @@ ethexe-contracts-lock-artifacts:
 	@ echo " > Locking DemoCaller artifact" && cp ./ethexe/contracts/out/DemoCaller.sol/DemoCaller.json ./ethexe/ethereum/abi
 	@ echo " > Locking Gear artifact" && cp ./ethexe/contracts/out/Gear.sol/Gear.json ./ethexe/ethereum/abi
 	@ echo " > Locking Symbiotic core artifacts" && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/DelegatorFactory.sol/DelegatorFactory.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/NetworkMiddlewareService.sol/NetworkMiddlewareService.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/NetworkRegistry.sol/NetworkRegistry.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/OperatorRegistry.sol/OperatorRegistry.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/OptInService.sol/OptInService.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/SlasherFactory.sol/SlasherFactory.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/Vault.sol/Vault.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-core/out/VaultFactory.sol/VaultFactory.json ./ethexe/ethereum/abi
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/DelegatorFactory.sol/DelegatorFactory.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/NetworkMiddlewareService.sol/NetworkMiddlewareService.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/NetworkRegistry.sol/NetworkRegistry.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/OperatorRegistry.sol/OperatorRegistry.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/OptInService.sol/OptInService.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/SlasherFactory.sol/SlasherFactory.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/Vault.sol/Vault.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-core-main/out/VaultFactory.sol/VaultFactory.json ./ethexe/ethereum/abi
 	@ echo " > Locking Symbiotic rewards artifacts" && \
-		cp ./ethexe/contracts/lib/symbiotic-rewards/out/DefaultOperatorRewards.sol/DefaultOperatorRewards.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-rewards/out/DefaultStakerRewards.sol/DefaultStakerRewards.json ./ethexe/ethereum/abi && \
-		cp ./ethexe/contracts/lib/symbiotic-rewards/out/DefaultStakerRewardsFactory.sol/DefaultStakerRewardsFactory.json ./ethexe/ethereum/abi
+		cp ./ethexe/contracts/dependencies/symbiotic-rewards-main/out/DefaultOperatorRewards.sol/DefaultOperatorRewards.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-rewards-main/out/DefaultStakerRewards.sol/DefaultStakerRewards.json ./ethexe/ethereum/abi && \
+		cp ./ethexe/contracts/dependencies/symbiotic-rewards-main/out/DefaultStakerRewardsFactory.sol/DefaultStakerRewardsFactory.json ./ethexe/ethereum/abi
 
 .PHONY: ethexe-contracts-pre-commit
 ethexe-contracts-pre-commit: ethexe-contracts-deps-check

ethexe/common/src/db.rs

@@ -267,7 +267,7 @@ mod tests {
     #[test]
     fn ensure_types_unchanged() {
         const EXPECTED_TYPE_INFO_HASH: &str =
-            "cbf21dc97ec57cc6f653a7808672dc2c086fdfae28d1435e93f0dfe812de21c3";
+            "918c461a80e6ecd2fa36e7742d7c342c99a0b6a72a79b29ebb66499ee8a238f5";
 
         let types = [
             meta_type::<BlockMeta>(),

ethexe/common/src/events/router.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 use crate::Digest;
-use gprimitives::{ActorId, CodeId, H256};
+use gprimitives::{ActorId, CodeId, H256, U256};
 use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
@@ -22,6 +22,12 @@ pub struct MBCommittedEvent(pub H256);
 #[derive(Clone, Debug, Encode, Decode, TypeInfo, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct EBCommittedEvent(pub H256);
 
+#[derive(Clone, Debug, Encode, Decode, TypeInfo, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+pub struct ProtocolVersionChangedEvent {
+    pub new_protocol_version: U256,
+}
+
 #[derive(Clone, Debug, Encode, Decode, TypeInfo, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct CodeGotValidatedEvent {
     pub code_id: CodeId,
@@ -74,6 +80,7 @@ pub enum Event {
     // TODO: on review ask about backward compatibility
     StorageSlotChanged(StorageSlotChangedEvent),
     ValidatorsCommittedForEra(ValidatorsCommittedForEraEvent),
+    ProtocolVersionChanged(ProtocolVersionChangedEvent),
 }
 
 impl Event {
@@ -88,6 +95,7 @@ impl Event {
             Self::ValidatorsCommittedForEra(event) => {
                 RequestEvent::ValidatorsCommittedForEra(event)
             }
+            Self::ProtocolVersionChanged(event) => RequestEvent::ProtocolVersionChanged(event),
             Self::CodeGotValidated { .. }
             | Self::MBCommitted(_)
             | Self::EBCommitted(_)
@@ -104,4 +112,5 @@ pub enum RequestEvent {
     ProgramCreated(ProgramCreatedEvent),
     StorageSlotChanged(StorageSlotChangedEvent),
     ValidatorsCommittedForEra(ValidatorsCommittedForEraEvent),
+    ProtocolVersionChanged(ProtocolVersionChangedEvent),
 }