chore: run tests with zksyncos server

Author: jackpooleyml

packages/sdk-platforms/rust/zksync-sso-erc4337/.gitignore

@@ -1 +1,2 @@
-#Cargo.lock
+zksync-os-server
+account-abstraction

packages/sdk-platforms/rust/zksync-sso-erc4337/Cargo.lock

@@ -97,3 +97,5 @@ tempfile = "3"
 strip-ansi-escapes = "0.2"
 libc = "0.2"
 
+# Misc
+ureq = "2.10"

packages/sdk-platforms/rust/zksync-sso-erc4337/Cargo.toml

@@ -49,6 +49,7 @@ base64.workspace = true
 libc = { workspace = true, optional = true }
 strip-ansi-escapes = { workspace = true, optional = true }
 tempfile = { workspace = true, optional = true }
+zksync-sso-zksyncos-node = { path = "../zksync-sso-zksyncos-node", optional = true }
 
 # Explicitly add getrandom v0.2 with js feature for WASM (used by rand 0.8 from alloy)
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -60,7 +61,7 @@ web-sys = { version = "0.3", features = ["Window"] }
 [features]
 default = ["tokio-runtime"]
 tokio-runtime = ["tokio"]
-test-utilities = ["libc", "strip-ansi-escapes", "tempfile"]
+test-utilities = ["libc", "strip-ansi-escapes", "tempfile", "zksync-sso-zksyncos-node"]
 
 [dev-dependencies]
 # Alloy

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/Cargo.toml

@@ -122,8 +122,8 @@ mod tests {
             signer::create_eoa_signer,
         },
         utils::alloy_utilities::test_utilities::{
-            TestInfraConfig,
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+            config::TestInfraConfig,
+            start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::address;
@@ -143,7 +143,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?
@@ -243,7 +243,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?

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

@@ -242,8 +242,8 @@ mod tests {
             signer::{Signer, create_eoa_signer},
         },
         utils::alloy_utilities::test_utilities::{
-            TestInfraConfig, start_anvil_and_deploy_contracts,
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+            config::TestInfraConfig, start_node_and_deploy_contracts,
+            start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::{
@@ -256,7 +256,7 @@ mod tests {
     #[tokio::test]
     async fn test_deploy_account_basic() -> eyre::Result<()> {
         let (_, anvil_instance, provider, contracts, _) =
-            start_anvil_and_deploy_contracts().await?;
+            start_node_and_deploy_contracts().await?;
 
         let factory_address = contracts.account_factory;
 
@@ -278,7 +278,7 @@ mod tests {
     #[tokio::test]
     async fn test_deploy_account_with_eoa_signer() -> eyre::Result<()> {
         let (_, anvil_instance, provider, contracts, _) =
-            start_anvil_and_deploy_contracts().await?;
+            start_node_and_deploy_contracts().await?;
 
         let factory_address = contracts.account_factory;
         let eoa_validator_address = contracts.eoa_validator;
@@ -320,7 +320,7 @@ mod tests {
     #[tokio::test]
     async fn test_deploy_account_with_session_validator() -> eyre::Result<()> {
         let (_, anvil_instance, provider, contracts, _) =
-            start_anvil_and_deploy_contracts().await?;
+            start_node_and_deploy_contracts().await?;
 
         let factory_address = contracts.account_factory;
         let session_validator_address = contracts.session_validator;
@@ -363,7 +363,7 @@ mod tests {
     #[tokio::test]
     async fn test_deploy_account_with_eoa_and_session() -> eyre::Result<()> {
         let (_, anvil_instance, provider, contracts, _) =
-            start_anvil_and_deploy_contracts().await?;
+            start_node_and_deploy_contracts().await?;
 
         let factory_address = contracts.account_factory;
         let eoa_validator_address = contracts.eoa_validator;
@@ -442,7 +442,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?

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

@@ -130,8 +130,8 @@ mod tests {
             signer::create_eoa_signer,
         },
         utils::alloy_utilities::test_utilities::{
-            TestInfraConfig,
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+            config::TestInfraConfig,
+            start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::{U256, address};
@@ -148,7 +148,7 @@ mod tests {
             bundler_client,
         ) = {
             let signer_private_key = "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6".to_string();
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &TestInfraConfig {
                     signer_private_key: signer_private_key.clone(),
                 },

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/deploy/user_op.rs

@@ -56,8 +56,8 @@ mod tests {
         utils::alloy_utilities::{
             ethereum_wallet_from_private_key,
             test_utilities::{
-                TestInfraConfig,
-                start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+                config::TestInfraConfig,
+                start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
     };
@@ -78,7 +78,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/accept.rs

@@ -100,8 +100,8 @@ mod tests {
             signer::create_eoa_signer,
         },
         utils::alloy_utilities::test_utilities::{
-            TestInfraConfig,
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+            config::TestInfraConfig,
+            start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::address;
@@ -121,7 +121,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/propose.rs

@@ -71,8 +71,8 @@ mod tests {
         utils::alloy_utilities::{
             ethereum_wallet_from_private_key,
             test_utilities::{
-                TestInfraConfig,
-                start_anvil_and_deploy_contracts_and_start_bundler_with_config,
+                config::TestInfraConfig,
+                start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
     };
@@ -95,7 +95,7 @@ mod tests {
             let config = TestInfraConfig {
                 signer_private_key: signer_private_key.clone(),
             };
-            start_anvil_and_deploy_contracts_and_start_bundler_with_config(
+            start_node_and_deploy_contracts_and_start_bundler_with_config(
                 &config,
             )
             .await?