move daod and dao-cli to dao folder, and rename dao-cli to dao

2026-01-07 22:04:03 -05:00 · 2022-09-07 02:39:36 +03:00
parent 4e4ae9914e
commit d4c3b2f5e5
50 changed files with 9 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 /tmp/*

 /cashierd
-/dao-cli
+/dao
 /daod
 /darkfid
 /darkotc
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1114,7 +1114,7 @@ dependencies = [
 ]

 [[package]]
-name = "dao-cli"
+name = "dao"
 version = "0.3.0"
 dependencies = [
 "async-channel",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,8 +29,8 @@ members = [
 	"bin/ircd",
 	#"bin/irc-raft",
 	"bin/dnetview",
-	"bin/daod",
-	"bin/dao-cli",
+	"bin/dao/daod",
+	"bin/dao/dao-cli",
 	"bin/tau/taud",
 	"bin/tau/tau-cli",
 	"bin/vanityaddr",
--- a/2
+++ b/2
@@ -23,7 +23,7 @@ BINDEPS = \

 # ZK proofs to compile with zkas
 PROOFS = \
-	$(shell find bin/daod/proof -type f -name '*.zk') \
+	$(shell find bin/dao/daod/proof -type f -name '*.zk') \
 	$(shell find proof -type f -name '*.zk') \
 	example/simple.zk

--- a/bin/dao/README.md
+++ b/bin/dao/README.md
@@ -0,0 +1 @@
+# DAO
--- a/bin/dao/dao-cli/Cargo.toml
+++ b/bin/dao/dao-cli/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "dao-cli"
+name = "dao"
 version = "0.3.0"
 edition = "2021"

 [dependencies.darkfi]
-path = "../../"
+path = "../../../"
 features = ["rpc"]

 [dependencies]
--- a/bin/dao/dao-cli/src/main.rs
+++ b/bin/dao/dao-cli/src/main.rs
--- a/bin/dao/dao-cli/src/rpc.rs
+++ b/bin/dao/dao-cli/src/rpc.rs
--- a/bin/dao/dao_config.toml
+++ b/bin/dao/dao_config.toml
--- a/bin/dao/daod/Cargo.toml
+++ b/bin/dao/daod/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.3.0"
 edition = "2021"

 [dependencies.darkfi]
-path = "../../"
+path = "../../../"
 features = ["rpc", "crypto", "tx", "node"]

 [dependencies]
--- a/bin/dao/daod/Makefile
+++ b/bin/dao/daod/Makefile
--- a/bin/dao/daod/demo/classnamespace.py
+++ b/bin/dao/daod/demo/classnamespace.py
--- a/bin/dao/daod/demo/crypto.py
+++ b/bin/dao/daod/demo/crypto.py
--- a/bin/dao/daod/demo/main.py
+++ b/bin/dao/daod/demo/main.py
--- a/bin/dao/daod/demo/money.py
+++ b/bin/dao/daod/demo/money.py
--- a/bin/dao/daod/proof/dao-exec.zk
+++ b/bin/dao/daod/proof/dao-exec.zk
--- a/bin/dao/daod/proof/dao-mint.zk
+++ b/bin/dao/daod/proof/dao-mint.zk
--- a/bin/dao/daod/proof/dao-propose-burn.zk
+++ b/bin/dao/daod/proof/dao-propose-burn.zk
--- a/bin/dao/daod/proof/dao-propose-main.zk
+++ b/bin/dao/daod/proof/dao-propose-main.zk
--- a/bin/dao/daod/proof/dao-vote-burn.zk
+++ b/bin/dao/daod/proof/dao-vote-burn.zk
--- a/bin/dao/daod/proof/dao-vote-main.zk
+++ b/bin/dao/daod/proof/dao-vote-main.zk
--- a/bin/dao/daod/proof/foo.zk
+++ b/bin/dao/daod/proof/foo.zk
--- a/bin/dao/daod/src/dao_contract/exec/mod.rs
+++ b/bin/dao/daod/src/dao_contract/exec/mod.rs
--- a/bin/dao/daod/src/dao_contract/exec/validate.rs
+++ b/bin/dao/daod/src/dao_contract/exec/validate.rs
--- a/bin/dao/daod/src/dao_contract/exec/wallet.rs
+++ b/bin/dao/daod/src/dao_contract/exec/wallet.rs
--- a/bin/dao/daod/src/dao_contract/mint/mod.rs
+++ b/bin/dao/daod/src/dao_contract/mint/mod.rs
--- a/bin/dao/daod/src/dao_contract/mint/validate.rs
+++ b/bin/dao/daod/src/dao_contract/mint/validate.rs
--- a/bin/dao/daod/src/dao_contract/mint/wallet.rs
+++ b/bin/dao/daod/src/dao_contract/mint/wallet.rs
--- a/bin/dao/daod/src/dao_contract/mod.rs
+++ b/bin/dao/daod/src/dao_contract/mod.rs
--- a/bin/dao/daod/src/dao_contract/propose/mod.rs
+++ b/bin/dao/daod/src/dao_contract/propose/mod.rs
--- a/bin/dao/daod/src/dao_contract/propose/validate.rs
+++ b/bin/dao/daod/src/dao_contract/propose/validate.rs
--- a/bin/dao/daod/src/dao_contract/propose/wallet.rs
+++ b/bin/dao/daod/src/dao_contract/propose/wallet.rs
--- a/bin/dao/daod/src/dao_contract/state.rs
+++ b/bin/dao/daod/src/dao_contract/state.rs
--- a/bin/dao/daod/src/dao_contract/vote/mod.rs
+++ b/bin/dao/daod/src/dao_contract/vote/mod.rs
--- a/bin/dao/daod/src/dao_contract/vote/validate.rs
+++ b/bin/dao/daod/src/dao_contract/vote/validate.rs
--- a/bin/dao/daod/src/dao_contract/vote/wallet.rs
+++ b/bin/dao/daod/src/dao_contract/vote/wallet.rs
--- a/bin/dao/daod/src/demo.rs
+++ b/bin/dao/daod/src/demo.rs
--- a/bin/dao/daod/src/example_contract/foo/mod.rs
+++ b/bin/dao/daod/src/example_contract/foo/mod.rs
--- a/bin/dao/daod/src/example_contract/foo/validate.rs
+++ b/bin/dao/daod/src/example_contract/foo/validate.rs
--- a/bin/dao/daod/src/example_contract/foo/wallet.rs
+++ b/bin/dao/daod/src/example_contract/foo/wallet.rs
--- a/bin/dao/daod/src/example_contract/mod.rs
+++ b/bin/dao/daod/src/example_contract/mod.rs
--- a/bin/dao/daod/src/example_contract/state.rs
+++ b/bin/dao/daod/src/example_contract/state.rs
--- a/bin/dao/daod/src/main.rs
+++ b/bin/dao/daod/src/main.rs
--- a/bin/dao/daod/src/money_contract/mod.rs
+++ b/bin/dao/daod/src/money_contract/mod.rs
--- a/bin/dao/daod/src/money_contract/state.rs
+++ b/bin/dao/daod/src/money_contract/state.rs
--- a/bin/dao/daod/src/money_contract/transfer/mod.rs
+++ b/bin/dao/daod/src/money_contract/transfer/mod.rs
--- a/bin/dao/daod/src/money_contract/transfer/validate.rs
+++ b/bin/dao/daod/src/money_contract/transfer/validate.rs
--- a/bin/dao/daod/src/money_contract/transfer/wallet.rs
+++ b/bin/dao/daod/src/money_contract/transfer/wallet.rs
--- a/bin/dao/daod/src/note.rs
+++ b/bin/dao/daod/src/note.rs
--- a/bin/dao/daod/src/rpc.rs
+++ b/bin/dao/daod/src/rpc.rs