Linting (#3)

Author: r-near

.github/workflows/rust_lint.yml

@@ -0,0 +1,43 @@
+name: Rust Linting
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - 'eth2near/**'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'eth2near/**'
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./eth2near
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Rust
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: 1.86.0
+        components: clippy, rustfmt
+        target: wasm32-unknown-unknown
+
+    - name: Cache Rust dependencies
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: |
+          ./eth2near
+        cache-on-failure: true
+        cache-all-crates: true
+
+    - name: Run linters
+      run: cargo clippy --all-targets --all-features -- -D warnings -D clippy::all
+    - name: Check formatting
+      run: cargo fmt --all -- --check

contracts/near/eth-prover/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.2-rust-1.84.0"
+image = "sourcescan/cargo-near:0.16.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
 image_digest = "sha256:b41cb89907f92b114da9e2be4e109bff30ab792c22ddcbd2a4cff8e340cb9acb"
 # list of environment variables names, whose values, if set, will be used as external build parameters

contracts/near/eth-prover/rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.86.0"

contracts/near/eth-prover/src/tests.rs

@@ -30,7 +30,7 @@ mod tests {
 
     // TESTS
 
-    use near_sdk::{testing_env, VMContext, NearToken};
+    use near_sdk::{testing_env, NearToken, VMContext};
 
     fn get_context(input: Vec<u8>) -> VMContext {
         VMContext {

contracts/near/eth-prover/src/tests_storage_proof.rs

@@ -80,7 +80,7 @@ mod tests_storage_proof {
 
     // TESTS
 
-    use near_sdk::{testing_env, VMContext, NearToken};
+    use near_sdk::{testing_env, NearToken, VMContext};
 
     fn get_context(input: Vec<u8>) -> VMContext {
         VMContext {

contracts/near/eth2-client/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.2-rust-1.84.0"
+image = "sourcescan/cargo-near:0.16.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
 image_digest = "sha256:b41cb89907f92b114da9e2be4e109bff30ab792c22ddcbd2a4cff8e340cb9acb"
 # list of environment variables names, whose values, if set, will be used as external build parameters

contracts/near/eth2-client/rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.86.0"

contracts/near/eth2-client/src/tests/integration_sepolia.rs

@@ -3,20 +3,20 @@ mod sepolia_integration_tests {
     use super::*;
     use crate::tests::utils::get_sepolia_test_data;
     use crate::tests::utils::InitOptions;
+    use borsh::{BorshDeserialize, BorshSerialize};
     use eth2_utility::types::InitInput;
     use eth_types::eth2::{ExtendedBeaconBlockHeader, SyncCommittee};
     use eth_types::{Address, Bloom, H256, H64, U256};
-    use borsh::{BorshDeserialize, BorshSerialize};
     use near_sdk::{Gas, NearToken};
-    use near_workspaces::{Account, Contract};
     use near_workspaces::operations::Function;
+    use near_workspaces::{Account, Contract};
     use serde::{Deserialize, Serialize};
 
     const WASM_FILEPATH: &str = "../target/near/eth2_client/eth2_client.wasm";
     const WASM_V_0_1_0_FILEPATH: &str = "src/data/eth2_client_v0.1.0_testnet.wasm";
 
     #[derive(Debug, Clone, BorshSerialize, BorshDeserialize, Serialize, Deserialize)]
-    struct BlockHeaderV1 {         
+    struct BlockHeaderV1 {
         pub parent_hash: H256,
         pub uncles_hash: H256,
         pub author: Address,
@@ -43,14 +43,14 @@ mod sepolia_integration_tests {
         pub partial_hash: Option<H256>,
     }
 
-    impl From<eth_types::BlockHeader> for BlockHeaderV1 { 
+    impl From<eth_types::BlockHeader> for BlockHeaderV1 {
         fn from(item: eth_types::BlockHeader) -> Self {
             serde_json::from_str(&serde_json::to_string(&item).unwrap()).unwrap()
         }
     }
 
     #[derive(Clone, BorshDeserialize, BorshSerialize)]
-    struct InitInputV1 { 
+    struct InitInputV1 {
         pub network: String,
         pub finalized_execution_header: BlockHeaderV1,
         pub finalized_beacon_header: ExtendedBeaconBlockHeader,
@@ -63,7 +63,7 @@ mod sepolia_integration_tests {
         pub trusted_signer: Option<near_sdk::AccountId>,
     }
 
-    impl From<InitInput> for InitInputV1 { 
+    impl From<InitInput> for InitInputV1 {
         fn from(message: InitInput) -> Self {
             Self {
                 network: message.network,
@@ -91,9 +91,14 @@ mod sepolia_integration_tests {
         let alice = owner
             .create_subaccount("alice")
             .initial_balance(NearToken::from_near(30))
-            .transact().await?
+            .transact()
+            .await?
             .into_result()?;
-        let _ = contract.call("init").args_borsh(init_input).transact().await?;
+        let _ = contract
+            .call("init")
+            .args_borsh(init_input)
+            .transact()
+            .await?;
         Ok((alice, contract))
     }
 
@@ -117,10 +122,12 @@ mod sepolia_integration_tests {
         update.finality_update.header_update.execution_block_hash = last;
 
         // Submit the light‐client update
-        let outcome = alice.call(contract.id(), "submit_beacon_chain_light_client_update")
+        let outcome = alice
+            .call(contract.id(), "submit_beacon_chain_light_client_update")
             .args_borsh(update)
             .gas(Gas::from_tgas(300))
-            .transact().await?;
+            .transact()
+            .await?;
         assert!(outcome.is_success(), "update failed");
 
         // Submit execution headers in reverse order
@@ -130,7 +137,7 @@ mod sepolia_integration_tests {
                 tx = tx.call(
                     Function::new("submit_execution_header")
                         .args(borsh::to_vec(h)?)
-                        .gas(Gas::from_tgas(6))
+                        .gas(Gas::from_tgas(6)),
                 );
             }
             let result = tx.transact().await?;
@@ -139,14 +146,14 @@ mod sepolia_integration_tests {
 
         // Verify that each block’s hash is stored
         for h in slice {
-            let result: Option<H256> = contract.view("block_hash_safe")
-                .args_borsh(h.number).await?
+            let result: Option<H256> = contract
+                .view("block_hash_safe")
+                .args_borsh(h.number)
+                .await?
                 .borsh()?;
             assert!(result.is_some(), "block {} missing", h.number);
         }
 
         Ok(())
     }
-
-
 }

contracts/near/rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.86.0"