feat: add support for devnet 1 (#40)

* chore: pin leanSig to f10dcbe

* fix: add missing checks in validate_attestation

* fix: change image name in make docker-build

* chore: update sample gossiped block

* chore: pin leanSpec@050fa4a

* chore: comment out --scheme flag when generating fixtures

* fix: move to unaggregated signatures

* chore: remove signature spectests

* refactor: unify gossiped and block attestation signatures field

* test: update fork choice test runner

* fix: move to unaggregated attestations for gossipsub

* fix: skip failing test with wrong labels

* fix: sign Attestation instead of AttestationData

* fix: use attestation instead of data when verifying

* fix: process blocks when proposing

* chore: use local tag for docker image

* chore: fmt

* ci: generate old version fixtures

Author: MegaRedHand

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
@@ -45,14 +45,30 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - name: Download test fixtures
-        env:
-          GH_TOKEN: ${{ github.token }}
+      # - name: Download test fixtures
+      #   env:
+      #     GH_TOKEN: ${{ github.token }}
+      #   run: |
+      #     mkdir -p leanSpec/fixtures
+      #     gh run download --repo leanEthereum/leanSpec --name fixtures-prod-scheme --dir leanSpec/fixtures
+
+      - name: Checkout leanSpec
+        uses: actions/checkout@v6
+        with:
+          repository: leanEthereum/leanSpec
+          ref: 050fa4a18881d54d7dc07601fe59e34eb20b9630
+          path: leanSpec
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Generate test fixtures
+        working-directory: leanSpec
         run: |
-          mkdir -p leanSpec/fixtures
-          gh run download --repo leanEthereum/leanSpec --name fixtures-prod-scheme --dir leanSpec/fixtures
+          uv sync
+          uv run fill --fork=devnet --clean -n auto
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master

Cargo.lock

@@ -52,7 +52,7 @@ clap = { version = "4.3", features = ["derive", "env"] }
 ethereum-types = { version = "0.15.1", features = ["serialize"] }
 
 # XMSS signatures
-leansig = { git = "https://github.com/leanEthereum/leansig.git", rev = "ae12a5feb25d917c42b6466444ebd56ec115a629" }
+leansig = { git = "https://github.com/leanEthereum/leansig.git", rev = "f10dcbe" }
 
 # SSZ deps
 # TODO: roll up our own implementation

Cargo.toml

@@ -11,16 +11,16 @@ test: ## 🧪 Run all tests, then forkchoice tests with skip-signature-verificat
 	cargo test -p ethlambda-blockchain --features skip-signature-verification --test forkchoice_spectests
 
 docker-build: ## 🐳 Build the Docker image
-	docker build -t ethlambda:latest .
+	docker build -t ghcr.io/lambdaclass/ethlambda:local .
 
-LEAN_SPEC_COMMIT_HASH:=fbbacbea4545be870e25e3c00a90fc69e019c5bb
+LEAN_SPEC_COMMIT_HASH:=050fa4a18881d54d7dc07601fe59e34eb20b9630
 
 leanSpec:
 	git clone https://github.com/leanEthereum/leanSpec.git --single-branch
 	cd leanSpec && git checkout $(LEAN_SPEC_COMMIT_HASH)
 
 leanSpec/fixtures: leanSpec
-	cd leanSpec && uv run fill --fork devnet --scheme=prod -o fixtures
+	cd leanSpec && uv run fill --fork devnet -o fixtures #--scheme=prod
 
 # lean-quickstart:
 # 	git clone https://github.com/blockblaz/lean-quickstart.git --depth 1 --single-branch

Makefile

@@ -45,8 +45,3 @@ name = "forkchoice_spectests"
 path = "tests/forkchoice_spectests.rs"
 harness = false
 required-features = ["skip-signature-verification"]
-
-[[test]]
-name = "signature_spectests"
-path = "tests/signature_spectests.rs"
-harness = false

crates/blockchain/Cargo.toml

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use ethlambda_types::{
-    attestation::XmssSignature,
-    primitives::H256,
+    attestation::{Attestation, XmssSignature},
+    primitives::{H256, TreeHash},
     signature::{ValidatorSecretKey, ValidatorSignature},
 };
 
@@ -51,7 +51,7 @@ impl KeyManager {
         self.keys.keys().copied().collect()
     }
 
-    /// Signs an attestation message for the specified validator.
+    /// Signs a message for the specified validator.
     ///
     /// # Arguments
     ///
@@ -68,13 +68,13 @@ impl KeyManager {
     /// # Example
     ///
     /// ```ignore
-    /// let signature = key_manager.sign_attestation(
+    /// let signature = key_manager.sign_message(
     ///     validator_id,
     ///     epoch,
     ///     &message_hash
     /// )?;
     /// ```
-    pub fn sign_attestation(
+    fn sign_message(
         &mut self,
         validator_id: u64,
         epoch: u32,
@@ -96,6 +96,15 @@ impl KeyManager {
 
         Ok(xmss_sig)
     }
+
+    pub fn sign_attestation(
+        &mut self,
+        attestation: &Attestation,
+    ) -> Result<XmssSignature, KeyManagerError> {
+        let message_hash = attestation.tree_hash_root();
+        let epoch = attestation.data.slot as u32;
+        self.sign_message(attestation.validator_id, epoch, &message_hash)
+    }
 }
 
 #[cfg(test)]
@@ -110,12 +119,12 @@ mod tests {
     }
 
     #[test]
-    fn test_sign_attestation_validator_not_found() {
+    fn test_sign_message_validator_not_found() {
         let keys = HashMap::new();
         let mut key_manager = KeyManager::new(keys);
         let message = H256::default();
 
-        let result = key_manager.sign_attestation(123, 0, &message);
+        let result = key_manager.sign_message(123, 0, &message);
         assert!(matches!(
             result,
             Err(KeyManagerError::ValidatorKeyNotFound(123))