Support l1 -> l2 transactions

Author: AntonD3

core/bin/zksync_server/src/main.rs

@@ -44,7 +44,7 @@ struct Cli {
     /// Comma-separated list of components to launch.
     #[arg(
         long,
-        default_value = "api,state_keeper"
+        default_value = "api,eth,state_keeper"
     )]
     components: ComponentsToRun,
     /// Path to the yaml config. If set, it will be used instead of env vars.

core/lib/mempool/src/mempool_store.rs

@@ -154,8 +154,16 @@ impl MempoolStore {
     pub fn next_transaction(
         &mut self,
         filter: &L2TxFilter,
-    ) -> Option<(Transaction, TransactionTimeRangeConstraint)> {        // todo: ignore prio txs for now
-        // todo: priority transactions
+    ) -> Option<(Transaction, TransactionTimeRangeConstraint)> {
+        if let Some(transaction) = self.l1_transactions.remove(&self.next_priority_id) {
+            self.next_priority_id += 1;
+            // L1 transactions can't use block.timestamp in AA and hence do not need to have a constraint
+            return Some((
+                transaction.into(),
+                TransactionTimeRangeConstraint::default(),
+            ));
+        }
+
         let mut removed = 0;
         // We want to fetch the next transaction that would match the fee requirements.
         let tx_pointer = self

core/node/node_framework/src/implementations/layers/eth_watch.rs

@@ -59,6 +59,7 @@ impl WiringLayer for EthWatchLayer {
         let main_pool = input.master_pool.get().await?;
         let client = input.eth_client.0;
 
+        println!("{:?}", self.contracts_config);
         let eth_client = EthHttpQueryClient::new(
             client,
             self.contracts_config.diamond_proxy_addr,

core/node/zkos_vm_runner/src/zkos_conversions.rs

@@ -92,8 +92,6 @@ impl From<Transaction> for TransactionData {
                     U256::zero()
                 };
 
-                // todo: second `reserved` value should be non-zero for deployment tx
-
                 // Ethereum transactions do not sign gas per pubdata limit, and so for them we need to use
                 // some default value. We use the maximum possible value that is allowed by the bootloader
                 // (i.e. we can not use u64::MAX, because the bootloader requires gas per pubdata for such
@@ -137,8 +135,32 @@ impl From<Transaction> for TransactionData {
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
                 }
             }
-            ExecuteTransactionCommon::L1(_) => {
-                unimplemented!("l1 transactions are not supported for zk os")
+            ExecuteTransactionCommon::L1(common_data) => {
+                // TODO: cleanup - double check gas fields, and sender, use constant for tx type
+                TransactionData {
+                    tx_type: 255,
+                    from: common_data.sender,
+                    to: execute_tx.execute.contract_address,
+                    gas_limit: common_data.gas_limit,
+                    pubdata_price_limit: common_data.gas_per_pubdata_limit,
+                    max_fee_per_gas: common_data.max_fee_per_gas,
+                    max_priority_fee_per_gas: U256::zero(),
+                    paymaster: Address::zero(),
+                    nonce: U256::zero(),
+                    value: execute_tx.execute.value,
+                    reserved: [
+                        common_data.to_mint,
+                        U256::from_big_endian(common_data.refund_recipient.as_bytes()),
+                        U256::zero(),
+                        U256::zero(),
+                    ],
+                    data: execute_tx.execute.calldata,
+                    signature: vec![],
+                    factory_deps: execute_tx.execute.factory_deps,
+                    paymaster_input: vec![],
+                    reserved_dynamic: vec![],
+                    raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
+                }
             }
             ExecuteTransactionCommon::ProtocolUpgrade(_) => {
                 unreachable!()