Skip to content

deps: update packages from cargo audit #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bennyhodl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

deps: update packages from cargo audit #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,654 changes: 1,549 additions & 1,105 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
[workspace]
resolver = "2"
members = ["ddk", "dlc", "dlc-messages", "dlc-trie", "payouts", "ddk-node", "ddk-manager", "kormir"]

[workspace.package]
version = "1.0.11"
edition = "2021"
license = "MIT"
repository = "https://github.com/bennyhodl/dlcdevkit"
homepage = "https://github.com/bennyhodl/dlcdevkit"

[workspace.dependencies]
# Default-features are disabled here so no-std crates (dlc, dlc-messages, dlc-trie)
# don't pull std. Std-using crates must opt in via `features = ["std"]`.
ddk = { version = "1.0.11", path = "ddk", default-features = false }
ddk-dlc = { version = "1.0.11", path = "dlc", default-features = false }
ddk-messages = { version = "1.0.11", path = "dlc-messages", default-features = false }
ddk-trie = { version = "1.0.11", path = "dlc-trie", default-features = false }
ddk-manager = { version = "1.0.11", path = "ddk-manager", default-features = false }
ddk-payouts = { version = "1.0.11", path = "payouts" }
kormir = { version = "1.0.11", path = "kormir" }

bitcoin = { version = "0.32.6", default-features = false }
lightning = { version = "0.2.2", default-features = false }
secp256k1-zkp = "0.11.0"

serde = { version = "1.0.209", default-features = false }
serde_json = "1.0.142"

# async / runtime
tokio = "1.41.1"
async-trait = "0.1.89"
futures = "0.3.31"

# error handling
anyhow = "1.0.86"
thiserror = "2.0.12"

# logging
tracing = "0.1.41"
log = "0.4.22"

# utility
hex = "0.4.3"
chrono = "0.4.39"

# dev / test
bitcoincore-rpc = "0.19.0"
bitcoincore-rpc-json = "0.19.0"
dotenvy = "0.15.7"
54 changes: 27 additions & 27 deletions ddk-manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
[package]
name = "ddk-manager"
authors = ["Crypto Garage", "benny b <ben@bitcoinbay.foundation>"]
description = "Creation and handling of Discrete Log Contracts (DLC)."
edition = "2021"
homepage = "https://github.com/bennyhodl/rust-dlc"
license-file = "../LICENSE"
name = "ddk-manager"
repository = "https://github.com/bennyhodl/rust-dlc/tree/master/dlc-manager"
version = "1.0.11"
homepage.workspace = true
version.workspace = true
edition.workspace = true

[features]
default= ["std"]
default = ["std"]
std = ["ddk-dlc/std", "ddk-messages/std", "ddk-trie/std", "bitcoin/std", "lightning/std"]
fuzztarget = ["rand_chacha"]
parallel = ["ddk-trie/parallel"]
use-serde = ["serde", "ddk-dlc/use-serde", "ddk-messages/use-serde", "ddk-trie/use-serde"]

[dependencies]
async-trait = "0.1.50"
bitcoin = { version = "0.32.6", default-features = false }
async-trait = { workspace = true }
bitcoin = { workspace = true }

ddk-dlc = { version = "1.0.11", path = "../dlc", features = ["use-serde"] }
ddk-messages = { version = "1.0.11", path = "../dlc-messages", features = [ "use-serde"] }
ddk-trie = { version = "1.0.11", path = "../dlc-trie", features = ["use-serde"] }
ddk-dlc = { workspace = true, features = ["use-serde"] }
ddk-messages = { workspace = true, features = ["use-serde"] }
ddk-trie = { workspace = true, features = ["use-serde"] }

futures = "0.3.31"
futures = { workspace = true }
hex = { package = "hex-conservative", version = "0.1" }
lightning = { version = "0.1.5", default-features = false, features = ["grind_signatures"] }
lightning = { workspace = true, features = ["grind_signatures"] }
once_cell = "1.21.3"
rand_chacha = {version = "0.3.1", optional = true}
secp256k1-zkp = {version = "0.11.0"}
serde = {version = "1.0", optional = true}
tokio = { version = "1.41.1", features = ["sync"] }
tracing = "0.1.41"
rand_chacha = { version = "0.3.1", optional = true }
secp256k1-zkp = { workspace = true }
serde = { workspace = true, optional = true }
tokio = { workspace = true, features = ["sync"] }
tracing = { workspace = true }

[dev-dependencies]
ddk = { path = "../ddk"}
bitcoincore-rpc = {version = "0.19"}
bitcoincore-rpc-json = {version = "0.19"}
criterion = "0.4.0"
env_logger = "0.9.1"
secp256k1-zkp = {version = "0.11.0", features = ["hashes", "rand", "rand-std", "global-context", "serde"]}
serde = "1.0"
serde_json = "1.0"
tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "test-util", "fs"] }
dotenv = "0.15.0"
ddk = { workspace = true }
bitcoincore-rpc = { workspace = true }
bitcoincore-rpc-json = { workspace = true }
criterion = "0.8.2"
env_logger = "0.11.10"
secp256k1-zkp = { workspace = true, features = ["hashes", "rand", "rand-std", "global-context", "serde"] }
serde = { workspace = true, features = ["std"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "test-util", "fs"] }
dotenvy = { workspace = true }

[[bench]]
harness = false
Expand Down
3 changes: 2 additions & 1 deletion ddk-manager/benches/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use bitcoin::Amount;
use bitcoin::OutPoint;
use bitcoin::ScriptBuf;
use bitcoin::WPubkeyHash;
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use criterion::{criterion_group, criterion_main, Criterion};
use ddk_dlc::create_dlc_transactions;
use ddk_dlc::DlcTransactions;
use ddk_dlc::PartyParams;
Expand All @@ -26,6 +26,7 @@ use ddk_messages::oracle_msgs::OracleEvent;
use secp256k1_zkp::{
global::SECP256K1, rand::thread_rng, schnorr::Signature, Keypair, SecretKey, XOnlyPublicKey,
};
use std::hint::black_box;
use std::str::FromStr;

/// The base in which the outcome values are decomposed.
Expand Down
2 changes: 1 addition & 1 deletion ddk-manager/tests/splice_execution_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,6 @@ async fn get_splice_test_params(oracle: MemoryOracle, splice_path: SplicePath) -
#[tokio::test]
#[ignore]
async fn splice() {
dotenv::dotenv().ok();
dotenvy::dotenv().ok();
splice_execution_test(splice_test_params().await).await
}
46 changes: 23 additions & 23 deletions ddk-node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
[package]
name = "ddk-node"
version = "1.0.11"
authors = ["benny b <ben@bitcoinbay.foundation>"]
description = "DDK node to facilitate DLC contracts."
license = "MIT"
repository = "https://github.com/bennyhodl/dlcdevkit"
edition = "2021"
license.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true

[dependencies]
ddk = { version = "1.0.11", path = "../ddk", features = ["postgres", "kormir", "nostr"] }
ddk-manager = { version = "1.0.11", path = "../ddk-manager", features = ["use-serde"] }
ddk-payouts = { version = "1.0.11", path = "../payouts" }
ddk-dlc = { version = "1.0.11", path = "../dlc", features = ["use-serde"] }
ddk-messages = { version = "1.0.11", path = "../dlc-messages", features = [ "use-serde"] }
ddk = { workspace = true, features = ["postgres", "kormir", "nostr"] }
ddk-manager = { workspace = true, features = ["std", "use-serde"] }
ddk-payouts = { workspace = true }
ddk-dlc = { workspace = true, features = ["std", "use-serde"] }
ddk-messages = { workspace = true, features = ["std", "use-serde"] }

bitcoin = { version = "0.32.6", features = ["rand", "serde"] }
bitcoin = { workspace = true, features = ["std", "rand", "serde"] }

anyhow = "1.0.86"
anyhow = { workspace = true }
clap = { version = "4.5.9", features = ["derive"] }
hex = "0.4.3"
hex = { workspace = true }
homedir = "0.3.3"
inquire = "0.7.5"
prost = "0.12.1"
serde = { version = "1.0.204", features = ["derive"] }
serde_json = "1.0.125"
tokio = { version = "1.38.0", features = ["full"] }
tonic = "0.10.2"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
reqwest = { version = "0.12.12", features = ["json"] }
chrono = "0.4.39"
prost = "0.14.3"
serde = { workspace = true, features = ["std", "derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tonic = "0.14.6"
tonic-prost = "0.14.6"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
chrono = { workspace = true }

[build-dependencies]
tonic-build = "0.10.2"
tonic-build = "0.14.6"
tonic-prost-build = "0.14.6"

[[bin]]
name = "ddk-node"
Expand All @@ -41,4 +42,3 @@ path = "./src/bin/node.rs"
[[bin]]
name = "ddk-cli"
path = "./src/bin/cli.rs"

4 changes: 2 additions & 2 deletions ddk-node/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

let proto_paths: Vec<_> = protos.iter().map(|proto| dir.join(proto)).collect();

tonic_build::configure()
tonic_prost_build::configure()
.build_client(true)
.build_server(true)
.out_dir("./src")
.type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
.compile(&proto_paths, &[dir])?;
.compile_protos(&proto_paths, &[dir])?;

Ok(())
}
Loading
Loading