From 7a3b554e0d16002862fabfcbe781c1ea4d8a9424 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Tue, 15 Oct 2024 16:20:47 +0200
Subject: [PATCH] chore: Use published darkfi-serial crate where applicable

---
 Cargo.lock                           | 17 ++++-------------
 Cargo.toml                           |  8 ++++++--
 bin/darkfi-mmproxy/Cargo.toml        |  3 +--
 bin/darkfid/Cargo.toml               |  3 +--
 bin/darkirc/Cargo.toml               |  2 +-
 bin/darkwallet/Cargo.toml            |  2 +-
 bin/dhtd/dhtd/Cargo.toml             |  3 +--
 bin/drk/Cargo.toml                   |  3 +--
 bin/fud/fud/Cargo.toml               |  3 +--
 bin/genev/genev-cli/Cargo.toml       |  3 +--
 bin/genev/genevd/Cargo.toml          |  3 +--
 bin/minerd/Cargo.toml                |  3 +--
 bin/tau/taud/Cargo.toml              |  3 ++-
 example/dchat/dchatd/Cargo.toml      |  3 +--
 src/contract/dao/Cargo.toml          |  3 +--
 src/contract/deployooor/Cargo.toml   |  3 +--
 src/contract/money/Cargo.toml        |  3 +--
 src/contract/test-harness/Cargo.toml |  3 +--
 src/sdk/Cargo.toml                   |  3 +--
 19 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 651e0de04..6c08f5493 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1941,7 +1941,7 @@ dependencies = [
  "clap 4.5.20",
  "criterion",
  "crypto_api_chachapoly",
- "darkfi-derive 0.4.2",
+ "darkfi-derive",
  "darkfi-sdk",
  "darkfi-serial",
  "easy-parallel",
@@ -2004,17 +2004,6 @@ dependencies = [
  "sled-overlay",
 ]
 
-[[package]]
-name = "darkfi-derive"
-version = "0.4.2"
-dependencies = [
- "darkfi-derive-internal",
- "proc-macro-crate 3.2.0",
- "proc-macro2",
- "quote",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "darkfi-derive"
 version = "0.4.2"
@@ -2100,11 +2089,13 @@ dependencies = [
 [[package]]
 name = "darkfi-serial"
 version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a240620a7858db545156a1de5b215c9b10344c7ad527eed0fc67efd5cea08a"
 dependencies = [
  "async-trait",
  "blake3 1.5.4",
  "bridgetree",
- "darkfi-derive 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "darkfi-derive",
  "futures-lite 2.3.0",
  "num-bigint",
  "pasta_curves",
diff --git a/Cargo.toml b/Cargo.toml
index 21a3f73f7..11465bc80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,10 +92,13 @@ structopt-toml = {version= "0.5.1", optional = true}
 toml = {version = "0.8.19", optional = true}
 
 # Utilities
+#darkfi-serial = {path = "src/serial", optional = true}
+#darkfi-derive = {path = "src/serial/derive", optional = true}
+darkfi-serial = {version = "0.4.2", optional = true}
+darkfi-derive = {version = "0.4.2", optional = true}
+
 # TODO: check chrono usage and impl our own
 chrono = {version = "0.4.38", optional = true}
-darkfi-serial = {path = "src/serial", optional = true}
-darkfi-derive = {path = "src/serial/derive", optional = true}
 lazy_static = {version = "1.5.0", optional = true}
 num-bigint = {version = "0.4.6", optional = true}
 url = {version = "2.5.2", features = ["serde"], optional = true}
@@ -150,6 +153,7 @@ blockchain = [
     "num-bigint",
 
     "darkfi-serial/num-bigint",
+
     "tx",
     "util",
 ]
diff --git a/bin/darkfi-mmproxy/Cargo.toml b/bin/darkfi-mmproxy/Cargo.toml
index e6383f8a2..1d91ff163 100644
--- a/bin/darkfi-mmproxy/Cargo.toml
+++ b/bin/darkfi-mmproxy/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 darkfi = {path = "../../", features = ["async-daemonize", "async-serial", "system", "util", "rpc"]}
-darkfi-serial = {path = "../../src/serial", features = ["async"]}
+darkfi-serial = {version = "0.4.2", features = ["async"]}
 
 # Misc
 log = "0.4.22"
@@ -40,4 +40,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml
index cd2d1e6d6..a70ce6d31 100644
--- a/bin/darkfid/Cargo.toml
+++ b/bin/darkfid/Cargo.toml
@@ -14,7 +14,7 @@ darkfi = {path = "../../", features = ["async-daemonize", "bs58"]}
 darkfi_money_contract = {path = "../../src/contract/money"}
 darkfi-contract-test-harness = {path = "../../src/contract/test-harness"}
 darkfi-sdk = {path = "../../src/sdk"}
-darkfi-serial = {path = "../../src/serial"}
+darkfi-serial = "0.4.2"
 
 # Misc
 blake3 = "1.5.4"
@@ -44,4 +44,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/darkirc/Cargo.toml b/bin/darkirc/Cargo.toml
index e5d5e7e7c..032828568 100644
--- a/bin/darkirc/Cargo.toml
+++ b/bin/darkirc/Cargo.toml
@@ -20,7 +20,7 @@ path = "src/main.rs"
 [dependencies]
 darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "rpc", "zk"]}
 darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
-darkfi-serial = {path = "../../src/serial", features = ["async"]}
+darkfi-serial = {version = "0.4.2", features = ["async"]}
 libc = "0.2.159"
 
 # Event Graph DB
diff --git a/bin/darkwallet/Cargo.toml b/bin/darkwallet/Cargo.toml
index 123507a2f..c5d103acf 100644
--- a/bin/darkwallet/Cargo.toml
+++ b/bin/darkwallet/Cargo.toml
@@ -30,7 +30,7 @@ zeromq = { version = "0.4.1", default-features = false, features = ["async-std-r
 darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "net", "util", "system", "zk"]}
 evgrd = {path = "../../script/evgrd/"}
 #darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
-darkfi-serial = {path = "../../src/serial", features = ["async"]}
+darkfi-serial = {version = "0.4.2", features = ["async"]}
 thiserror = "1.0.64"
 smol = "2.0.2"
 atomic_float = "1.1.0"
diff --git a/bin/dhtd/dhtd/Cargo.toml b/bin/dhtd/dhtd/Cargo.toml
index cc9b64e05..18b7afe53 100644
--- a/bin/dhtd/dhtd/Cargo.toml
+++ b/bin/dhtd/dhtd/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 async-trait = "0.1.83"
 blake3 = "1.5.4"
 darkfi = {path = "../../../", features = ["dht"]}
-darkfi-serial = {path = "../../../src/serial", features = ["derive", "crypto"]}
+darkfi-serial = {version = "0.4.2", features = ["derive", "crypto"]}
 easy-parallel = "3.3.1"
 log = "0.4.22"
 rand = "0.8.5"
@@ -22,4 +22,3 @@ url = "2.5.2"
 
 [lints]
 workspace = true
-
diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml
index e7bd3c2f2..ea14f1ff7 100644
--- a/bin/drk/Cargo.toml
+++ b/bin/drk/Cargo.toml
@@ -15,7 +15,7 @@ darkfi_money_contract = {path = "../../src/contract/money", features = ["no-entr
 darkfi_dao_contract = {path = "../../src/contract/dao", features = ["no-entrypoint", "client"]}
 darkfi_deployooor_contract = {path = "../../src/contract/deployooor", features = ["no-entrypoint", "client"]}
 darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
-darkfi-serial = {path = "../../src/serial"}
+darkfi-serial = "0.4.2"
 
 # Misc
 blake3 = "1.5.4"
@@ -44,4 +44,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml
index c91b40e55..8ea13ed75 100644
--- a/bin/fud/fud/Cargo.toml
+++ b/bin/fud/fud/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://codeberg.org/darkrenaissance/darkfi"
 
 [dependencies]
 darkfi = {path = "../../../", features = ["async-daemonize", "geode", "rpc"]}
-darkfi-serial = {path = "../../../src/serial", features = ["hash"]}
+darkfi-serial = {version = "0.4.2", features = ["hash"]}
 
 # Misc
 async-trait = "0.1.83"
@@ -33,4 +33,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/genev/genev-cli/Cargo.toml b/bin/genev/genev-cli/Cargo.toml
index 3493afad8..c9382fc5f 100644
--- a/bin/genev/genev-cli/Cargo.toml
+++ b/bin/genev/genev-cli/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://codeberg.org/darkrenaissance/darkfi"
 genevd = {path = "../genevd"}
 
 darkfi = {path = "../../../", features = ["event-graph", "rpc", "bs58"]}
-darkfi-serial = {path = "../../../src/serial"}
+darkfi-serial = "0.4.2"
 
 smol = "2.0.2"
 clap = {version = "4.4.11", features = ["derive"]}
@@ -23,4 +23,3 @@ url = "2.5.2"
 
 [lints]
 workspace = true
-
diff --git a/bin/genev/genevd/Cargo.toml b/bin/genev/genevd/Cargo.toml
index 277e70896..8061cce2f 100644
--- a/bin/genev/genevd/Cargo.toml
+++ b/bin/genev/genevd/Cargo.toml
@@ -22,7 +22,7 @@ darkfi = { path = "../../../", features = [
     "event-graph",
     "rpc",
 ] }
-darkfi-serial = { path = "../../../src/serial" }
+darkfi-serial = "0.4.2"
 
 # Crypto
 blake3 = "1.5.4"
@@ -50,4 +50,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/minerd/Cargo.toml b/bin/minerd/Cargo.toml
index 8f29da908..ff0cc4f1f 100644
--- a/bin/minerd/Cargo.toml
+++ b/bin/minerd/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 # Darkfi
 darkfi = {path = "../../", features = ["async-daemonize", "validator", "rpc"]}
 darkfi-sdk = {path = "../../src/sdk"}
-darkfi-serial = {path = "../../src/serial", features = ["async"]}
+darkfi-serial = {version = "0.4.2", features = ["async"]}
 
 # Misc
 log = "0.4.22"
@@ -36,4 +36,3 @@ structopt-toml = "0.5.1"
 
 [lints]
 workspace = true
-
diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml
index e752baa47..c55cf25a7 100644
--- a/bin/tau/taud/Cargo.toml
+++ b/bin/tau/taud/Cargo.toml
@@ -23,7 +23,8 @@ darkfi = { path = "../../../", features = [
     "event-graph",
     "rpc",
 ] }
-darkfi-serial = { path = "../../../src/serial" }
+
+darkfi-serial = "0.4.2"
 
 # Event Graph DB
 sled-overlay = "0.1.3"
diff --git a/example/dchat/dchatd/Cargo.toml b/example/dchat/dchatd/Cargo.toml
index 3ed1a83bf..315238247 100644
--- a/example/dchat/dchatd/Cargo.toml
+++ b/example/dchat/dchatd/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 [dependencies]
 # ANCHOR: darkfi
 darkfi = {path = "../../../", features = ["toml", "async-daemonize", "rpc"]}
-darkfi-serial = {path = "../../../src/serial"}
+darkfi-serial = "0.4.2"
 # ANCHOR_END: darkfi
 
 # daemon
@@ -35,4 +35,3 @@ url = "2.5.2"
 
 [lints]
 workspace = true
-
diff --git a/src/contract/dao/Cargo.toml b/src/contract/dao/Cargo.toml
index 16e0578c9..9a6bd3738 100644
--- a/src/contract/dao/Cargo.toml
+++ b/src/contract/dao/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 blake2b_simd = "1.0.2"
 bs58 = "0.5.1"
 darkfi-sdk = { path = "../../sdk" }
-darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
+darkfi-serial = { version = "0.4.2", features = ["derive", "crypto"] }
 darkfi_money_contract = { path = "../money", features = ["no-entrypoint"] }
 thiserror = "1.0.64"
 
@@ -51,4 +51,3 @@ client = [
 
 [lints]
 workspace = true
-
diff --git a/src/contract/deployooor/Cargo.toml b/src/contract/deployooor/Cargo.toml
index 03aee3ff5..9df30eceb 100644
--- a/src/contract/deployooor/Cargo.toml
+++ b/src/contract/deployooor/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 darkfi-sdk = { path = "../../sdk" }
-darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
+darkfi-serial = { version = "0.4.2", features = ["derive", "crypto"] }
 thiserror = "1.0.64"
 wasmparser = "0.219.1"
 
@@ -44,4 +44,3 @@ client = [
 
 [lints]
 workspace = true
-
diff --git a/src/contract/money/Cargo.toml b/src/contract/money/Cargo.toml
index cf2e23381..5365eb36a 100644
--- a/src/contract/money/Cargo.toml
+++ b/src/contract/money/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 blake3 = "1.5.4"
 bs58 = "0.5.1"
 darkfi-sdk = { path = "../../sdk" }
-darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
+darkfi-serial = { version = "0.4.2", features = ["derive", "crypto"] }
 thiserror = "1.0.64"
 
 # The following dependencies are used for the client API and
@@ -51,4 +51,3 @@ client = [
 
 [lints]
 workspace = true
-
diff --git a/src/contract/test-harness/Cargo.toml b/src/contract/test-harness/Cargo.toml
index 2adc33714..83f479bf3 100644
--- a/src/contract/test-harness/Cargo.toml
+++ b/src/contract/test-harness/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 darkfi = {path = "../../../", features = ["validator"]}
 darkfi-sdk = {path = "../../../src/sdk"}
-darkfi-serial = {path = "../../../src/serial", features = ["crypto"]}
+darkfi-serial = {version = "0.4.2", features = ["crypto"]}
 
 darkfi_dao_contract = {path = "../dao", features = ["client", "no-entrypoint"]}
 darkfi_money_contract = {path = "../money", features = ["client", "no-entrypoint"]}
@@ -23,4 +23,3 @@ sled-overlay = "0.1.3"
 
 [lints]
 workspace = true
-
diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml
index d5ec335fa..02363e4a3 100644
--- a/src/sdk/Cargo.toml
+++ b/src/sdk/Cargo.toml
@@ -20,7 +20,7 @@ async = ["darkfi-serial/async"]
 thiserror = "1.0.64"
 
 # Serialization
-darkfi-serial = {path = "../serial", features = ["crypto"]}
+darkfi-serial = {version = "0.4.2", features = ["crypto"]}
 
 # Encoding
 bs58 = "0.5.1"
@@ -48,4 +48,3 @@ rand = "0.8.5"
 
 [lints]
 workspace = true
-