diff --git a/Cargo.lock b/Cargo.lock index db73ed0..6b4ad36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1220,12 +1220,12 @@ dependencies = [ "bytes 1.8.0", "easy-jsonrpc-mw", "futures 0.3.31", - "grin_chain 5.4.0-alpha.0", - "grin_core 5.4.0-alpha.0", + "grin_chain", + "grin_core", "grin_p2p", "grin_pool", - "grin_store 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_store", + "grin_util", "http", "hyper 0.14.32", "hyper-rustls 0.23.2", @@ -1245,30 +1245,6 @@ dependencies = [ "url", ] -[[package]] -name = "grin_chain" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdedcee9e20e0cc8dc1460b37b3951306c774a6aa5788e3f45addc56e60f7fbe" -dependencies = [ - "bit-vec", - "bitflags 1.3.2", - "byteorder", - "chrono", - "croaring", - "enum_primitive", - "grin_core 5.3.3", - "grin_keychain 5.3.3", - "grin_store 5.3.3", - "grin_util 5.3.3", - "lazy_static", - "log", - "lru-cache", - "serde", - "serde_derive", - "thiserror", -] - [[package]] name = "grin_chain" version = "5.4.0-alpha.0" @@ -1279,10 +1255,10 @@ dependencies = [ "chrono", "croaring", "enum_primitive", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_store 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_keychain", + "grin_store", + "grin_util", "lazy_static", "log", "lru-cache", @@ -1291,33 +1267,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "grin_core" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fbf242a2a23a6554dd4c430574d2563993cf5f44921f953635e8a177cf2506" -dependencies = [ - "blake2-rfc", - "byteorder", - "bytes 0.5.6", - "chrono", - "croaring", - "enum_primitive", - "grin_keychain 5.3.3", - "grin_util 5.3.3", - "lazy_static", - "log", - "lru-cache", - "num", - "num-bigint", - "rand 0.6.5", - "serde", - "serde_derive", - "siphasher", - "thiserror", - "zeroize", -] - [[package]] name = "grin_core" version = "5.4.0-alpha.0" @@ -1328,8 +1277,8 @@ dependencies = [ "chrono", "croaring", "enum_primitive", - "grin_keychain 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_keychain", + "grin_util", "lazy_static", "log", "lru-cache", @@ -1343,29 +1292,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "grin_keychain" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abeb1c22f48269a0bf463de589f8961d8bbb554def5e5e405710ead9a1b4c71a" -dependencies = [ - "blake2-rfc", - "byteorder", - "digest 0.9.0", - "grin_util 5.3.3", - "hmac 0.11.0", - "lazy_static", - "log", - "pbkdf2 0.8.0", - "rand 0.6.5", - "ripemd160", - "serde", - "serde_derive", - "serde_json", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "grin_keychain" version = "5.4.0-alpha.0" @@ -1373,7 +1299,7 @@ dependencies = [ "blake2-rfc", "byteorder", "digest 0.9.0", - "grin_util 5.4.0-alpha.0", + "grin_util", "hmac 0.11.0", "lazy_static", "log", @@ -1395,10 +1321,10 @@ dependencies = [ "bytes 0.5.6", "chrono", "enum_primitive", - "grin_chain 5.4.0-alpha.0", - "grin_core 5.4.0-alpha.0", - "grin_store 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_chain", + "grin_core", + "grin_store", + "grin_util", "log", "lru-cache", "num", @@ -1414,9 +1340,9 @@ version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "chrono", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_keychain", + "grin_util", "log", "rand 0.6.5", "serde", @@ -1439,34 +1365,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "grin_store" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708e53758263fa17dfd3fc46419ded59a84d07818e1ee7526b0d47ba268f1362" -dependencies = [ - "byteorder", - "croaring", - "grin_core 5.3.3", - "grin_util 5.3.3", - "libc", - "lmdb-zero", - "log", - "memmap", - "serde", - "serde_derive", - "tempfile", - "thiserror", -] - [[package]] name = "grin_store" version = "5.4.0-alpha.0" dependencies = [ "byteorder", "croaring", - "grin_core 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_util", "libc", "lmdb-zero", "log", @@ -1477,29 +1383,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "grin_util" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1433d76d0e95c2ed20e1008e9891adfae64812d1bdc5ec71ed5499dcaca2986" -dependencies = [ - "anyhow", - "backtrace", - "base64 0.12.3", - "byteorder", - "grin_secp256k1zkp", - "lazy_static", - "log", - "log4rs", - "parking_lot 0.10.2", - "rand 0.6.5", - "serde", - "serde_derive", - "walkdir", - "zeroize", - "zip", -] - [[package]] name = "grin_util" version = "5.4.0-alpha.0" @@ -1529,9 +1412,9 @@ dependencies = [ "clap", "easy-jsonrpc-mw", "grin_api", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_keychain", + "grin_util", "grin_wallet_api", "grin_wallet_config", "grin_wallet_controller", @@ -1561,9 +1444,9 @@ dependencies = [ "chrono", "easy-jsonrpc-mw", "ed25519-dalek", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_keychain", + "grin_util", "grin_wallet_config", "grin_wallet_impls", "grin_wallet_libwallet", @@ -1583,8 +1466,8 @@ name = "grin_wallet_config" version = "5.4.0-alpha.1" dependencies = [ "dirs 2.0.2", - "grin_core 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_util", "grin_wallet_util", "pretty_assertions", "rand 0.6.5", @@ -1602,10 +1485,10 @@ dependencies = [ "ed25519-dalek", "futures 0.3.31", "grin_api", - "grin_chain 5.3.3", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_chain", + "grin_core", + "grin_keychain", + "grin_util", "grin_wallet_api", "grin_wallet_config", "grin_wallet_impls", @@ -1641,11 +1524,11 @@ dependencies = [ "ed25519-dalek", "futures 0.3.31", "grin_api", - "grin_chain 5.4.0-alpha.0", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_store 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_chain", + "grin_core", + "grin_keychain", + "grin_store", + "grin_util", "grin_wallet_config", "grin_wallet_libwallet", "grin_wallet_util", @@ -1682,10 +1565,10 @@ dependencies = [ "chrono", "curve25519-dalek 2.1.3", "ed25519-dalek", - "grin_core 5.4.0-alpha.0", - "grin_keychain 5.4.0-alpha.0", - "grin_store 5.4.0-alpha.0", - "grin_util 5.4.0-alpha.0", + "grin_core", + "grin_keychain", + "grin_store", + "grin_util", "grin_wallet_config", "grin_wallet_util", "hmac 0.12.1", @@ -1712,7 +1595,7 @@ version = "5.4.0-alpha.1" dependencies = [ "data-encoding", "ed25519-dalek", - "grin_util 5.4.0-alpha.0", + "grin_util", "pretty_assertions", "rand 0.6.5", "serde", diff --git a/controller/Cargo.toml b/controller/Cargo.toml index c3ff8e9..5ab271a 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -78,7 +78,7 @@ remove_dir_all = "0.7" ##### Grin Imports # For Release -grin_chain = "5.3.3" +# grin_chain = "5.3.3" # For beta release @@ -90,5 +90,8 @@ grin_chain = "5.3.3" # For local testing # grin_chain = { path = "../../grin/chain"} +# Monorepo deps +grin_chain = { path = "../../node/chain"} + #####