all the changes to make aave work

Author: mm-zk

.vscode/launch.json

@@ -27,6 +27,31 @@
             },
             "cwd": "${workspaceFolder}"
         },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug era_test_node at 8545",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=era_test_node",
+                    "--package=era_test_node"
+                ],
+                "filter": {
+                    "name": "era_test_node",
+                    "kind": "bin"
+                }
+            },
+            "args": [
+                "--port",
+                "8545",
+                "run",
+            ],
+            "env": {
+                "CARGO_PROFILE_DEV": "true"
+            },
+            "cwd": "${workspaceFolder}"
+        },
         {
             "type": "lldb",
             "request": "launch",

Cargo.lock

@@ -109,3 +109,24 @@ Simulate works now, but still the gas estimate doesn't properly handle the cost
 
 Cleaned up the diff - so now we have nice interface.
 The main issue currently is with the tracers - as they require a different 'flow' for old VM vs new.
+
+
+## AAve issues
+
+[TODO]- 'call' to deployment should return the bytecode.
+
+
+
+Issues found:
+* EIP161 - nonce for create should start with '1'
+* should increase nonce on Create2 too.
+* issues with bad 'frame' rollbacks on preimages (when we failed in constructor)
+* out of gas - had to add -g 400 to increase the multiplier
+* bad ordering - had to add '--slow' to make it run one-by-one
+* delegateStatic issue - when 'static' method was doing delegation call (we read from wrong place).
+* not closing frame - causing error
+
+
+
+
+call methods creating a 'deadlock' in era test node.

WORK.md

@@ -9,13 +9,13 @@ pub const DEFAULT_FAIR_PUBDATA_PRICE: u64 = 13_607_659_111;
 /// Scale factor for estimating L1 gas prices
 pub const DEFAULT_ESTIMATE_GAS_PRICE_SCALE_FACTOR: f64 = 2.0;
 /// Scale factor for estimating gas limits
-pub const DEFAULT_ESTIMATE_GAS_SCALE_FACTOR: f32 = 1.3;
+pub const DEFAULT_ESTIMATE_GAS_SCALE_FACTOR: f32 = 5.3;
 /// Default port for the test node server
 pub const NODE_PORT: u16 = 8011;
 /// Network ID for the test node
 #[cfg(feature = "zkos")]
 // For ZK os - hardcoded to 37 for now.
-pub const TEST_NODE_NETWORK_ID: u32 = 37;
+pub const TEST_NODE_NETWORK_ID: u32 = 31337;
 #[cfg(not(feature = "zkos"))]
 pub const TEST_NODE_NETWORK_ID: u32 = 260;
 /// Default derivation path for the test node

src/config/constants.rs

@@ -844,6 +844,7 @@ pub fn print_transaction_summary(
 
     tracing::info!("{}  [{}] Hash: {:?}", emoji, status, tx.hash());
     tracing::info!("Initiator: {:?}", tx.initiator_account());
+    tracing::info!("Nonce: {:?}", tx.nonce());
     tracing::info!("Payer: {:?}", tx.payer());
     tracing::info!(
         "Gas Limit: {} | Used: {} | Refunded: {}",

src/formatter.rs

@@ -276,6 +276,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
         block_number: BlockNumber,
         full_transactions: bool,
     ) -> RpcResult<Option<Block<TransactionVariant>>> {
+        tracing::warn!("get_block_by_number: {:?}", block_number);
         let inner = self.get_inner().clone();
 
         Box::pin(async move {
@@ -314,7 +315,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
                     })
             };
 
-            match maybe_block {
+            let res = match maybe_block {
                 Some(mut block) => {
                     let block_hash = block.hash;
                     block.transactions = block
@@ -344,7 +345,9 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
                     Ok(Some(block))
                 }
                 None => Ok(None),
-            }
+            };
+            //tracing::warn!("get_block_by_number: {:?}", res);
+            res
         })
     }
 
@@ -412,15 +415,17 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
             #[cfg(feature = "zkos")]
             let nonce_key = super::zkos::zkos_get_nonce_key(&address);
 
-            match inner.write() {
+            let res = match inner.write() {
                 Ok(guard) => match guard.fork_storage.read_value_internal(&nonce_key) {
                     Ok(result) => Ok(h256_to_u64(result).into()),
                     Err(error) => Err(report_into_jsrpc_error(error)),
                 },
                 Err(_) => Err(into_jsrpc_error(Web3Error::InternalError(
                     anyhow::Error::msg("Failed to acquire write lock for nonce retrieval"),
                 ))),
-            }
+            };
+            tracing::warn!("get_transaction_count: {:?}", res);
+            res
         })
     }
 
@@ -455,6 +460,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
                 .tx_results
                 .get(&hash)
                 .map(|info| info.receipt.clone());
+            tracing::warn!("get_transaction_receipt for {:?}: {:?}", hash, receipt);
             Ok(receipt)
         })
     }
@@ -489,6 +495,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone + Send + Sync + 'static> EthNamespa
         hash: zksync_types::H256,
         full_transactions: bool,
     ) -> RpcResult<Option<Block<TransactionVariant>>> {
+        tracing::warn!("get_block_by_hash: {:?}", hash);
         let inner = self.get_inner().clone();
 
         Box::pin(async move {

src/node/eth.rs

@@ -1277,7 +1277,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone> InMemoryNode<S> {
 
         // init vm
 
-        let (batch_env, _) = inner.create_l1_batch_env(&self.time, storage.clone());
+        //let (batch_env, _) = inner.create_l1_batch_env(&self.time, storage.clone());
         let system_env = inner.create_system_env(base_contracts, execution_mode);
 
         #[cfg(not(feature = "zkos"))]
@@ -1571,7 +1571,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone> InMemoryNode<S> {
         Ok(TxExecutionOutput {
             result: tx_result.clone(),
             call_traces: call_traces.cloned().unwrap_or_default(),
-            bytecodes: tx_result.new_known_factory_deps.unwrap().clone(),
+            bytecodes: tx_result.new_known_factory_deps.unwrap_or_default().clone(),
         })
     }
 
@@ -1748,6 +1748,7 @@ impl<S: ForkSource + std::fmt::Debug + Clone> InMemoryNode<S> {
 
         // Execute transactions and bootloader
         let mut executed_tx_hashes = Vec::with_capacity(tx_hashes.len());
+        tracing::error!("==== Starting seal block ==== {:?}", block_ctx);
         for tx in txs {
             // Executing a next transaction means that a previous transaction was either rolled back (in which case its snapshot
             // was already removed), or that we build on top of it (in which case, it can be removed now).
@@ -1762,7 +1763,9 @@ impl<S: ForkSource + std::fmt::Debug + Clone> InMemoryNode<S> {
                 executed_tx_hashes.push(hash);
             }
         }
+        tracing::error!("==== Finished seal block ====");
         vm.execute(InspectExecutionMode::Bootloader);
+        tracing::error!("==== Finished running bootloader mode ====");
 
         // Write all the mutated keys (storage slots).
         let mut inner = self

src/node/in_memory.rs

@@ -1,18 +1,19 @@
-use std::{alloc::Global, collections::HashMap};
+use std::{alloc::Global, collections::HashMap, vec};
 
 use basic_system::basic_system::simple_growable_storage::TestingTree;
 use forward_system::run::{
     test_impl::{InMemoryPreimageSource, InMemoryTree, TxListSource},
     PreimageType, StorageCommitment,
 };
+use hex::ToHex;
 use ruint::aliases::B160;
 use system_hooks::addresses_constants::{
     NOMINAL_TOKEN_BALANCE_STORAGE_ADDRESS, NONCE_HOLDER_HOOK_ADDRESS,
 };
 use zk_ee::{common_structs::derive_flat_storage_key, utils::Bytes32};
 use zksync_multivm::interface::{
     storage::{StoragePtr, WriteStorage},
-    ExecutionResult, PushTransactionResult, TxExecutionMode, VmExecutionLogs,
+    ExecutionResult, InspectExecutionMode, PushTransactionResult, TxExecutionMode, VmExecutionLogs,
     VmExecutionResultAndLogs, VmInterface, VmInterfaceHistoryEnabled, VmRevertReason,
 };
 use zksync_types::{
@@ -347,9 +348,11 @@ pub fn execute_tx_in_zkos<W: WriteStorage>(
                 forward_system::run::ExecutionResult::Success(output) => match &output {
                     forward_system::run::ExecutionOutput::Call(data) => data,
                     forward_system::run::ExecutionOutput::Create(data, address) => {
-                        dbg!(address);
                         // TODO - pass it to the output somehow.
-                        println!("Deployed to {:?}", address);
+                        println!(
+                            "Deployed to {}",
+                            address.to_be_bytes_vec().encode_hex::<String>()
+                        );
                         data
                     }
                 },
@@ -535,12 +538,23 @@ impl<S: WriteStorage> VmInterface for ZKOsVM<S> {
         dispatcher: &mut Self::TracerDispatcher,
         execution_mode: zksync_multivm::interface::InspectExecutionMode,
     ) -> VmExecutionResultAndLogs {
+        if let InspectExecutionMode::Bootloader = execution_mode {
+            return VmExecutionResultAndLogs {
+                result: ExecutionResult::Success { output: vec![] },
+                logs: Default::default(),
+                statistics: Default::default(),
+                refunds: Default::default(),
+                new_known_factory_deps: Default::default(),
+            };
+        }
         let simulate_only = match self.execution_mode {
             TxExecutionMode::VerifyExecute => false,
             TxExecutionMode::EstimateFee => true,
             TxExecutionMode::EthCall => true,
         };
 
+        assert_eq!(1, self.transactions.len());
+
         // FIXME.
         let tx = self.transactions[0].clone();
         execute_tx_in_zkos(