feat: 4337 sdk ci improvements (#198)

Author: jackpooleyml

.github/workflows/ci-rust.yml

@@ -198,8 +198,11 @@ jobs:
           cargo clippy --all-targets -- -D warnings
         working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
 
-      - name: Run rust tests
-        run: cargo test
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@nextest
+
+      - name: Run rust tests with nextest
+        run: cargo nextest run --profile ci --all-features
         working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
 
   rust-sdk-erc4337-wasm:

.github/workflows/scripts/install-anvil-zksync.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 REPO_URL="https://github.com/matter-labs/anvil-zksync.git"
-RELEASE_VERSION="v0.6.3"
+RELEASE_VERSION="v0.6.11"
 
 # Detect platform
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -39,4 +39,4 @@ if command -v anvil-zksync >/dev/null 2>&1; then
 else
   echo "Error: anvil-zksync not found in PATH" >&2
   exit 1
-fi
+fi

packages/sdk-platforms/rust/zksync-sso-erc4337/.config/nextest.toml

@@ -0,0 +1,21 @@
+[profile.default]
+# Show test output for failing tests
+failure-output = "immediate"
+# Show test output for successful tests
+success-output = "never"
+# Show test output while tests are running
+status-level = "pass"
+# Number of retries for failed tests
+retries = 0
+# Run all tests sequentially (no parallel execution)
+test-threads = 1
+
+[profile.ci]
+# In CI, show output for all tests
+failure-output = "immediate-final"
+success-output = "never"
+status-level = "pass"
+# Enable JUnit output for CI
+# The path is relative to the workspace root
+# Run all tests sequentially in CI as well
+test-threads = 1

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337.rs

@@ -8,3 +8,4 @@ pub mod signature;
 pub mod signer;
 pub mod transaction;
 pub mod user_operation;
+pub mod utils;

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/erc7579/add_module.rs

@@ -68,44 +68,48 @@ fn add_module_call_data(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::erc4337::account::modular_smart_account::{
-        deploy::{EOASigners, deploy_account},
-        signature::{eoa_signature, stub_signature_eoa},
+    use crate::{
+        erc4337::account::modular_smart_account::{
+            deploy::{EOASigners, deploy_account},
+            signature::{eoa_signature, stub_signature_eoa},
+        },
+        utils::alloy_utilities::test_utilities::{
+            TestInfraConfig,
+            start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+        },
     };
     use alloy::{
         primitives::{FixedBytes, U256, address},
-        providers::ProviderBuilder,
         rpc::types::TransactionRequest,
-        signers::local::PrivateKeySigner,
     };
-    use std::{str::FromStr, sync::Arc};
+    use std::sync::Arc;
 
     #[tokio::test]
-    #[ignore = "needs local infrastructure to be running"]
     async fn test_add_module() -> eyre::Result<()> {
-        let rpc_url = "http://localhost:8545".parse()?;
-
-        let factory_address =
-            address!("0x679FFF51F11C3f6CaC9F2243f9D14Cb1255F65A3");
+        let (
+            _,
+            anvil_instance,
+            provider,
+            contracts,
+            signer_private_key,
+            bundler,
+            bundler_client,
+        ) = {
+            let signer_private_key = "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6".to_string();
+            let config = TestInfraConfig {
+                signer_private_key: signer_private_key.clone(),
+            };
+            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+                &config,
+            )
+            .await?
+        };
 
         let entry_point_address =
             address!("0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108");
 
-        let eoa_validator_address =
-            address!("0x00427eDF0c3c3bd42188ab4C907759942Abebd93");
-
-        let signer_private_key = "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6";
-
-        let provider = {
-            let signer = PrivateKeySigner::from_str(signer_private_key)?;
-            let alloy_signer = signer.clone();
-            let ethereum_wallet =
-                alloy::network::EthereumWallet::new(alloy_signer.clone());
-
-            ProviderBuilder::new()
-                .wallet(ethereum_wallet.clone())
-                .connect_http(rpc_url)
-        };
+        let factory_address = contracts.account_factory;
+        let eoa_validator_address = contracts.eoa_validator;
 
         let signers =
             vec![address!("0xa0Ee7A142d267C1f36714E4a8F75612F20a79720")];
@@ -143,22 +147,16 @@ mod tests {
                 .value(U256::from(10000000000000000000u64));
             _ = provider.send_transaction(fund_tx).await?.get_receipt().await?;
         }
-
-        let module_address =
-            address!("0xF3F924c9bADF6891D3676cfe9bF72e2C78527E17"); // WebAuthn Module Address
-
-        let bundler_client = {
-            use crate::erc4337::bundler::config::BundlerConfig;
-            let bundler_url = "http://localhost:4337".to_string();
-            let config = BundlerConfig::new(bundler_url);
-            BundlerClient::new(config)
-        };
+        let module_address = contracts.webauthn_validator;
 
         let stub_sig = stub_signature_eoa(eoa_validator_address)?;
 
-        let signature_provider = Arc::new(move |hash: FixedBytes<32>| {
-            eoa_signature(signer_private_key, eoa_validator_address, hash)
-        });
+        let signature_provider = {
+            let signer_private_key = signer_private_key.clone();
+            Arc::new(move |hash: FixedBytes<32>| {
+                eoa_signature(&signer_private_key, eoa_validator_address, hash)
+            })
+        };
 
         let signer =
             Signer { provider: signature_provider, stub_signature: stub_sig };
@@ -185,6 +183,9 @@ mod tests {
             "is_web_authn_module is not installed"
         );
 
+        drop(anvil_instance);
+        drop(bundler);
+
         Ok(())
     }
 }

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/is_deployed.rs

@@ -15,42 +15,3 @@ where
 
     Ok(false)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use alloy::{node_bindings::Anvil, providers::ProviderBuilder};
-
-    #[tokio::test]
-    #[ignore = "implementation not complete"]
-    async fn test_is_smart_account_deployed() -> eyre::Result<()> {
-        let anvil = Anvil::new().spawn();
-        let anvil_url = anvil.endpoint_url();
-
-        let provider = ProviderBuilder::new().connect_http(anvil_url);
-
-        // Test with a known address (anvil's first default account - EOA)
-        let eoa_address =
-            "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266".parse::<Address>()?;
-
-        // Test that EOA is not deployed as smart contract
-        let is_eoa_deployed =
-            is_smart_account_deployed(&provider, eoa_address).await?;
-        eyre::ensure!(
-            !is_eoa_deployed,
-            "EOA should not be detected as deployed smart contract"
-        );
-
-        // Test with a non-existent address
-        let non_existent =
-            "0x0000000000000000000000000000000000000123".parse::<Address>()?;
-        let is_non_existent_deployed =
-            is_smart_account_deployed(&provider, non_existent).await?;
-        eyre::ensure!(
-            !is_non_existent_deployed,
-            "Non-existent address should not be deployed"
-        );
-
-        Ok(())
-    }
-}