Merge remote-tracking branch 'origin/main' into generic-mpt-extraction

Author: silathdiir

devenv.nix

@@ -55,7 +55,13 @@ in
     }];
   };
 
-  scripts.db.exec = "psql storage -h localhost -p ${builtins.toString config.env.PGPORT}";
+  scripts = {
+    # Open a shell to the DB
+    db.exec = "psql storage -h localhost -p ${builtins.toString config.env.PGPORT}";
+
+    # Wipe out the database
+    reset-db.exec = "rm -rf ${config.env.DEVENV_STATE}/postgres";
+  };
 
   # https://devenv.sh/languages/
   languages.rust = {

mp2-v1/Cargo.toml

@@ -23,10 +23,15 @@ serde.workspace = true
 mp2_common = { path = "../mp2-common" }
 recursion_framework = { path = "../recursion-framework" }
 ryhope = { path = "../ryhope" }
+parsil = { path = "../parsil" }
 verifiable-db = { path = "../verifiable-db" }
 derive_more = "0.99.18"
 hex.workspace = true
 serde_json.workspace = true
+bb8 = "0.8.5"
+bb8-postgres = "0.8.1"
+tokio-postgres = "0.7.12"
+futures = "0.3.30"
 
 [dev-dependencies]
 alloy.workspace = true

mp2-v1/src/lib.rs

@@ -1,10 +1,12 @@
 //! Circuits for v1 of Lagrange Proof Network (LPN)
-
+#![allow(incomplete_features)]
 // Add this to allow generic const expressions, e.g. `PAD_LEN(NODE_LEN)`.
 #![feature(generic_const_exprs)]
 // Add this so we don't need to always specify const generic in generic
 // parameters (i.e. use "_")
 #![feature(generic_arg_infer)]
+// stylistic feature
+#![feature(async_closure)]
 use mp2_common::mpt_sequential::PAD_LEN;
 
 pub const MAX_BRANCH_NODE_LEN: usize = 532;
@@ -21,6 +23,7 @@ pub mod contract_extraction;
 pub mod final_extraction;
 pub mod indexing;
 pub mod length_extraction;
+pub mod query;
 pub mod values_extraction;
 
 #[cfg(test)]

mp2-v1/src/query/mod.rs

@@ -0,0 +1 @@
+pub mod planner;