daod: moved contracts to /contract

bin/dao/daod/src/dao_contract/exec/validate.rs → bin/dao/daod/src/contract/dao_contract/exec/validate.rs

@@ -13,10 +13,8 @@ use darkfi::{
 use std::any::{Any, TypeId};
 
 use crate::{
-    dao_contract,
-    dao_contract::CONTRACT_ID,
+    contract::{dao_contract, dao_contract::CONTRACT_ID, money_contract},
     demo::{CallDataBase, HashableBase, StateRegistry, Transaction, UpdateBase},
-    money_contract,
 };
 
 type Result<T> = std::result::Result<T, Error>;

bin/dao/daod/src/dao_contract/exec/wallet.rs → bin/dao/daod/src/contract/dao_contract/exec/wallet.rs

@@ -14,7 +14,7 @@ use darkfi::{
 };
 
 use crate::{
-    dao_contract::{
+    contract::dao_contract::{
         exec::validate::CallData, mint::wallet::DaoParams, propose::wallet::Proposal, CONTRACT_ID,
     },
     demo::{FuncCall, ZkContractInfo, ZkContractTable},

bin/dao/daod/src/dao_contract/mint/validate.rs → bin/dao/daod/src/contract/dao_contract/mint/validate.rs

@@ -6,7 +6,7 @@ use darkfi::{
 };
 
 use crate::{
-    dao_contract::{DaoBulla, State, CONTRACT_ID},
+    contract::dao_contract::{DaoBulla, State, CONTRACT_ID},
     demo::{CallDataBase, StateRegistry, Transaction, UpdateBase},
 };
 

bin/dao/daod/src/dao_contract/mint/wallet.rs → bin/dao/daod/src/contract/dao_contract/mint/wallet.rs

@@ -1,5 +1,3 @@
-use crate::dao_contract::state::DaoBulla;
-
 use darkfi::{
     crypto::{
         keypair::{PublicKey, SecretKey},
@@ -13,7 +11,7 @@ use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
 use rand::rngs::OsRng;
 
 use crate::{
-    dao_contract::{mint::validate::CallData, CONTRACT_ID},
+    contract::dao_contract::{mint::validate::CallData, state::DaoBulla, CONTRACT_ID},
     demo::{FuncCall, ZkContractInfo, ZkContractTable},
 };
 

bin/dao/daod/src/dao_contract/propose/validate.rs → bin/dao/daod/src/contract/dao_contract/propose/validate.rs

@@ -12,11 +12,11 @@ use pasta_curves::{
 use std::any::{Any, TypeId};
 
 use crate::{
-    dao_contract,
-    dao_contract::State as DaoState,
+    contract::{
+        dao_contract, dao_contract::State as DaoState, money_contract,
+        money_contract::state::State as MoneyState,
+    },
     demo::{CallDataBase, StateRegistry, Transaction, UpdateBase},
-    money_contract,
-    money_contract::state::State as MoneyState,
     note::EncryptedNote2,
 };
 

bin/dao/daod/src/dao_contract/propose/wallet.rs → bin/dao/daod/src/contract/dao_contract/propose/wallet.rs

@@ -19,13 +19,16 @@ use darkfi::{
 };
 
 use crate::{
-    dao_contract::{
-        mint::wallet::DaoParams,
-        propose::validate::{CallData, Header, Input},
-        CONTRACT_ID,
+    contract::{
+        dao_contract::{
+            mint::wallet::DaoParams,
+            propose::validate::{CallData, Header, Input},
+            CONTRACT_ID,
+        },
+        money_contract,
     },
     demo::{FuncCall, ZkContractInfo, ZkContractTable},
-    money_contract, note,
+    note,
 };
 
 #[derive(SerialEncodable, SerialDecodable)]

bin/dao/daod/src/dao_contract/vote/validate.rs → bin/dao/daod/src/contract/dao_contract/vote/validate.rs

@@ -14,11 +14,11 @@ use pasta_curves::{
 use std::any::{Any, TypeId};
 
 use crate::{
-    dao_contract,
-    dao_contract::State as DaoState,
+    contract::{
+        dao_contract, dao_contract::State as DaoState, money_contract,
+        money_contract::state::State as MoneyState,
+    },
     demo::{CallDataBase, StateRegistry, Transaction, UpdateBase},
-    money_contract,
-    money_contract::state::State as MoneyState,
     note::EncryptedNote2,
 };
 

bin/dao/daod/src/dao_contract/vote/wallet.rs → bin/dao/daod/src/contract/dao_contract/vote/wallet.rs

@@ -19,14 +19,17 @@ use pasta_curves::{
 use rand::rngs::OsRng;
 
 use crate::{
-    dao_contract::{
-        mint::wallet::DaoParams,
-        propose::wallet::Proposal,
-        vote::validate::{CallData, Header, Input},
-        CONTRACT_ID,
+    contract::{
+        dao_contract::{
+            mint::wallet::DaoParams,
+            propose::wallet::Proposal,
+            vote::validate::{CallData, Header, Input},
+            CONTRACT_ID,
+        },
+        money_contract,
     },
     demo::{FuncCall, ZkContractInfo, ZkContractTable},
-    money_contract, note,
+    note,
 };
 
 use log::debug;

bin/dao/daod/src/example_contract/foo/validate.rs → bin/dao/daod/src/contract/example_contract/foo/validate.rs

@@ -9,8 +9,8 @@ use darkfi::{
 use std::any::{Any, TypeId};
 
 use crate::{
+    contract::example_contract::{state::State, CONTRACT_ID},
     demo::{CallDataBase, StateRegistry, Transaction, UpdateBase},
-    example_contract::{state::State, CONTRACT_ID},
 };
 
 type Result<T> = std::result::Result<T, Error>;

bin/dao/daod/src/example_contract/foo/wallet.rs → bin/dao/daod/src/contract/example_contract/foo/wallet.rs

@@ -13,8 +13,8 @@ use darkfi::{
 };
 
 use crate::{
+    contract::example_contract::{foo::validate::CallData, CONTRACT_ID},
     demo::{FuncCall, ZkContractInfo, ZkContractTable},
-    example_contract::{foo::validate::CallData, CONTRACT_ID},
 };
 
 pub struct Foo {

bin/dao/daod/src/contract/mod.rs

@@ -0,0 +1,3 @@
+pub mod dao_contract;
+pub mod example_contract;
+pub mod money_contract;

bin/dao/daod/src/money_contract/transfer/validate.rs → bin/dao/daod/src/contract/money_contract/transfer/validate.rs

@@ -20,9 +20,11 @@ use darkfi::{
 };
 
 use crate::{
-    dao_contract,
+    contract::{
+        dao_contract,
+        money_contract::{state::State, CONTRACT_ID},
+    },
     demo::{CallDataBase, StateRegistry, Transaction, UpdateBase},
-    money_contract::{state::State, CONTRACT_ID},
     note::EncryptedNote2,
 };
 

bin/dao/daod/src/money_contract/transfer/wallet.rs → bin/dao/daod/src/contract/money_contract/transfer/wallet.rs

@@ -17,11 +17,11 @@ use darkfi::{
 };
 
 use crate::{
-    demo::{FuncCall, ZkContractInfo, ZkContractTable},
-    money_contract::{
+    contract::money_contract::{
         transfer::validate::{CallData, ClearInput, Input, Output},
         CONTRACT_ID,
     },
+    demo::{FuncCall, ZkContractInfo, ZkContractTable},
     note,
 };
 

bin/dao/daod/src/demo.rs

@@ -34,7 +34,7 @@ use darkfi::{
     zkas::decoder::ZkBinary,
 };
 
-use crate::{dao_contract, example_contract, money_contract};
+use crate::contract::{dao_contract, example_contract, money_contract};
 
 // TODO: Anonymity leaks in this proof of concept:
 //

bin/dao/daod/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod contract;
+pub mod demo;
+pub mod note;
+pub mod rpc;

bin/dao/daod/src/main.rs

@@ -3,18 +3,15 @@ use std::sync::Arc;
 use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 use url::Url;
 
+use daod::contract::{dao_contract, example_contract, money_contract};
 use darkfi::{rpc::server::listen_and_serve, Result};
 
-mod dao_contract;
-mod example_contract;
-mod money_contract;
-mod rpc;
-
-mod demo;
+//mod demo;
 mod note;
 
-use crate::rpc::JsonRpcInterface;
-// use crate::demo::demo;
+extern crate daod;
+
+use daod::rpc::JsonRpcInterface;
 
 async fn start() -> Result<()> {
     let rpc_addr = Url::parse("tcp://127.0.0.1:7777")?;
@@ -34,6 +31,6 @@ async fn main() -> Result<()> {
     )?;
 
     start().await?;
-    // demo().await.unwrap();
+    //demo().await.unwrap();
     Ok(())
 }