feat: Remove zksync-rs SDK (#1559)

## What ❔

Moves `zksync-rs` SDK to `loadnext` as a module.


`zksync-rs` is deprecated and not really maintained. However, it's a
dependency for `loadnext`, and we don't have capacity to rewrite
`loadnext` to use newer SDK.
Here we simply move what was `zksync-rs` to a module within `loadnext`.

Also, it removes the `sdk` folder completely.

## Why ❔

One less public package to maintain at low cost.

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.
- [ ] Linkcheck has been run via `zk linkcheck`.

Cargo.toml

@@ -49,8 +49,6 @@ members = [
     "core/tests/loadnext",
     "core/tests/vm-benchmark",
     "core/tests/vm-benchmark/harness",
-    # SDK section
-    "sdk/zksync-rs",
 ]
 resolver = "2"
 

core/lib/l1_contract_interface/Cargo.toml

@@ -15,8 +15,6 @@ zksync_prover_interface.workspace = true
 
 # Used to serialize proof data
 crypto_codegen.workspace = true
-# Used to calculate commitment for vk from the old L1 verifier contract (backward comatibility needs)
-circuit_sequencer_api_1_3_3.workspace = true
 # Used to calculate the kzg commitment and proofs
 kzg.workspace = true
 

core/lib/types/Cargo.toml

@@ -26,7 +26,6 @@ once_cell.workspace = true
 rlp.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_with = { workspace = true, features = ["base64"] }
 strum = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 num_enum.workspace = true
@@ -40,7 +39,6 @@ blake2.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt", "macros"] }
-serde_with = { workspace = true, features = ["hex"] }
 
 [build-dependencies]
 zksync_protobuf_build.workspace = true

core/lib/zksync_core/Cargo.toml

@@ -20,8 +20,6 @@ zksync_dal.workspace = true
 prover_dal.workspace = true
 zksync_db_connection.workspace = true
 zksync_config.workspace = true
-zksync_env_config.workspace = true
-zksync_protobuf_config.workspace = true
 zksync_utils.workspace = true
 zksync_contracts.workspace = true
 zksync_system_constants.workspace = true

core/tests/loadnext/Cargo.toml

@@ -11,7 +11,6 @@ categories.workspace = true
 publish = false
 
 [dependencies]
-zksync = { workspace = true, features = ["mint"] }
 zksync_types.workspace = true
 zksync_utils.workspace = true
 zksync_eth_signer.workspace = true

core/tests/loadnext/src/account/api_request_executor.rs

@@ -2,11 +2,6 @@ use std::time::Instant;
 
 use rand::seq::IteratorRandom;
 use regex::Regex;
-use zksync::{
-    error::{ClientError, RpcError},
-    types::FilterBuilder,
-    EthNamespaceClient,
-};
 use zksync_types::{api, ethabi::Contract, H256, U64};
 
 use super::{Aborted, AccountLifespan};
@@ -16,6 +11,11 @@ use crate::{
     constants::API_REQUEST_TIMEOUT,
     report::{ApiActionType, ReportBuilder, ReportLabel},
     rng::LoadtestRng,
+    sdk::{
+        error::{ClientError, RpcError},
+        types::FilterBuilder,
+        EthNamespaceClient,
+    },
 };
 
 impl AccountLifespan {

core/tests/loadnext/src/account/mod.rs

@@ -6,7 +6,6 @@ use std::{
 
 use futures::{channel::mpsc, SinkExt};
 use tokio::sync::RwLock;
-use zksync::{error::ClientError, operations::SyncTransactionHandle, HttpClient};
 use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_types::{api::TransactionReceipt, Address, Nonce, H256, U256, U64};
 use zksync_web3_decl::jsonrpsee::core::ClientError as CoreError;
@@ -18,6 +17,7 @@ use crate::{
     config::{LoadtestConfig, RequestLimiters},
     constants::{MAX_L1_TRANSACTIONS, POLLING_INTERVAL},
     report::{Report, ReportBuilder, ReportLabel},
+    sdk::{error::ClientError, operations::SyncTransactionHandle, HttpClient},
     utils::format_gwei,
 };
 

core/tests/loadnext/src/account/pubsub_executor.rs

@@ -1,7 +1,6 @@
 use std::time::{Duration, Instant};
 
 use futures::{stream, TryStreamExt};
-use zksync::{error::ClientError, types::PubSubFilterBuilder};
 use zksync_web3_decl::{
     jsonrpsee::{
         core::client::{Subscription, SubscriptionClientT},
@@ -17,6 +16,7 @@ use crate::{
     config::RequestLimiters,
     report::{ReportBuilder, ReportLabel},
     rng::WeightedRandom,
+    sdk::{error::ClientError, types::PubSubFilterBuilder},
 };
 
 impl AccountLifespan {

core/tests/loadnext/src/account/tx_command_executor.rs

@@ -1,14 +1,5 @@
 use std::time::Instant;
 
-use zksync::{
-    error::ClientError,
-    ethereum::PriorityOpHolder,
-    utils::{
-        get_approval_based_paymaster_input, get_approval_based_paymaster_input_for_estimation,
-    },
-    web3::ethabi,
-    EthNamespaceClient,
-};
 use zksync_eth_client::EthInterface;
 use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT;
 use zksync_types::{
@@ -25,6 +16,15 @@ use crate::{
     },
     corrupted_tx::Corrupted,
     report::ReportLabel,
+    sdk::{
+        error::ClientError,
+        ethereum::PriorityOpHolder,
+        utils::{
+            get_approval_based_paymaster_input, get_approval_based_paymaster_input_for_estimation,
+        },
+        web3::ethabi,
+        EthNamespaceClient,
+    },
     utils::format_gwei,
 };
 

core/tests/loadnext/src/account_pool.rs

@@ -3,7 +3,6 @@ use std::{collections::VecDeque, convert::TryFrom, str::FromStr, sync::Arc, time
 use once_cell::sync::OnceCell;
 use rand::Rng;
 use tokio::time::timeout;
-use zksync::{signer::Signer, HttpClient, HttpClientBuilder, Wallet, ZksNamespaceClient};
 use zksync_eth_signer::PrivateKeySigner;
 use zksync_types::{tx::primitives::PackedEthSignature, Address, L2ChainId, H256};
 
@@ -12,6 +11,7 @@ use crate::{
     corrupted_tx::CorruptedSigner,
     fs_utils::{loadnext_contract, TestContract},
     rng::{LoadtestRng, Random},
+    sdk::{signer::Signer, HttpClient, HttpClientBuilder, Wallet, ZksNamespaceClient},
 };
 
 /// An alias to [`zksync::Wallet`] with HTTP client. Wrapped in `Arc` since

core/tests/loadnext/src/command/api.rs

@@ -1,12 +1,12 @@
 use num::Integer;
 use rand::RngCore;
-use zksync::EthNamespaceClient;
 use zksync_types::api;
 
 use crate::{
     account_pool::SyncWallet,
     all::AllWeighted,
     rng::{LoadtestRng, WeightedRandom},
+    sdk::EthNamespaceClient,
 };
 
 /// Helper enum for generating random block number.

core/tests/loadnext/src/corrupted_tx.rs

@@ -1,13 +1,12 @@
 use async_trait::async_trait;
-use zksync::signer::Signer;
 use zksync_eth_signer::{
     error::SignerError, raw_ethereum_tx::TransactionParameters, EthereumSigner,
 };
 use zksync_types::{
     fee::Fee, l2::L2Tx, Address, EIP712TypedStructure, Eip712Domain, PackedEthSignature,
 };
 
-use crate::command::IncorrectnessModifier;
+use crate::{command::IncorrectnessModifier, sdk::signer::Signer};
 
 /// Trait that exists solely to extend the signed zkSync transaction interface, providing the ability
 /// to modify transaction in a way that will make it invalid.

core/tests/loadnext/src/executor.rs

@@ -2,14 +2,6 @@ use std::sync::Arc;
 
 use anyhow::anyhow;
 use futures::{channel::mpsc, future, SinkExt};
-use zksync::{
-    ethereum::{PriorityOpHolder, DEFAULT_PRIORITY_FEE},
-    utils::{
-        get_approval_based_paymaster_input, get_approval_based_paymaster_input_for_estimation,
-    },
-    web3::types::TransactionReceipt,
-    EthNamespaceClient, EthereumProvider, ZksNamespaceClient,
-};
 use zksync_eth_client::{BoundEthInterface, EthInterface, Options};
 use zksync_eth_signer::PrivateKeySigner;
 use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT;
@@ -25,6 +17,14 @@ use crate::{
     constants::*,
     report::ReportBuilder,
     report_collector::{LoadtestResult, ReportCollector},
+    sdk::{
+        ethereum::{PriorityOpHolder, DEFAULT_PRIORITY_FEE},
+        utils::{
+            get_approval_based_paymaster_input, get_approval_based_paymaster_input_for_estimation,
+        },
+        web3::types::TransactionReceipt,
+        EthNamespaceClient, EthereumProvider, ZksNamespaceClient,
+    },
     utils::format_eth,
 };
 

core/tests/loadnext/src/lib.rs

@@ -12,4 +12,5 @@ pub mod fs_utils;
 pub mod report;
 pub mod report_collector;
 pub mod rng;
+pub(crate) mod sdk;
 pub mod utils;

core/tests/loadnext/src/rng.rs

@@ -1,10 +1,9 @@
 use std::convert::TryInto;
 
 use rand::{rngs::SmallRng, seq::SliceRandom, thread_rng, RngCore, SeedableRng};
-use zksync::web3::signing::keccak256;
 use zksync_types::H256;
 
-use crate::all::AllWeighted;
+use crate::{all::AllWeighted, sdk::web3::signing::keccak256};
 
 // SmallRng seed type is [u8; 32].
 const SEED_SIZE: usize = 32;

sdk/zksync-rs/src/ethereum/mod.rs → core/tests/loadnext/src/sdk/ethereum/mod.rs

@@ -24,7 +24,7 @@ use zksync_types::{
 };
 use zksync_web3_decl::namespaces::{EthNamespaceClient, ZksNamespaceClient};
 
-use crate::{
+use crate::sdk::{
     error::ClientError,
     operations::SyncTransactionHandle,
     utils::{is_token_eth, load_contract},
@@ -309,7 +309,6 @@ impl<S: EthereumSigner> EthereumProvider<S> {
         Ok(transaction_hash)
     }
 
-    #[cfg(feature = "mint")]
     pub async fn mint_erc20(
         &self,
         token_address: Address,

sdk/zksync-rs/src/lib.rs → core/tests/loadnext/src/sdk/mod.rs

@@ -5,7 +5,7 @@ pub use zksync_web3_decl::{
     types,
 };
 
-pub use crate::{ethereum::EthereumProvider, wallet::Wallet};
+pub use crate::sdk::{ethereum::EthereumProvider, wallet::Wallet};
 
 pub mod error;
 pub mod ethereum;

sdk/zksync-rs/src/operations/deploy_contract.rs → core/tests/loadnext/src/sdk/operations/deploy_contract.rs

@@ -4,7 +4,7 @@ use zksync_types::{
 };
 use zksync_utils::bytecode::hash_bytecode;
 
-use crate::{
+use crate::sdk::{
     error::ClientError, operations::SyncTransactionHandle, wallet::Wallet, zksync_types::fee::Fee,
     EthNamespaceClient, ZksNamespaceClient,
 };

sdk/zksync-rs/src/operations/execute_contract.rs → core/tests/loadnext/src/sdk/operations/execute_contract.rs

@@ -3,7 +3,7 @@ use zksync_types::{
     fee::Fee, l2::L2Tx, transaction_request::PaymasterParams, Address, Nonce, U256,
 };
 
-use crate::{
+use crate::sdk::{
     error::ClientError, operations::SyncTransactionHandle, wallet::Wallet, EthNamespaceClient,
     ZksNamespaceClient,
 };

sdk/zksync-rs/src/operations/mod.rs → core/tests/loadnext/src/sdk/operations/mod.rs

@@ -4,8 +4,7 @@ use std::time::{Duration, Instant};
 
 use zksync_types::{
     api::{BlockNumber, TransactionReceipt},
-    l2::L2Tx,
-    Bytes, L2ChainId, H256,
+    H256,
 };
 
 pub use self::{
@@ -14,21 +13,13 @@ pub use self::{
     transfer::{create_transfer_calldata, TransferBuilder},
     withdraw::WithdrawBuilder,
 };
-use crate::{error::ClientError, EthNamespaceClient};
+use crate::sdk::{error::ClientError, EthNamespaceClient};
 
 mod deploy_contract;
 mod execute_contract;
 mod transfer;
 mod withdraw;
 
-/// Encodes transaction into a bytes sequence in accordance
-/// with the zkSync L2 protocol contract.
-///
-/// Used for estimating fees and submitting transactions.
-pub fn encode_transaction(tx: &L2Tx, chain_id: L2ChainId) -> Result<Bytes, ClientError> {
-    Ok(tx.get_rlp_bytes(chain_id))
-}
-
 /// Handle for transaction, providing an interface to control its execution.
 /// For obtained handle it's possible to set the polling interval, commit timeout
 /// and verify timeout values.

sdk/zksync-rs/src/operations/transfer.rs → core/tests/loadnext/src/sdk/operations/transfer.rs

@@ -1,7 +1,7 @@
 use zksync_eth_signer::EthereumSigner;
 use zksync_types::{fee::Fee, l2::L2Tx, Address, Nonce, L2_ETH_TOKEN_ADDRESS, U256};
 
-use crate::{
+use crate::sdk::{
     error::ClientError,
     ethereum::ierc20_contract,
     operations::SyncTransactionHandle,

sdk/zksync-rs/src/operations/withdraw.rs → core/tests/loadnext/src/sdk/operations/withdraw.rs

@@ -4,7 +4,7 @@ use zksync_types::{
     web3::ethabi, Address, Nonce, L2_ETH_TOKEN_ADDRESS, U256,
 };
 
-use crate::{
+use crate::sdk::{
     error::ClientError,
     operations::{ExecuteContractBuilder, SyncTransactionHandle},
     wallet::Wallet,

sdk/zksync-rs/src/signer.rs → core/tests/loadnext/src/sdk/signer.rs

@@ -6,7 +6,7 @@ use zksync_types::{
     Nonce, PackedEthSignature, L2_ETH_TOKEN_ADDRESS, U256,
 };
 
-use crate::{operations::create_transfer_calldata, types::TransactionRequest};
+use crate::sdk::{operations::create_transfer_calldata, types::TransactionRequest};
 
 fn signing_failed_error(err: impl ToString) -> SignerError {
     SignerError::SigningFailed(err.to_string())