diff --git a/.gitignore b/.gitignore index 149cd7488..684c521b2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,11 @@ witness.json /bin/zkas/zkas /zkas -/bin/darkfid2/darkfid2 -/darkfid2 +/bin/darkfid/darkfid +/darkfid + +/bin/minerd/minerd +/minerd /bin/darkfi-mmproxy/darkfi-mmproxy /darkfi-mmproxy diff --git a/Cargo.lock b/Cargo.lock index 650b58234..bdd223102 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4195,6 +4195,27 @@ dependencies = [ "unicase", ] +[[package]] +name = "minerd" +version = "0.4.1" +dependencies = [ + "darkfi", + "darkfi-sdk", + "darkfi-serial", + "easy-parallel", + "log", + "num-bigint", + "serde", + "signal-hook", + "signal-hook-async-std", + "simplelog", + "smol", + "structopt", + "structopt-toml", + "tinyjson", + "url", +] + [[package]] name = "minimal-lexical" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 9e35da2ab..e4208006f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ doctest = false members = [ "bin/zkas", "bin/darkfid", + "bin/minerd", "bin/darkfi-mmproxy", "bin/drk", #"bin/fud/fu", diff --git a/Makefile b/Makefile index 49d4a5a59..1d951c47c 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ PROOFS_BIN = $(PROOFS_SRC:=.bin) BINS = \ zkas \ darkfid \ + minerd \ darkfi-mmproxy \ darkirc \ genev \ @@ -52,6 +53,13 @@ darkfid: contracts RUST_TARGET="$(RUST_TARGET)" \ RUSTFLAGS="$(RUSTFLAGS)" +minerd: + $(MAKE) -C bin/$@ \ + PREFIX="$(PREFIX)" \ + CARGO="$(CARGO)" \ + RUST_TARGET="$(RUST_TARGET)" \ + RUSTFLAGS="$(RUSTFLAGS)" + darkfi-mmproxy: $(MAKE) -C bin/$@ \ PREFIX="$(PREFIX)" \ @@ -150,6 +158,7 @@ clean: $(MAKE) -C src/contract/deployooor clean $(MAKE) -C bin/zkas clean $(MAKE) -C bin/darkfid clean + $(MAKE) -C bin/minerd clean $(MAKE) -C bin/darkfi-mmproxy clean $(MAKE) -C bin/darkirc clean $(MAKE) -C bin/genev/genev-cli clean diff --git a/script/research/minerd/Cargo.toml b/bin/minerd/Cargo.toml similarity index 63% rename from script/research/minerd/Cargo.toml rename to bin/minerd/Cargo.toml index 85cd70919..76502dcff 100644 --- a/script/research/minerd/Cargo.toml +++ b/bin/minerd/Cargo.toml @@ -8,13 +8,11 @@ repository = "https://github.com/darkrenaissance/darkfi" license = "AGPL-3.0-only" edition = "2021" -[workspace] - [dependencies] # Darkfi -darkfi = {path = "../../../", features = ["async-daemonize", "validator"]} -darkfi-sdk = {path = "../../../src/sdk"} -darkfi-serial = {path = "../../../src/serial", features = ["async"]} +darkfi = {path = "../../", features = ["async-daemonize", "validator"]} +darkfi-sdk = {path = "../../src/sdk"} +darkfi-serial = {path = "../../src/serial", features = ["async"]} # Misc log = "0.4.20" @@ -35,7 +33,3 @@ smol = "1.3.0" serde = {version = "1.0.195", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" - -[patch.crates-io] -halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v4"} -halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v4"} diff --git a/bin/minerd/Makefile b/bin/minerd/Makefile new file mode 100644 index 000000000..056287ba8 --- /dev/null +++ b/bin/minerd/Makefile @@ -0,0 +1,35 @@ +.POSIX: + +# Install prefix +PREFIX = $(HOME)/.cargo + +# Cargo binary +CARGO = cargo +nightly + +# Compile target +RUST_TARGET = $(shell rustc -Vv | grep '^host: ' | cut -d' ' -f2) +# Uncomment when doing musl static builds +#RUSTFLAGS = -C target-feature=+crt-static -C link-self-contained=yes + +BIN = $(shell grep '^name = ' Cargo.toml | cut -d' ' -f3 | tr -d '"') + +all: $(BIN) + +$(BIN): + RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) build --target=$(RUST_TARGET) --release --package $@ + cp -f ../../target/$(RUST_TARGET)/release/$@ $@ + cp -f ../../target/$(RUST_TARGET)/release/$@ ../../$@ + +clean: + RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) clean --target=$(RUST_TARGET) --release --package $(BIN) + rm -f $(BIN) ../../$(BIN) + +install: all + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin + chmod 755 $(DESTDIR)$(PREFIX)/bin/$(BIN) + +uninstall: + rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN) + +.PHONY: all clean install uninstall diff --git a/script/research/minerd/minerd.toml b/bin/minerd/minerd.toml similarity index 100% rename from script/research/minerd/minerd.toml rename to bin/minerd/minerd.toml diff --git a/script/research/minerd/src/error.rs b/bin/minerd/src/error.rs similarity index 100% rename from script/research/minerd/src/error.rs rename to bin/minerd/src/error.rs diff --git a/script/research/minerd/src/main.rs b/bin/minerd/src/main.rs similarity index 100% rename from script/research/minerd/src/main.rs rename to bin/minerd/src/main.rs diff --git a/script/research/minerd/src/rpc.rs b/bin/minerd/src/rpc.rs similarity index 100% rename from script/research/minerd/src/rpc.rs rename to bin/minerd/src/rpc.rs diff --git a/script/research/minerd/.gitignore b/script/research/minerd/.gitignore deleted file mode 100644 index 8bc55fd23..000000000 --- a/script/research/minerd/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -Cargo.lock -rustfmt.toml