impl: prover, reimpl Withdrawals DB, fix and update crates

Author: berzanorg

Cargo.lock

@@ -9,17 +9,20 @@ members = [
     "executor",
     "liquidities-db",
     "mempool",
-    "merkle-tree",
+    "static-merkle-tree",
+    "dynamic-merkle-tree",
     "pools-db",
     "poseidon-hash",
     "processes",
     "proofpool",
     "rpc-server",
+    "prover",
     "rollup",
     "transactions-db",
     "withdrawals-db",
     "schnorr-signature",
-    "proofs-db", "prover-method",
+    "proofs-db",
+    "macros",
 ]
 
 [workspace.dependencies]
@@ -42,18 +45,21 @@ o1-utils = { git = "https://github.com/o1-labs/proof-systems", branch = "master"
 # Local dependencies.
 nacho-balances-db.path = "balances-db"
 nacho-burns-db.path = "burns-db"
+nacho-macros.path = "macros"
+nacho-static-merkle-tree.path = "static-merkle-tree"
 nacho-data-structures.path = "data-structures"
 nacho-dynamic-queue.path = "dynamic-queue"
 nacho-liquidities-db.path = "liquidities-db"
 nacho-dynamic-list.path = "dynamic-list"
 nacho-executor.path = "executor"
 nacho-mempool.path = "mempool"
-nacho-merkle-tree.path = "merkle-tree"
+nacho-dynamic-merkle-tree.path = "dynamic-merkle-tree"
 nacho-pools-db.path = "pools-db"
 nacho-poseidon-hash.path = "poseidon-hash"
 nacho-processes.path = "processes"
 nacho-proofpool.path = "proofpool"
 nacho-proofs-db.path = "proofs-db"
+nacho-prover.path = "prover"
 nacho-rpc-server.path = "rpc-server"
 nacho-schnorr-signature.path = "schnorr-signature"
 nacho-withdrawals-db.path = "withdrawals-db"

Cargo.toml

@@ -346,7 +346,7 @@ mod tests {
                 .unwrap()
         );
 
-        let balance = Burn {
+        let burn = Burn {
             burner: Address::from_bytes(
                 "B62qiiGxLsqNemiKFKiD19JdTHmqbE5YKAkMuXGachSdYkTi8xR2dfY"
                     .as_bytes()
@@ -357,8 +357,8 @@ mod tests {
             token_amount: 250,
         };
 
-        burns_db.push(&balance).await.unwrap();
-        burns_db.push_leaf(&balance).await.unwrap();
+        burns_db.push(&burn).await.unwrap();
+        burns_db.push_leaf(&burn).await.unwrap();
 
         let root = burns_db.get_root().await.unwrap();
 
@@ -371,7 +371,7 @@ mod tests {
 
         let updated_burn = Burn {
             token_amount: 300,
-            ..balance
+            ..burn
         };
 
         burns_db.update(&updated_burn).await.unwrap();

burns-db/src/burns_db.rs

@@ -10,9 +10,9 @@ use crate::{Address, ByteConversion, Field, FieldConversion, U256};
 ///
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Withdrawal {
-    withdrawer: Address,
-    token_id: U256,
-    token_amount: u64,
+    pub withdrawer: Address,
+    pub token_id: U256,
+    pub token_amount: u64,
 }
 
 impl FieldConversion<4> for Withdrawal {

data-structures/src/withdrawal.rs

@@ -0,0 +1,22 @@
+use nacho_data_structures::{Address, Balance, U256};
+
+use crate::Result;
+
+pub fn deposit_tokens(
+    maybe_balance: Option<&mut Balance>,
+    amount_to_deposit: u64,
+    token_id: U256,
+    user_address: Address,
+) -> Result<Option<Balance>> {
+    match maybe_balance {
+        Some(balance) => {
+            balance.token_amount += amount_to_deposit;
+            Ok(None)
+        }
+        None => Ok(Some(Balance {
+            owner: user_address,
+            token_id: token_id,
+            token_amount: amount_to_deposit,
+        })),
+    }
+}

executor/src/deposit_tokens.rs

@@ -1,6 +1,7 @@
 mod burn_tokens;
 mod buy_tokens;
 mod create_pool;
+mod deposit_tokens;
 mod error;
 mod provide_liqudity;
 mod remove_liquidity;
@@ -9,6 +10,7 @@ mod sell_tokens;
 pub use burn_tokens::burn_tokens;
 pub use buy_tokens::buy_tokens;
 pub use create_pool::create_pool;
+pub use deposit_tokens::deposit_tokens;
 pub use error::ExecutorError;
 pub use provide_liqudity::provide_liquidity;
 pub use remove_liquidity::remove_liquidity;

executor/src/lib.rs

@@ -405,7 +405,7 @@ mod tests {
                 .unwrap()
         );
 
-        let balance = Liquidity {
+        let liquidity = Liquidity {
             provider: Address::from_bytes(
                 "B62qr1H2QvZVSz7jBEyr91LXFvFTLfHB1W2S9TcMrBiZPHnPQ7yGohY"
                     .as_bytes()
@@ -417,8 +417,8 @@ mod tests {
             points: U256([44; 32]),
         };
 
-        liquidities_db.push(&balance).await.unwrap();
-        liquidities_db.push_leaf(&balance).await.unwrap();
+        liquidities_db.push(&liquidity).await.unwrap();
+        liquidities_db.push_leaf(&liquidity).await.unwrap();
 
         let root = liquidities_db.get_root().await.unwrap();
 
@@ -431,7 +431,7 @@ mod tests {
 
         let updated_liquidity = Liquidity {
             points: U256([35; 32]),
-            ..balance
+            ..liquidity
         };
 
         liquidities_db.update(&updated_liquidity).await.unwrap();

liquidities-db/src/liqudities_db.rs

@@ -0,0 +1,8 @@
+[package]
+name = "nacho-macros"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

macros/Cargo.toml

@@ -0,0 +1,26 @@
+/// The macro that calculates the sibling index of the given index in a Merkle tree.
+///
+/// # Examples
+///
+/// Calculate sibling index of seven:
+///
+/// ```rs
+/// let six = calculate_sibling_index!(7);
+/// ```
+///
+/// Calculate sibling index of six:
+///
+/// ```rs
+/// let seven = calculate_sibling_index!(6);
+/// ```
+///
+#[macro_export]
+macro_rules! calculate_sibling_index {
+    ($x:expr) => {{
+        if $x % 2 == 0 {
+            $x + 1
+        } else {
+            $x - 1
+        }
+    }};
+}