From 140993794ae6e6348e6c50a5c4e19ac9e9090316 Mon Sep 17 00:00:00 2001 From: bennyhodl Date: Tue, 26 Nov 2024 11:29:02 -0500 Subject: [PATCH] fork init: renamed crates to ddk --- .github/workflows/rust.yml | 10 ++--- Cargo.toml | 8 ++-- bitcoin-rpc-provider/Cargo.toml | 2 +- bitcoin-rpc-provider/src/lib.rs | 4 +- {dlc => ddk-dlc}/CHANGELOG.md | 0 {dlc => ddk-dlc}/Cargo.toml | 8 ++-- {dlc => ddk-dlc}/Readme.md | 0 {dlc => ddk-dlc}/benches/Readme.md | 0 {dlc => ddk-dlc}/benches/benchmarks.rs | 4 +- {dlc => ddk-dlc}/src/channel/mod.rs | 0 {dlc => ddk-dlc}/src/lib.rs | 0 {dlc => ddk-dlc}/src/secp_utils.rs | 0 {dlc => ddk-dlc}/src/util.rs | 0 {dlc-manager => ddk-manager}/CHANGELOG.md | 0 {dlc-manager => ddk-manager}/Cargo.toml | 24 +++++------ {dlc-manager => ddk-manager}/Readme.md | 0 .../benches/Readme.md | 0 .../benches/benchmarks.rs | 40 +++++++++--------- .../src/chain_monitor.rs | 2 +- .../src/channel/accepted_channel.rs | 2 +- .../src/channel/mod.rs | 18 ++++---- .../src/channel/offered_channel.rs | 10 ++--- .../src/channel/party_points.rs | 2 +- .../src/channel/ser.rs | 6 +-- .../src/channel/signed_channel.rs | 2 +- .../src/channel/utils.rs | 0 .../src/channel_updater.rs | 30 ++++++------- .../src/contract/accepted_contract.rs | 4 +- .../src/contract/contract_info.rs | 8 ++-- .../src/contract/contract_input.rs | 4 +- .../src/contract/enum_descriptor.rs | 26 ++++++------ .../src/contract/mod.rs | 6 +-- .../src/contract/numerical_descriptor.rs | 8 ++-- .../src/contract/offered_contract.rs | 8 ++-- .../src/contract/ser.rs | 20 ++++----- .../src/contract/signed_contract.rs | 8 ++-- .../src/contract/utils.rs | 0 .../src/contract_updater.rs | 30 ++++++------- .../src/conversion_utils.rs | 10 ++--- {dlc-manager => ddk-manager}/src/error.rs | 6 +-- {dlc-manager => ddk-manager}/src/lib.rs | 12 +++--- {dlc-manager => ddk-manager}/src/manager.rs | 14 +++--- .../src/payout_curve.rs | 2 +- {dlc-manager => ddk-manager}/src/utils.rs | 15 ++++--- .../test_inputs/Accepted | Bin .../test_inputs/offer_channel.json | 0 .../test_inputs/offer_contract.json | 0 ...ffer_enum_collateral_not_equal_payout.json | 0 .../offer_enum_missing_payout.json | 0 .../offer_enum_oracle_with_diff_payout.json | 0 .../offer_numerical_bad_first_payout.json | 0 .../offer_numerical_bad_last_payout.json | 0 ...numerical_collateral_less_than_payout.json | 0 ...fer_numerical_empty_rounding_interval.json | 0 ...r_numerical_invalid_rounding_interval.json | 0 .../offer_numerical_non_continuous.json | 0 .../tests/channel_execution_tests.rs | 26 ++++++------ .../tests/manager_execution_tests.rs | 22 +++++----- .../tests/test_utils.rs | 16 +++---- {dlc-messages => ddk-messages}/CHANGELOG.md | 0 {dlc-messages => ddk-messages}/Cargo.toml | 16 +++---- {dlc-messages => ddk-messages}/Readme.md | 0 {dlc-messages => ddk-messages}/src/channel.rs | 2 +- .../src/compatibility_tests.rs | 4 +- .../src/contract_msgs.rs | 0 {dlc-messages => ddk-messages}/src/lib.rs | 4 +- .../src/message_handler.rs | 0 .../src/oracle_msgs.rs | 8 ++-- .../src/segmentation/mod.rs | 0 .../src/segmentation/segment_reader.rs | 0 .../src/ser_impls.rs | 2 +- .../src/ser_macros.rs | 0 .../src/serde_utils.rs | 0 .../src/test_inputs/accept_msg.json | 0 .../src/test_inputs/dlc_fee_test.json | 0 .../src/test_inputs/dlc_fee_test_scripts.json | 0 .../src/test_inputs/dlc_test.json | 0 .../src/test_inputs/dlc_tx_test.json | 0 .../src/test_inputs/offer_msg.json | 0 .../src/test_inputs/offer_msg_disjoint.json | 0 .../src/test_inputs/segment_chunk_msg.json | 0 .../src/test_inputs/segment_start_msg.json | 0 .../src/test_inputs/sign_msg.json | 0 {dlc-trie => ddk-trie}/CHANGELOG.md | 0 {dlc-trie => ddk-trie}/Cargo.toml | 16 +++---- {dlc-trie => ddk-trie}/Readme.md | 0 .../src/combination_iterator.rs | 0 .../src/digit_decomposition.rs | 4 +- {dlc-trie => ddk-trie}/src/digit_trie.rs | 2 +- {dlc-trie => ddk-trie}/src/lib.rs | 14 +++--- {dlc-trie => ddk-trie}/src/multi_oracle.rs | 0 .../src/multi_oracle_trie.rs | 6 +-- .../src/multi_oracle_trie_with_diff.rs | 4 +- {dlc-trie => ddk-trie}/src/multi_trie.rs | 2 +- {dlc-trie => ddk-trie}/src/test_utils.rs | 0 {dlc-trie => ddk-trie}/src/utils.rs | 2 +- dlc-sled-storage-provider/Cargo.toml | 2 +- dlc-sled-storage-provider/src/lib.rs | 36 ++++++++-------- electrs-blockchain-provider/Cargo.toml | 2 +- electrs-blockchain-provider/src/lib.rs | 22 +++++----- fuzz/Cargo.toml | 2 +- mocks/Cargo.toml | 6 +-- mocks/src/lib.rs | 2 +- mocks/src/memory_storage_provider.rs | 10 ++--- mocks/src/mock_blockchain.rs | 2 +- mocks/src/mock_oracle_provider.rs | 8 ++-- mocks/src/mock_time.rs | 4 +- mocks/src/mock_wallet.rs | 10 ++--- p2pd-oracle-client/Cargo.toml | 4 +- p2pd-oracle-client/src/lib.rs | 16 +++---- sample/Cargo.toml | 6 +-- sample/src/cli.rs | 12 +++--- sample/src/main.rs | 10 ++--- sample/tests/cli_tests.rs | 2 +- simple-wallet/Cargo.toml | 4 +- simple-wallet/src/lib.rs | 6 +-- 116 files changed, 335 insertions(+), 334 deletions(-) rename {dlc => ddk-dlc}/CHANGELOG.md (100%) rename {dlc => ddk-dlc}/Cargo.toml (81%) rename {dlc => ddk-dlc}/Readme.md (100%) rename {dlc => ddk-dlc}/benches/Readme.md (100%) rename {dlc => ddk-dlc}/benches/benchmarks.rs (99%) rename {dlc => ddk-dlc}/src/channel/mod.rs (100%) rename {dlc => ddk-dlc}/src/lib.rs (100%) rename {dlc => ddk-dlc}/src/secp_utils.rs (100%) rename {dlc => ddk-dlc}/src/util.rs (100%) rename {dlc-manager => ddk-manager}/CHANGELOG.md (100%) rename {dlc-manager => ddk-manager}/Cargo.toml (60%) rename {dlc-manager => ddk-manager}/Readme.md (100%) rename {dlc-manager => ddk-manager}/benches/Readme.md (100%) rename {dlc-manager => ddk-manager}/benches/benchmarks.rs (91%) rename {dlc-manager => ddk-manager}/src/chain_monitor.rs (99%) rename {dlc-manager => ddk-manager}/src/channel/accepted_channel.rs (98%) rename {dlc-manager => ddk-manager}/src/channel/mod.rs (94%) rename {dlc-manager => ddk-manager}/src/channel/offered_channel.rs (95%) rename {dlc-manager => ddk-manager}/src/channel/party_points.rs (99%) rename {dlc-manager => ddk-manager}/src/channel/ser.rs (95%) rename {dlc-manager => ddk-manager}/src/channel/signed_channel.rs (99%) rename {dlc-manager => ddk-manager}/src/channel/utils.rs (100%) rename {dlc-manager => ddk-manager}/src/channel_updater.rs (98%) rename {dlc-manager => ddk-manager}/src/contract/accepted_contract.rs (98%) rename {dlc-manager => ddk-manager}/src/contract/contract_info.rs (98%) rename {dlc-manager => ddk-manager}/src/contract/contract_input.rs (98%) rename {dlc-manager => ddk-manager}/src/contract/enum_descriptor.rs (92%) rename {dlc-manager => ddk-manager}/src/contract/mod.rs (98%) rename {dlc-manager => ddk-manager}/src/contract/numerical_descriptor.rs (97%) rename {dlc-manager => ddk-manager}/src/contract/offered_contract.rs (97%) rename {dlc-manager => ddk-manager}/src/contract/ser.rs (94%) rename {dlc-manager => ddk-manager}/src/contract/signed_contract.rs (91%) rename {dlc-manager => ddk-manager}/src/contract/utils.rs (100%) rename {dlc-manager => ddk-manager}/src/contract_updater.rs (97%) rename {dlc-manager => ddk-manager}/src/conversion_utils.rs (99%) rename {dlc-manager => ddk-manager}/src/error.rs (96%) rename {dlc-manager => ddk-manager}/src/lib.rs (98%) rename {dlc-manager => ddk-manager}/src/manager.rs (99%) rename {dlc-manager => ddk-manager}/src/payout_curve.rs (99%) rename {dlc-manager => ddk-manager}/src/utils.rs (96%) rename {dlc-manager => ddk-manager}/test_inputs/Accepted (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_channel.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_contract.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_enum_collateral_not_equal_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_enum_missing_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_enum_oracle_with_diff_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_bad_first_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_bad_last_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_collateral_less_than_payout.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_empty_rounding_interval.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_invalid_rounding_interval.json (100%) rename {dlc-manager => ddk-manager}/test_inputs/offer_numerical_non_continuous.json (100%) rename {dlc-manager => ddk-manager}/tests/channel_execution_tests.rs (98%) rename {dlc-manager => ddk-manager}/tests/manager_execution_tests.rs (97%) rename {dlc-manager => ddk-manager}/tests/test_utils.rs (98%) rename {dlc-messages => ddk-messages}/CHANGELOG.md (100%) rename {dlc-messages => ddk-messages}/Cargo.toml (61%) rename {dlc-messages => ddk-messages}/Readme.md (100%) rename {dlc-messages => ddk-messages}/src/channel.rs (99%) rename {dlc-messages => ddk-messages}/src/compatibility_tests.rs (99%) rename {dlc-messages => ddk-messages}/src/contract_msgs.rs (100%) rename {dlc-messages => ddk-messages}/src/lib.rs (99%) rename {dlc-messages => ddk-messages}/src/message_handler.rs (100%) rename {dlc-messages => ddk-messages}/src/oracle_msgs.rs (98%) rename {dlc-messages => ddk-messages}/src/segmentation/mod.rs (100%) rename {dlc-messages => ddk-messages}/src/segmentation/segment_reader.rs (100%) rename {dlc-messages => ddk-messages}/src/ser_impls.rs (99%) rename {dlc-messages => ddk-messages}/src/ser_macros.rs (100%) rename {dlc-messages => ddk-messages}/src/serde_utils.rs (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/accept_msg.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/dlc_fee_test.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/dlc_fee_test_scripts.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/dlc_test.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/dlc_tx_test.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/offer_msg.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/offer_msg_disjoint.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/segment_chunk_msg.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/segment_start_msg.json (100%) rename {dlc-messages => ddk-messages}/src/test_inputs/sign_msg.json (100%) rename {dlc-trie => ddk-trie}/CHANGELOG.md (100%) rename {dlc-trie => ddk-trie}/Cargo.toml (53%) rename {dlc-trie => ddk-trie}/Readme.md (100%) rename {dlc-trie => ddk-trie}/src/combination_iterator.rs (100%) rename {dlc-trie => ddk-trie}/src/digit_decomposition.rs (99%) rename {dlc-trie => ddk-trie}/src/digit_trie.rs (99%) rename {dlc-trie => ddk-trie}/src/lib.rs (97%) rename {dlc-trie => ddk-trie}/src/multi_oracle.rs (100%) rename {dlc-trie => ddk-trie}/src/multi_oracle_trie.rs (99%) rename {dlc-trie => ddk-trie}/src/multi_oracle_trie_with_diff.rs (99%) rename {dlc-trie => ddk-trie}/src/multi_trie.rs (99%) rename {dlc-trie => ddk-trie}/src/test_utils.rs (100%) rename {dlc-trie => ddk-trie}/src/utils.rs (99%) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ed5d4f4a..6589edfd 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,7 +2,7 @@ on: push: branches: - master - - 'testci/**' + - "testci/**" pull_request: name: Continuous integration @@ -26,7 +26,7 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable with: - components: rustfmt + components: rustfmt - name: Check format run: cargo fmt --all --check no-std: @@ -38,11 +38,11 @@ jobs: - name: install clippy run: rustup component add clippy - name: Run clippy dlc - run: cargo clippy --no-default-features --features no-std -p dlc -- -D warnings + run: cargo clippy --no-default-features --features no-std -p ddk-dlc -- -D warnings - name: Run clippy dlc-messages - run: cargo clippy --no-default-features --features no-std -p dlc-messages -- -D warnings + run: cargo clippy --no-default-features --features no-std -p ddk-messages -- -D warnings - name: Run clippy dlc-trie - run: cargo clippy --no-default-features --features no-std -p dlc-trie -- -D warnings + run: cargo clippy --no-default-features --features no-std -p ddk-trie -- -D warnings unit-tests: name: unit-tests runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 4843100a..7d35f7a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,10 +4,10 @@ members = [ "bitcoin-test-utils", "bitcoin-rpc-provider", "p2pd-oracle-client", - "dlc", - "dlc-messages", - "dlc-trie", - "dlc-manager", + "ddk-dlc", + "ddk-messages", + "ddk-trie", + "ddk-manager", "mocks", "sample", "simple-wallet", diff --git a/bitcoin-rpc-provider/Cargo.toml b/bitcoin-rpc-provider/Cargo.toml index 0da8a2de..34cec4e8 100644 --- a/bitcoin-rpc-provider/Cargo.toml +++ b/bitcoin-rpc-provider/Cargo.toml @@ -8,7 +8,7 @@ version = "0.1.0" bitcoin = {version = "0.32.2"} bitcoincore-rpc = {version = "0.19.0"} bitcoincore-rpc-json = {version = "0.19.0"} -dlc-manager = {path = "../dlc-manager"} +ddk-manager = {path = "../ddk-manager"} hex = { package = "hex-conservative", version = "0.1" } lightning = { version = "0.0.125" } log = "0.4.14" diff --git a/bitcoin-rpc-provider/src/lib.rs b/bitcoin-rpc-provider/src/lib.rs index 7fa1c687..5791846b 100644 --- a/bitcoin-rpc-provider/src/lib.rs +++ b/bitcoin-rpc-provider/src/lib.rs @@ -17,8 +17,8 @@ use bitcoincore_rpc::jsonrpc::serde_json; use bitcoincore_rpc::jsonrpc::serde_json::Value; use bitcoincore_rpc::{json, Auth, Client, RpcApi}; use bitcoincore_rpc_json::AddressType; -use dlc_manager::error::Error as ManagerError; -use dlc_manager::{Blockchain, ContractSignerProvider, SimpleSigner, Utxo, Wallet}; +use ddk_manager::error::Error as ManagerError; +use ddk_manager::{Blockchain, ContractSignerProvider, SimpleSigner, Utxo, Wallet}; use hex::DisplayHex; use json::EstimateMode; use lightning::chain::chaininterface::{ConfirmationTarget, FeeEstimator}; diff --git a/dlc/CHANGELOG.md b/ddk-dlc/CHANGELOG.md similarity index 100% rename from dlc/CHANGELOG.md rename to ddk-dlc/CHANGELOG.md diff --git a/dlc/Cargo.toml b/ddk-dlc/Cargo.toml similarity index 81% rename from dlc/Cargo.toml rename to ddk-dlc/Cargo.toml index 6fad3943..43a079ff 100644 --- a/dlc/Cargo.toml +++ b/ddk-dlc/Cargo.toml @@ -1,10 +1,10 @@ [package] -authors = ["Crypto Garage"] +authors = ["Crypto Garage", "benny b "] description = "Creation, signing and verification of Discreet Log Contracts (DLC) transactions." -homepage = "https://github.com/p2pderivatives/rust-dlc" +homepage = "https://github.com/bennyhodl/rust-dlc" license-file = "../LICENSE" -name = "dlc" -repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc" +name = "ddk-dlc" +repository = "https://github.com/bennyhodl/rust-dlc/tree/master/dlc" version = "0.7.0" [dependencies] diff --git a/dlc/Readme.md b/ddk-dlc/Readme.md similarity index 100% rename from dlc/Readme.md rename to ddk-dlc/Readme.md diff --git a/dlc/benches/Readme.md b/ddk-dlc/benches/Readme.md similarity index 100% rename from dlc/benches/Readme.md rename to ddk-dlc/benches/Readme.md diff --git a/dlc/benches/benchmarks.rs b/ddk-dlc/benches/benchmarks.rs similarity index 99% rename from dlc/benches/benchmarks.rs rename to ddk-dlc/benches/benchmarks.rs index f0f69adc..04e61784 100644 --- a/dlc/benches/benchmarks.rs +++ b/ddk-dlc/benches/benchmarks.rs @@ -2,7 +2,7 @@ extern crate bitcoin; extern crate bitcoin_test_utils; -extern crate dlc; +extern crate ddk_dlc; extern crate rayon; extern crate secp256k1_zkp; #[cfg(all(test, feature = "unstable"))] @@ -13,7 +13,7 @@ mod benches { use bitcoin::{ScriptBuf, Transaction}; use bitcoin_test_utils::tx_from_string; - use dlc::*; + use ddk_dlc::*; use rayon::prelude::*; use secp256k1_zkp::{ global::SECP256K1, rand::thread_rng, rand::RngCore, Keypair, Message, PublicKey, SecretKey, diff --git a/dlc/src/channel/mod.rs b/ddk-dlc/src/channel/mod.rs similarity index 100% rename from dlc/src/channel/mod.rs rename to ddk-dlc/src/channel/mod.rs diff --git a/dlc/src/lib.rs b/ddk-dlc/src/lib.rs similarity index 100% rename from dlc/src/lib.rs rename to ddk-dlc/src/lib.rs diff --git a/dlc/src/secp_utils.rs b/ddk-dlc/src/secp_utils.rs similarity index 100% rename from dlc/src/secp_utils.rs rename to ddk-dlc/src/secp_utils.rs diff --git a/dlc/src/util.rs b/ddk-dlc/src/util.rs similarity index 100% rename from dlc/src/util.rs rename to ddk-dlc/src/util.rs diff --git a/dlc-manager/CHANGELOG.md b/ddk-manager/CHANGELOG.md similarity index 100% rename from dlc-manager/CHANGELOG.md rename to ddk-manager/CHANGELOG.md diff --git a/dlc-manager/Cargo.toml b/ddk-manager/Cargo.toml similarity index 60% rename from dlc-manager/Cargo.toml rename to ddk-manager/Cargo.toml index 15bd6b7c..3c1cf80a 100644 --- a/dlc-manager/Cargo.toml +++ b/ddk-manager/Cargo.toml @@ -1,26 +1,26 @@ [package] -authors = ["Crypto Garage"] +authors = ["Crypto Garage", "benny b "] description = "Creation and handling of Discrete Log Contracts (DLC)." edition = "2018" -homepage = "https://github.com/p2pderivatives/rust-dlc" +homepage = "https://github.com/bennyhodl/rust-dlc" license-file = "../LICENSE" -name = "dlc-manager" -repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-manager" +name = "ddk-manager" +repository = "https://github.com/bennyhodl/rust-dlc/tree/master/dlc-manager" version = "0.7.0" [features] default = ["std"] -std = ["dlc/std", "dlc-messages/std", "dlc-trie/std", "bitcoin/std", "lightning/std"] +std = ["ddk-dlc/std", "ddk-messages/std", "ddk-trie/std", "bitcoin/std", "lightning/std"] fuzztarget = ["rand_chacha"] -parallel = ["dlc-trie/parallel"] -use-serde = ["serde", "dlc/use-serde", "dlc-messages/use-serde", "dlc-trie/use-serde"] +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.2", default-features = false } -dlc = { version = "0.7.0", default-features = false, path = "../dlc" } -dlc-messages = { version = "0.7.0", default-features = false, path = "../dlc-messages" } -dlc-trie = { version = "0.7.0", default-features = false, path = "../dlc-trie" } +ddk-dlc = { version = "0.7.0", default-features = false, path = "../ddk-dlc" } +ddk-messages = { version = "0.7.0", default-features = false, path = "../ddk-messages" } +ddk-trie = { version = "0.7.0", default-features = false, path = "../ddk-trie" } hex = { package = "hex-conservative", version = "0.1" } lightning = { version = "0.0.125", default-features = false, features = ["grind_signatures"] } log = "0.4.14" @@ -34,8 +34,8 @@ bitcoin-test-utils = {path = "../bitcoin-test-utils"} bitcoincore-rpc = {version = "0.19"} bitcoincore-rpc-json = {version = "0.19"} criterion = "0.4.0" -dlc-manager = { path = ".", default-features = false, features = ["use-serde"] } -dlc-messages = { path = "../dlc-messages", default-features = false, features = ["serde"] } +ddk-manager = { path = ".", default-features = false, features = ["use-serde"] } +ddk-messages = { path = "../ddk-messages", default-features = false, features = ["serde"] } electrs-blockchain-provider = {path = "../electrs-blockchain-provider"} env_logger = "0.9.1" mocks = {path = "../mocks"} diff --git a/dlc-manager/Readme.md b/ddk-manager/Readme.md similarity index 100% rename from dlc-manager/Readme.md rename to ddk-manager/Readme.md diff --git a/dlc-manager/benches/Readme.md b/ddk-manager/benches/Readme.md similarity index 100% rename from dlc-manager/benches/Readme.md rename to ddk-manager/benches/Readme.md diff --git a/dlc-manager/benches/benchmarks.rs b/ddk-manager/benches/benchmarks.rs similarity index 91% rename from dlc-manager/benches/benchmarks.rs rename to ddk-manager/benches/benchmarks.rs index a8062f14..dacd6ea5 100644 --- a/dlc-manager/benches/benchmarks.rs +++ b/ddk-manager/benches/benchmarks.rs @@ -3,25 +3,25 @@ use bitcoin::OutPoint; use bitcoin::ScriptBuf; use bitcoin::WPubkeyHash; use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use dlc::create_dlc_transactions; -use dlc::DlcTransactions; -use dlc::PartyParams; -use dlc::Payout; -use dlc::TxInputInfo; -use dlc_manager::contract::contract_info::ContractInfo; -use dlc_manager::contract::numerical_descriptor::DifferenceParams; -use dlc_manager::contract::numerical_descriptor::NumericalDescriptor; -use dlc_manager::contract::ContractDescriptor; -use dlc_manager::payout_curve::PayoutFunction; -use dlc_manager::payout_curve::PayoutFunctionPiece; -use dlc_manager::payout_curve::PayoutPoint; -use dlc_manager::payout_curve::PolynomialPayoutCurvePiece; -use dlc_manager::payout_curve::RoundingInterval; -use dlc_manager::payout_curve::RoundingIntervals; -use dlc_messages::oracle_msgs::DigitDecompositionEventDescriptor; -use dlc_messages::oracle_msgs::EventDescriptor; -use dlc_messages::oracle_msgs::OracleAnnouncement; -use dlc_messages::oracle_msgs::OracleEvent; +use ddk_dlc::create_dlc_transactions; +use ddk_dlc::DlcTransactions; +use ddk_dlc::PartyParams; +use ddk_dlc::Payout; +use ddk_dlc::TxInputInfo; +use ddk_manager::contract::contract_info::ContractInfo; +use ddk_manager::contract::numerical_descriptor::DifferenceParams; +use ddk_manager::contract::numerical_descriptor::NumericalDescriptor; +use ddk_manager::contract::ContractDescriptor; +use ddk_manager::payout_curve::PayoutFunction; +use ddk_manager::payout_curve::PayoutFunctionPiece; +use ddk_manager::payout_curve::PayoutPoint; +use ddk_manager::payout_curve::PolynomialPayoutCurvePiece; +use ddk_manager::payout_curve::RoundingInterval; +use ddk_manager::payout_curve::RoundingIntervals; +use ddk_messages::oracle_msgs::DigitDecompositionEventDescriptor; +use ddk_messages::oracle_msgs::EventDescriptor; +use ddk_messages::oracle_msgs::OracleAnnouncement; +use ddk_messages::oracle_msgs::OracleEvent; use secp256k1_zkp::{ global::SECP256K1, rand::thread_rng, schnorr::Signature, Keypair, SecretKey, XOnlyPublicKey, }; @@ -120,7 +120,7 @@ fn create_contract_descriptor() -> ContractDescriptor { rounding_mod: ROUNDING_MOD, }], }, - oracle_numeric_infos: dlc_trie::OracleNumericInfo { + oracle_numeric_infos: ddk_trie::OracleNumericInfo { base: BASE as usize, nb_digits: std::iter::repeat(NB_DIGITS) .take(NB_ORACLES) diff --git a/dlc-manager/src/chain_monitor.rs b/ddk-manager/src/chain_monitor.rs similarity index 99% rename from dlc-manager/src/chain_monitor.rs rename to ddk-manager/src/chain_monitor.rs index 5344da2c..dc50c74f 100644 --- a/dlc-manager/src/chain_monitor.rs +++ b/ddk-manager/src/chain_monitor.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use bitcoin::{Block, OutPoint, Transaction, Txid}; -use dlc_messages::ser_impls::{ +use ddk_messages::ser_impls::{ read_ecdsa_adaptor_signature, read_hash_map, write_ecdsa_adaptor_signature, write_hash_map, }; use lightning::ln::msgs::DecodeError; diff --git a/dlc-manager/src/channel/accepted_channel.rs b/ddk-manager/src/channel/accepted_channel.rs similarity index 98% rename from dlc-manager/src/channel/accepted_channel.rs rename to ddk-manager/src/channel/accepted_channel.rs index 24a43f56..c40dd9af 100644 --- a/dlc-manager/src/channel/accepted_channel.rs +++ b/ddk-manager/src/channel/accepted_channel.rs @@ -1,7 +1,7 @@ //! # Structure and methods for channels that have been accepted. use bitcoin::{ScriptBuf, Transaction}; -use dlc_messages::channel::AcceptChannel; +use ddk_messages::channel::AcceptChannel; use secp256k1_zkp::{EcdsaAdaptorSignature, PublicKey}; use crate::{contract::accepted_contract::AcceptedContract, ChannelId, ContractId}; diff --git a/dlc-manager/src/channel/mod.rs b/ddk-manager/src/channel/mod.rs similarity index 94% rename from dlc-manager/src/channel/mod.rs rename to ddk-manager/src/channel/mod.rs index 93b1c938..ad007d08 100644 --- a/dlc-manager/src/channel/mod.rs +++ b/ddk-manager/src/channel/mod.rs @@ -1,7 +1,7 @@ //! # Module containing structures and methods for working with DLC channels. use bitcoin::{hashes::Hash, Transaction, Txid}; -use dlc_messages::channel::{AcceptChannel, SignChannel}; +use ddk_messages::channel::{AcceptChannel, SignChannel}; use secp256k1_zkp::PublicKey; use crate::{ChannelId, ContractId}; @@ -29,10 +29,10 @@ pub enum Channel { /// A channel whose fund outputs have been signed by the offer party. Signed(SignedChannel), /// A channel that failed when validating an - /// [`dlc_messages::channel::AcceptChannel`] message. + /// [`ddk_messages::channel::AcceptChannel`] message. FailedAccept(FailedAccept), /// A channel that failed when validating an - /// [`dlc_messages::channel::SignChannel`] message. + /// [`ddk_messages::channel::SignChannel`] message. FailedSign(FailedSign), /// A [`OfferedChannel`] that got rejected by the counterparty. Cancelled(OfferedChannel), @@ -95,7 +95,7 @@ impl Channel { } /// A channel that failed when validating an -/// [`dlc_messages::channel::AcceptChannel`] message. +/// [`ddk_messages::channel::AcceptChannel`] message. #[derive(Clone)] pub struct FailedAccept { /// The [`secp256k1_zkp::PublicKey`] of the counter party. @@ -103,14 +103,14 @@ pub struct FailedAccept { /// The temporary [`crate::ChannelId`] of the channel. pub temporary_channel_id: ChannelId, /// An message describing the error encountered while validating the - /// [`dlc_messages::channel::AcceptChannel`] message. + /// [`ddk_messages::channel::AcceptChannel`] message. pub error_message: String, - /// The [`dlc_messages::channel::AcceptChannel`] that was received. + /// The [`ddk_messages::channel::AcceptChannel`] that was received. pub accept_message: AcceptChannel, } /// A channel that failed when validating an -/// [`dlc_messages::channel::SignChannel`] message. +/// [`ddk_messages::channel::SignChannel`] message. #[derive(Clone)] pub struct FailedSign { /// The [`secp256k1_zkp::PublicKey`] of the counter party. @@ -118,9 +118,9 @@ pub struct FailedSign { /// The [`crate::ChannelId`] of the channel. pub channel_id: ChannelId, /// An message describing the error encountered while validating the - /// [`dlc_messages::channel::SignChannel`] message. + /// [`ddk_messages::channel::SignChannel`] message. pub error_message: String, - /// The [`dlc_messages::channel::SignChannel`] that was received. + /// The [`ddk_messages::channel::SignChannel`] that was received. pub sign_message: SignChannel, } diff --git a/dlc-manager/src/channel/offered_channel.rs b/ddk-manager/src/channel/offered_channel.rs similarity index 95% rename from dlc-manager/src/channel/offered_channel.rs rename to ddk-manager/src/channel/offered_channel.rs index 6e082b1f..82dab988 100644 --- a/dlc-manager/src/channel/offered_channel.rs +++ b/ddk-manager/src/channel/offered_channel.rs @@ -1,9 +1,9 @@ //! # A channel is offered when an offer was made or received. This module contains //! the model for it and method for working with it. -use dlc::PartyParams; -use dlc_messages::channel::OfferChannel; -// use dlc_messages::channel::OfferChannel; +use ddk_dlc::PartyParams; +use ddk_messages::channel::OfferChannel; +// use ddk_messages::channel::OfferChannel; use secp256k1_zkp::PublicKey; use crate::{ @@ -19,7 +19,7 @@ use super::party_points::PartyBasePoints; derive(serde::Serialize, serde::Deserialize), serde(rename_all = "camelCase") )] -/// A DLC channel for which an [`dlc_messages::channel::OfferChannel`] message +/// A DLC channel for which an [`ddk_messages::channel::OfferChannel`] message /// was sent or received. pub struct OfferedChannel { /// The temporary [`crate::ContractId`] of the contract that was offered for @@ -73,7 +73,7 @@ impl OfferedChannel { } /// Creates an [`OfferedChannel`] and [`crate::contract::offered_contract::OfferedContract`] - /// from an [`dlc_messages::channel::OfferChannel`] message. Fails if the + /// from an [`ddk_messages::channel::OfferChannel`] message. Fails if the /// transactions provided for funding cannot be decoded or the UTXO information /// are invalid, or if the contract information is invalid. pub fn from_offer_channel( diff --git a/dlc-manager/src/channel/party_points.rs b/ddk-manager/src/channel/party_points.rs similarity index 99% rename from dlc-manager/src/channel/party_points.rs rename to ddk-manager/src/channel/party_points.rs index 88add5a2..73c794f0 100644 --- a/dlc-manager/src/channel/party_points.rs +++ b/ddk-manager/src/channel/party_points.rs @@ -4,7 +4,7 @@ use super::utils::{derive_public_key, derive_public_revocation_key}; use bitcoin::PublicKey as BitcoinPublicKey; -use dlc::channel::RevokeParams; +use ddk_dlc::channel::RevokeParams; use secp256k1_zkp::{All, PublicKey, Secp256k1, Signing, Verification}; /// Base points used by a party of a DLC channel to derive public and private diff --git a/dlc-manager/src/channel/ser.rs b/ddk-manager/src/channel/ser.rs similarity index 95% rename from dlc-manager/src/channel/ser.rs rename to ddk-manager/src/channel/ser.rs index 62d79c2c..ff14249b 100644 --- a/dlc-manager/src/channel/ser.rs +++ b/ddk-manager/src/channel/ser.rs @@ -5,7 +5,7 @@ use super::party_points::PartyBasePoints; use super::signed_channel::{SignedChannel, SignedChannelState}; use super::{ClosedChannel, ClosedPunishedChannel, ClosingChannel, FailedAccept, FailedSign}; -use dlc_messages::ser_impls::{ +use ddk_messages::ser_impls::{ read_ecdsa_adaptor_signature, read_string, write_ecdsa_adaptor_signature, write_string, }; use lightning::ln::msgs::DecodeError; @@ -33,11 +33,11 @@ impl_dlc_writeable!(SignedChannel, { (temporary_channel_id, writeable), (fund_output_index, usize), (own_points, writeable), - (own_params, { cb_writeable, dlc_messages::ser_impls::party_params::write, dlc_messages::ser_impls::party_params::read }), + (own_params, { cb_writeable, ddk_messages::ser_impls::party_params::write, ddk_messages::ser_impls::party_params::read }), (own_per_update_point, writeable), (counter_points, writeable), (counter_per_update_point, writeable), - (counter_params, { cb_writeable, dlc_messages::ser_impls::party_params::write, dlc_messages::ser_impls::party_params::read }), + (counter_params, { cb_writeable, ddk_messages::ser_impls::party_params::write, ddk_messages::ser_impls::party_params::read }), (state, writeable), (update_idx, writeable), (fund_tx, writeable), diff --git a/dlc-manager/src/channel/signed_channel.rs b/ddk-manager/src/channel/signed_channel.rs similarity index 99% rename from dlc-manager/src/channel/signed_channel.rs rename to ddk-manager/src/channel/signed_channel.rs index 82f8b271..ea332392 100644 --- a/dlc-manager/src/channel/signed_channel.rs +++ b/ddk-manager/src/channel/signed_channel.rs @@ -3,7 +3,7 @@ //! the possible states in which it can be as well as methods to work with it. use bitcoin::{ScriptBuf, Transaction}; -use dlc::PartyParams; +use ddk_dlc::PartyParams; use lightning::ln::chan_utils::CounterpartyCommitmentSecrets; use secp256k1_zkp::{ecdsa::Signature, EcdsaAdaptorSignature, PublicKey}; diff --git a/dlc-manager/src/channel/utils.rs b/ddk-manager/src/channel/utils.rs similarity index 100% rename from dlc-manager/src/channel/utils.rs rename to ddk-manager/src/channel/utils.rs diff --git a/dlc-manager/src/channel_updater.rs b/ddk-manager/src/channel_updater.rs similarity index 98% rename from dlc-manager/src/channel_updater.rs rename to ddk-manager/src/channel_updater.rs index e55d475c..3faec908 100644 --- a/dlc-manager/src/channel_updater.rs +++ b/ddk-manager/src/channel_updater.rs @@ -26,11 +26,11 @@ use crate::{ Wallet, }; use bitcoin::{OutPoint, Script, ScriptBuf, Sequence, Transaction, TxIn, Witness}; -use dlc::{ +use ddk_dlc::{ channel::{get_tx_adaptor_signature, verify_tx_adaptor_signature, DlcChannelTransactions}, PartyParams, }; -use dlc_messages::{ +use ddk_messages::{ channel::{ AcceptChannel, CollaborativeCloseOffer, Reject, RenewAccept, RenewConfirm, RenewFinalize, RenewOffer, RenewRevoke, SettleAccept, SettleConfirm, SettleFinalize, SettleOffer, @@ -200,7 +200,7 @@ where buffer_transaction, buffer_script_pubkey, dlc_transactions, - } = dlc::channel::create_channel_transactions( + } = ddk_dlc::channel::create_channel_transactions( &offered_contract.offer_params, &accept_params, &offer_revoke_params, @@ -334,7 +334,7 @@ where buffer_transaction, dlc_transactions, buffer_script_pubkey, - } = dlc::channel::create_channel_transactions( + } = ddk_dlc::channel::create_channel_transactions( &offered_contract.offer_params, &accept_params, &offer_revoke_params, @@ -1291,7 +1291,7 @@ where buffer_transaction, buffer_script_pubkey, dlc_transactions, - } = dlc::channel::create_renewal_channel_transactions( + } = ddk_dlc::channel::create_renewal_channel_transactions( &offered_contract.offer_params, &signed_channel.own_params, &offer_revoke_params, @@ -1393,7 +1393,7 @@ where buffer_transaction, dlc_transactions, buffer_script_pubkey, - } = dlc::channel::create_renewal_channel_transactions( + } = ddk_dlc::channel::create_renewal_channel_transactions( &offered_contract.offer_params, &signed_channel.counter_params, &offer_revoke_params, @@ -1797,7 +1797,7 @@ where let offer_payout = total_collateral - counter_payout; let fund_output_value = signed_channel.fund_tx.output[signed_channel.fund_output_index].value; - let close_tx = dlc::channel::create_collaborative_close_transaction( + let close_tx = ddk_dlc::channel::create_collaborative_close_transaction( &signed_channel.own_params, offer_payout, &signed_channel.counter_params, @@ -1814,7 +1814,7 @@ where .ok_or(Error::InvalidState("No keys_id available".to_string()))?; let contract_signer = signer_provider.derive_contract_signer(keys_id)?; - let close_signature = dlc::util::get_raw_sig_for_tx_input( + let close_signature = ddk_dlc::util::get_raw_sig_for_tx_input( secp, &close_tx, 0, @@ -1872,7 +1872,7 @@ where let offer_payout = total_collateral - close_offer.counter_payout; let fund_output_value = signed_channel.fund_tx.output[signed_channel.fund_output_index].value; - let close_tx = dlc::channel::create_collaborative_close_transaction( + let close_tx = ddk_dlc::channel::create_collaborative_close_transaction( &signed_channel.counter_params, offer_payout, &signed_channel.own_params, @@ -1923,7 +1923,7 @@ where let mut close_tx = close_tx.clone(); - dlc::util::sign_multi_sig_input( + ddk_dlc::util::sign_multi_sig_input( secp, &mut close_tx, offer_signature, @@ -1989,7 +1989,7 @@ fn get_settle_tx_and_adaptor_sig( accept_per_update_point, ); - let settle_tx = dlc::channel::create_settle_transaction( + let settle_tx = ddk_dlc::channel::create_settle_transaction( &fund_tx_in, &offer_revoke_params, &accept_revoke_params, @@ -2019,7 +2019,7 @@ fn get_settle_tx_and_adaptor_sig( offer_revoke_params.publish_pk.inner }; - let settle_adaptor_signature = dlc::channel::get_tx_adaptor_signature( + let settle_adaptor_signature = ddk_dlc::channel::get_tx_adaptor_signature( secp, &settle_tx, fund_tx.output[fund_vout].value.to_sat(), @@ -2088,7 +2088,7 @@ where let buffer_input_sk = signer.get_secret_key_for_pubkey(&signed_channel.own_params.fund_pubkey)?; - dlc::util::sign_multi_sig_input( + ddk_dlc::util::sign_multi_sig_input( secp, &mut buffer_transaction, &counter_buffer_signature, @@ -2200,7 +2200,7 @@ where let base_secret = signer.get_secret_key_for_pubkey(own_basepoint)?; let own_sk = derive_private_key(secp, own_per_update_point, &base_secret); - dlc::channel::sign_cet( + ddk_dlc::channel::sign_cet( secp, &mut cet, buffer_transaction.output[0].value.to_sat(), @@ -2257,7 +2257,7 @@ where let fund_sk = signer.get_secret_key_for_pubkey(&signed_channel.own_params.fund_pubkey)?; - dlc::util::sign_multi_sig_input( + ddk_dlc::util::sign_multi_sig_input( secp, &mut settle_tx, &counter_settle_signature, diff --git a/dlc-manager/src/contract/accepted_contract.rs b/ddk-manager/src/contract/accepted_contract.rs similarity index 98% rename from dlc-manager/src/contract/accepted_contract.rs rename to ddk-manager/src/contract/accepted_contract.rs index 6e507170..5279136b 100644 --- a/dlc-manager/src/contract/accepted_contract.rs +++ b/ddk-manager/src/contract/accepted_contract.rs @@ -3,8 +3,8 @@ use super::offered_contract::OfferedContract; use super::AdaptorInfo; use bitcoin::Transaction; -use dlc::{DlcTransactions, PartyParams}; -use dlc_messages::{AcceptDlc, FundingInput}; +use ddk_dlc::{DlcTransactions, PartyParams}; +use ddk_messages::{AcceptDlc, FundingInput}; use secp256k1_zkp::ecdsa::Signature; use secp256k1_zkp::EcdsaAdaptorSignature; diff --git a/dlc-manager/src/contract/contract_info.rs b/ddk-manager/src/contract/contract_info.rs similarity index 98% rename from dlc-manager/src/contract/contract_info.rs rename to ddk-manager/src/contract/contract_info.rs index 8c1ece79..827750bf 100644 --- a/dlc-manager/src/contract/contract_info.rs +++ b/ddk-manager/src/contract/contract_info.rs @@ -6,9 +6,9 @@ use crate::error::Error; use crate::ContractSigner; use bitcoin::hashes::Hash; use bitcoin::{Script, Transaction}; -use dlc::{OracleInfo, Payout}; -use dlc_messages::oracle_msgs::{EventDescriptor, OracleAnnouncement}; -use dlc_trie::{DlcTrie, RangeInfo}; +use ddk_dlc::{OracleInfo, Payout}; +use ddk_messages::oracle_msgs::{EventDescriptor, OracleAnnouncement}; +use ddk_trie::{DlcTrie, RangeInfo}; use secp256k1_zkp::{ All, EcdsaAdaptorSignature, Message, PublicKey, Secp256k1, SecretKey, Verification, }; @@ -298,7 +298,7 @@ impl ContractInfo { bitcoin::hashes::sha256::Hash::hash(j.to_string().as_bytes()) .to_byte_array(); let msg = Message::from_digest(hash); - let sig_point = dlc::secp_utils::schnorrsig_compute_sig_point( + let sig_point = ddk_dlc::secp_utils::schnorrsig_compute_sig_point( secp, pubkey, nonce, &msg, )?; points.push(sig_point); diff --git a/dlc-manager/src/contract/contract_input.rs b/ddk-manager/src/contract/contract_input.rs similarity index 98% rename from dlc-manager/src/contract/contract_input.rs rename to ddk-manager/src/contract/contract_input.rs index ad5ed1af..821c0f6f 100644 --- a/dlc-manager/src/contract/contract_input.rs +++ b/ddk-manager/src/contract/contract_input.rs @@ -96,14 +96,14 @@ impl ContractInput { contract_info.oracles.validate()?; } - dlc::util::validate_fee_rate(self.fee_rate) + ddk_dlc::util::validate_fee_rate(self.fee_rate) .map_err(|_| Error::InvalidParameters("Fee rate too high.".to_string())) } } #[cfg(test)] mod tests { - use dlc::{EnumerationPayout, Payout}; + use ddk_dlc::{EnumerationPayout, Payout}; use secp256k1_zkp::{Keypair, SecretKey, SECP256K1}; use crate::contract::enum_descriptor::EnumDescriptor; diff --git a/dlc-manager/src/contract/enum_descriptor.rs b/ddk-manager/src/contract/enum_descriptor.rs similarity index 92% rename from dlc-manager/src/contract/enum_descriptor.rs rename to ddk-manager/src/contract/enum_descriptor.rs index bb5c4bff..5cfda297 100644 --- a/dlc-manager/src/contract/enum_descriptor.rs +++ b/ddk-manager/src/contract/enum_descriptor.rs @@ -6,10 +6,10 @@ use super::AdaptorInfo; use crate::error::Error; use bitcoin::hashes::Hash; use bitcoin::{Script, Transaction}; -use dlc::OracleInfo; -use dlc::{EnumerationPayout, Payout}; -use dlc_messages::oracle_msgs::EnumEventDescriptor; -use dlc_trie::{combination_iterator::CombinationIterator, RangeInfo}; +use ddk_dlc::OracleInfo; +use ddk_dlc::{EnumerationPayout, Payout}; +use ddk_messages::oracle_msgs::EnumEventDescriptor; +use ddk_trie::{combination_iterator::CombinationIterator, RangeInfo}; use secp256k1_zkp::{ All, EcdsaAdaptorSignature, Message, PublicKey, Secp256k1, SecretKey, Verification, }; @@ -121,13 +121,13 @@ impl EnumDescriptor { cets: &[Transaction], adaptor_sigs: &[EcdsaAdaptorSignature], adaptor_sig_start: usize, - ) -> Result { + ) -> Result { let mut adaptor_sig_index = adaptor_sig_start; let mut callback = - |adaptor_point: &PublicKey, cet_index: usize| -> Result<(), dlc::Error> { + |adaptor_point: &PublicKey, cet_index: usize| -> Result<(), ddk_dlc::Error> { let sig = adaptor_sigs[adaptor_sig_index]; adaptor_sig_index += 1; - dlc::verify_cet_adaptor_sig_from_point( + ddk_dlc::verify_cet_adaptor_sig_from_point( secp, &sig, &cets[cet_index], @@ -156,7 +156,7 @@ impl EnumDescriptor { cets: &[Transaction], adaptor_sigs: &[EcdsaAdaptorSignature], adaptor_sig_start: usize, - ) -> Result<(AdaptorInfo, usize), dlc::Error> { + ) -> Result<(AdaptorInfo, usize), ddk_dlc::Error> { let adaptor_sig_index = self.verify_adaptor_info( secp, oracle_infos, @@ -209,8 +209,8 @@ impl EnumDescriptor { ) -> Result, Error> { let mut adaptor_sigs = Vec::new(); let mut callback = - |adaptor_point: &PublicKey, cet_index: usize| -> Result<(), dlc::Error> { - let sig = dlc::create_cet_adaptor_sig_from_point( + |adaptor_point: &PublicKey, cet_index: usize| -> Result<(), ddk_dlc::Error> { + let sig = ddk_dlc::create_cet_adaptor_sig_from_point( secp, &cets[cet_index], adaptor_point, @@ -233,9 +233,9 @@ impl EnumDescriptor { oracle_infos: &[OracleInfo], threshold: usize, callback: &mut F, - ) -> Result<(), dlc::Error> + ) -> Result<(), ddk_dlc::Error> where - F: FnMut(&PublicKey, usize) -> Result<(), dlc::Error>, + F: FnMut(&PublicKey, usize) -> Result<(), ddk_dlc::Error>, { let messages: Vec>> = self .outcome_payouts @@ -263,7 +263,7 @@ impl EnumDescriptor { } }) .collect(); - let adaptor_point = dlc::get_adaptor_point_from_oracle_info( + let adaptor_point = ddk_dlc::get_adaptor_point_from_oracle_info( secp, &cur_oracle_infos, outcome_messages, diff --git a/dlc-manager/src/contract/mod.rs b/ddk-manager/src/contract/mod.rs similarity index 98% rename from dlc-manager/src/contract/mod.rs rename to ddk-manager/src/contract/mod.rs index 155cee03..9f4a35ca 100644 --- a/dlc-manager/src/contract/mod.rs +++ b/ddk-manager/src/contract/mod.rs @@ -3,12 +3,12 @@ use crate::error::Error; use crate::ContractId; use bitcoin::Transaction; -use dlc_messages::{ +use ddk_messages::{ oracle_msgs::{EventDescriptor, OracleAnnouncement, OracleAttestation}, AcceptDlc, SignDlc, }; -use dlc_trie::multi_oracle_trie::MultiOracleTrie; -use dlc_trie::multi_oracle_trie_with_diff::MultiOracleTrieWithDiff; +use ddk_trie::multi_oracle_trie::MultiOracleTrie; +use ddk_trie::multi_oracle_trie_with_diff::MultiOracleTrieWithDiff; use secp256k1_zkp::PublicKey; #[cfg(feature = "use-serde")] use serde::{Deserialize, Serialize}; diff --git a/dlc-manager/src/contract/numerical_descriptor.rs b/ddk-manager/src/contract/numerical_descriptor.rs similarity index 97% rename from dlc-manager/src/contract/numerical_descriptor.rs rename to ddk-manager/src/contract/numerical_descriptor.rs index 6ae535b7..075efa30 100644 --- a/dlc-manager/src/contract/numerical_descriptor.rs +++ b/ddk-manager/src/contract/numerical_descriptor.rs @@ -4,10 +4,10 @@ use super::AdaptorInfo; use crate::error::Error; use crate::payout_curve::{PayoutFunction, RoundingIntervals}; use bitcoin::{Script, Transaction}; -use dlc::{Payout, RangePayout}; -use dlc_trie::multi_oracle_trie::MultiOracleTrie; -use dlc_trie::multi_oracle_trie_with_diff::MultiOracleTrieWithDiff; -use dlc_trie::{DlcTrie, OracleNumericInfo}; +use ddk_dlc::{Payout, RangePayout}; +use ddk_trie::multi_oracle_trie::MultiOracleTrie; +use ddk_trie::multi_oracle_trie_with_diff::MultiOracleTrieWithDiff; +use ddk_trie::{DlcTrie, OracleNumericInfo}; use secp256k1_zkp::{All, EcdsaAdaptorSignature, PublicKey, Secp256k1, SecretKey}; #[cfg(feature = "use-serde")] use serde::{Deserialize, Serialize}; diff --git a/dlc-manager/src/contract/offered_contract.rs b/ddk-manager/src/contract/offered_contract.rs similarity index 97% rename from dlc-manager/src/contract/offered_contract.rs rename to ddk-manager/src/contract/offered_contract.rs index 6f40badb..66efa8ab 100644 --- a/dlc-manager/src/contract/offered_contract.rs +++ b/ddk-manager/src/contract/offered_contract.rs @@ -9,9 +9,9 @@ use super::contract_info::ContractInfo; use super::contract_input::ContractInput; use super::ContractDescriptor; use crate::{ContractId, KeysId}; -use dlc::PartyParams; -use dlc_messages::oracle_msgs::OracleAnnouncement; -use dlc_messages::{FundingInput, OfferDlc}; +use ddk_dlc::PartyParams; +use ddk_messages::oracle_msgs::OracleAnnouncement; +use ddk_messages::{FundingInput, OfferDlc}; use secp256k1_zkp::PublicKey; /// Contains information about a contract that was offered. @@ -53,7 +53,7 @@ impl OfferedContract { /// Validate that the contract info covers all the possible outcomes that /// can be attested by the oracle(s). pub fn validate(&self) -> Result<(), crate::error::Error> { - dlc::util::validate_fee_rate(self.fee_rate_per_vb).map_err(|_| { + ddk_dlc::util::validate_fee_rate(self.fee_rate_per_vb).map_err(|_| { crate::error::Error::InvalidParameters("Fee rate is too high".to_string()) })?; diff --git a/dlc-manager/src/contract/ser.rs b/ddk-manager/src/contract/ser.rs similarity index 94% rename from dlc-manager/src/contract/ser.rs rename to ddk-manager/src/contract/ser.rs index d05655ab..e3efe374 100644 --- a/dlc-manager/src/contract/ser.rs +++ b/ddk-manager/src/contract/ser.rs @@ -15,16 +15,16 @@ use crate::payout_curve::{ HyperbolaPayoutCurvePiece, PayoutFunction, PayoutFunctionPiece, PayoutPoint, PolynomialPayoutCurvePiece, RoundingInterval, RoundingIntervals, }; -use dlc::DlcTransactions; -use dlc_messages::ser_impls::{ +use ddk_dlc::DlcTransactions; +use ddk_messages::ser_impls::{ read_ecdsa_adaptor_signatures, read_option_cb, read_usize, read_vec, read_vec_cb, write_ecdsa_adaptor_signatures, write_option_cb, write_usize, write_vec, write_vec_cb, }; -use dlc_trie::digit_trie::{DigitNodeData, DigitTrieDump}; -use dlc_trie::multi_oracle_trie::{MultiOracleTrie, MultiOracleTrieDump}; -use dlc_trie::multi_oracle_trie_with_diff::{MultiOracleTrieWithDiff, MultiOracleTrieWithDiffDump}; -use dlc_trie::multi_trie::{MultiTrieDump, MultiTrieNodeData, TrieNodeInfo}; -use dlc_trie::{OracleNumericInfo, RangeInfo}; +use ddk_trie::digit_trie::{DigitNodeData, DigitTrieDump}; +use ddk_trie::multi_oracle_trie::{MultiOracleTrie, MultiOracleTrieDump}; +use ddk_trie::multi_oracle_trie_with_diff::{MultiOracleTrieWithDiff, MultiOracleTrieWithDiffDump}; +use ddk_trie::multi_trie::{MultiTrieDump, MultiTrieNodeData, TrieNodeInfo}; +use ddk_trie::{OracleNumericInfo, RangeInfo}; use lightning::io::Read; use lightning::ln::msgs::DecodeError; use lightning::util::ser::{Readable, Writeable, Writer}; @@ -83,14 +83,14 @@ impl_dlc_writeable!(ContractInfo, { (contract_descriptor, writeable), (oracle_an impl_dlc_writeable!(EnumDescriptor, { ( outcome_payouts, - {vec_cb, dlc_messages::ser_impls::enum_payout::write, dlc_messages::ser_impls::enum_payout::read} + {vec_cb, ddk_messages::ser_impls::enum_payout::write, ddk_messages::ser_impls::enum_payout::read} ) }); impl_dlc_writeable!(OfferedContract, { (id, writeable), (is_offer_party, writeable), (contract_info, vec), - (offer_params, { cb_writeable, dlc_messages::ser_impls::party_params::write, dlc_messages::ser_impls::party_params::read }), + (offer_params, { cb_writeable, ddk_messages::ser_impls::party_params::write, ddk_messages::ser_impls::party_params::read }), (total_collateral, writeable), (funding_inputs, vec), (fund_output_serial_id, writeable), @@ -111,7 +111,7 @@ impl_dlc_writeable_external!( ); impl_dlc_writeable!(AcceptedContract, { (offered_contract, writeable), - (accept_params, { cb_writeable, dlc_messages::ser_impls::party_params::write, dlc_messages::ser_impls::party_params::read }), + (accept_params, { cb_writeable, ddk_messages::ser_impls::party_params::write, ddk_messages::ser_impls::party_params::read }), (funding_inputs, vec), (adaptor_infos, vec), (adaptor_signatures, {option_cb, write_ecdsa_adaptor_signatures, read_ecdsa_adaptor_signatures }), diff --git a/dlc-manager/src/contract/signed_contract.rs b/ddk-manager/src/contract/signed_contract.rs similarity index 91% rename from dlc-manager/src/contract/signed_contract.rs rename to ddk-manager/src/contract/signed_contract.rs index f392a892..bcc8bc61 100644 --- a/dlc-manager/src/contract/signed_contract.rs +++ b/ddk-manager/src/contract/signed_contract.rs @@ -4,10 +4,10 @@ use crate::conversion_utils::PROTOCOL_VERSION; use crate::ChannelId; use super::accepted_contract::AcceptedContract; -use dlc_messages::CetAdaptorSignature; -use dlc_messages::CetAdaptorSignatures; -use dlc_messages::FundingSignatures; -use dlc_messages::SignDlc; +use ddk_messages::CetAdaptorSignature; +use ddk_messages::CetAdaptorSignatures; +use ddk_messages::FundingSignatures; +use ddk_messages::SignDlc; use secp256k1_zkp::ecdsa::Signature; use secp256k1_zkp::EcdsaAdaptorSignature; diff --git a/dlc-manager/src/contract/utils.rs b/ddk-manager/src/contract/utils.rs similarity index 100% rename from dlc-manager/src/contract/utils.rs rename to ddk-manager/src/contract/utils.rs diff --git a/dlc-manager/src/contract_updater.rs b/ddk-manager/src/contract_updater.rs similarity index 97% rename from dlc-manager/src/contract_updater.rs rename to ddk-manager/src/contract_updater.rs index 939da0c3..64c6860c 100644 --- a/dlc-manager/src/contract_updater.rs +++ b/ddk-manager/src/contract_updater.rs @@ -4,9 +4,9 @@ use std::ops::Deref; use bitcoin::psbt::Psbt; use bitcoin::{consensus::Decodable, Script, Transaction, Witness}; -use dlc::{DlcTransactions, PartyParams}; -use dlc_messages::FundingInput; -use dlc_messages::{ +use ddk_dlc::{DlcTransactions, PartyParams}; +use ddk_messages::FundingInput; +use ddk_messages::{ oracle_msgs::{OracleAnnouncement, OracleAttestation}, AcceptDlc, FundingSignature, FundingSignatures, OfferDlc, SignDlc, WitnessElement, }; @@ -101,7 +101,7 @@ where blockchain, )?; - let dlc_transactions = dlc::create_dlc_transactions( + let dlc_transactions = ddk_dlc::create_dlc_transactions( &offered_contract.offer_params, &accept_params, &offered_contract.contract_info[0].get_payouts(total_collateral)?, @@ -171,7 +171,7 @@ pub(crate) fn accept_contract_internal( for contract_info in offered_contract.contract_info.iter().skip(1) { let payouts = contract_info.get_payouts(total_collateral)?; - let tmp_cets = dlc::create_cets( + let tmp_cets = ddk_dlc::create_cets( &cet_input, &offered_contract.offer_params.payout_script_pubkey, offered_contract.offer_params.payout_serial_id, @@ -197,7 +197,7 @@ pub(crate) fn accept_contract_internal( adaptor_sigs.extend(adaptor_sig); } - let refund_signature = dlc::util::get_raw_sig_for_tx_input( + let refund_signature = ddk_dlc::util::get_raw_sig_for_tx_input( secp, refund, 0, @@ -262,7 +262,7 @@ where let total_collateral = offered_contract.total_collateral; - let dlc_transactions = dlc::create_dlc_transactions( + let dlc_transactions = ddk_dlc::create_dlc_transactions( &offered_contract.offer_params, &accept_params, &offered_contract.contract_info[0].get_payouts(total_collateral)?, @@ -348,7 +348,7 @@ where let input_script_pubkey = input_script_pubkey.unwrap_or_else(|| funding_script_pubkey); let counter_adaptor_pk = counter_adaptor_pk.unwrap_or(accept_params.fund_pubkey); - dlc::verify_tx_input_sig( + ddk_dlc::verify_tx_input_sig( secp, refund_signature, refund, @@ -379,7 +379,7 @@ where for contract_info in offered_contract.contract_info.iter().skip(1) { let payouts = contract_info.get_payouts(total_collateral)?; - let tmp_cets = dlc::create_cets( + let tmp_cets = ddk_dlc::create_cets( &cet_input, &offered_contract.offer_params.payout_script_pubkey, offered_contract.offer_params.payout_serial_id, @@ -477,7 +477,7 @@ where }) .collect::, Error>>()?; - let offer_refund_signature = dlc::util::get_raw_sig_for_tx_input( + let offer_refund_signature = ddk_dlc::util::get_raw_sig_for_tx_input( secp, refund, 0, @@ -566,7 +566,7 @@ where let counter_adaptor_pk = counter_adaptor_pk.unwrap_or(accepted_contract.offered_contract.offer_params.fund_pubkey); - dlc::verify_tx_input_sig( + ddk_dlc::verify_tx_input_sig( secp, refund_signature, &accepted_contract.dlc_transactions.refund, @@ -696,7 +696,7 @@ where let funding_sk = signer.get_secret_key()?; - dlc::sign_cet( + ddk_dlc::sign_cet( secp, &mut cet, &adaptor_sigs[range_info.adaptor_index], @@ -745,7 +745,7 @@ where let fund_priv_key = signer.get_secret_key()?; let mut refund = accepted_contract.dlc_transactions.refund.clone(); - dlc::util::sign_multi_sig_input( + ddk_dlc::util::sign_multi_sig_input( secp, &mut refund, other_sig, @@ -762,7 +762,7 @@ where mod tests { use std::rc::Rc; - use mocks::dlc_manager::contract::offered_contract::OfferedContract; + use mocks::ddk_manager::contract::offered_contract::OfferedContract; use secp256k1_zkp::PublicKey; #[test] @@ -785,7 +785,7 @@ mod tests { &[utxo_value, 10000], )); - mocks::dlc_manager::contract_updater::accept_contract( + mocks::ddk_manager::contract_updater::accept_contract( secp256k1_zkp::SECP256K1, &offered_contract, &wallet, diff --git a/dlc-manager/src/conversion_utils.rs b/ddk-manager/src/conversion_utils.rs similarity index 99% rename from dlc-manager/src/conversion_utils.rs rename to ddk-manager/src/conversion_utils.rs index b7f15202..c72011ae 100644 --- a/dlc-manager/src/conversion_utils.rs +++ b/ddk-manager/src/conversion_utils.rs @@ -10,12 +10,12 @@ use crate::payout_curve::{ PolynomialPayoutCurvePiece, RoundingInterval, RoundingIntervals, }; use bitcoin::{consensus::encode::Decodable, Amount, OutPoint, Transaction}; -use dlc::{EnumerationPayout, Payout, TxInputInfo}; -use dlc_messages::oracle_msgs::{ +use ddk_dlc::{EnumerationPayout, Payout, TxInputInfo}; +use ddk_messages::oracle_msgs::{ MultiOracleInfo, OracleInfo as SerOracleInfo, OracleParams, SingleOracleInfo, }; -use dlc_messages::FundingInput; -use dlc_messages::{ +use ddk_messages::FundingInput; +use ddk_messages::{ contract_msgs::{ ContractDescriptor as SerContractDescriptor, ContractInfo as SerContractInfo, ContractInfoInner, ContractOutcome, DisjointContractInfo, EnumeratedContractDescriptor, @@ -28,7 +28,7 @@ use dlc_messages::{ }, oracle_msgs::EventDescriptor, }; -use dlc_trie::OracleNumericInfo; +use ddk_trie::OracleNumericInfo; use std::fmt; pub(crate) const BITCOIN_CHAINHASH: [u8; 32] = [ diff --git a/dlc-manager/src/error.rs b/ddk-manager/src/error.rs similarity index 96% rename from dlc-manager/src/error.rs rename to ddk-manager/src/error.rs index 9f0ff5c4..325bf901 100644 --- a/dlc-manager/src/error.rs +++ b/ddk-manager/src/error.rs @@ -24,7 +24,7 @@ pub enum Error { /// The oracle component encountered an error. OracleError(String), /// An error occurred in the DLC library. - DlcError(dlc::Error), + DlcError(ddk_dlc::Error), /// An error occurred in the Secp library. SecpError(secp256k1_zkp::Error), } @@ -53,8 +53,8 @@ impl From for Error { } } -impl From for Error { - fn from(e: dlc::Error) -> Error { +impl From for Error { + fn from(e: ddk_dlc::Error) -> Error { Error::DlcError(e) } } diff --git a/dlc-manager/src/lib.rs b/ddk-manager/src/lib.rs similarity index 98% rename from dlc-manager/src/lib.rs rename to ddk-manager/src/lib.rs index b5250c00..62670a1b 100644 --- a/dlc-manager/src/lib.rs +++ b/ddk-manager/src/lib.rs @@ -1,7 +1,7 @@ //! # Library providing data structures and functions supporting the execution //! and management of DLC. -#![crate_name = "dlc_manager"] +#![crate_name = "ddk_manager"] // Coding conventions #![forbid(unsafe_code)] #![deny(non_upper_case_globals)] @@ -14,11 +14,11 @@ extern crate async_trait; extern crate bitcoin; -extern crate dlc; +extern crate ddk_dlc; #[macro_use] -extern crate dlc_messages; +extern crate ddk_messages; extern crate core; -extern crate dlc_trie; +extern crate ddk_trie; extern crate lightning; extern crate log; #[cfg(feature = "fuzztarget")] @@ -44,8 +44,8 @@ use channel::signed_channel::{SignedChannel, SignedChannelStateType}; use channel::Channel; use contract::PreClosedContract; use contract::{offered_contract::OfferedContract, signed_contract::SignedContract, Contract}; -use dlc_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; -use dlc_messages::ser_impls::{read_address, write_address}; +use ddk_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; +use ddk_messages::ser_impls::{read_address, write_address}; use error::Error; use lightning::ln::msgs::DecodeError; use lightning::util::ser::{Readable, Writeable, Writer}; diff --git a/dlc-manager/src/manager.rs b/ddk-manager/src/manager.rs similarity index 99% rename from dlc-manager/src/manager.rs rename to ddk-manager/src/manager.rs index 8662d15f..860549ed 100644 --- a/dlc-manager/src/manager.rs +++ b/ddk-manager/src/manager.rs @@ -24,13 +24,13 @@ use bitcoin::consensus::encode::serialize_hex; use bitcoin::consensus::Decodable; use bitcoin::Address; use bitcoin::{OutPoint, Transaction}; -use dlc_messages::channel::{ +use ddk_messages::channel::{ AcceptChannel, CollaborativeCloseOffer, OfferChannel, Reject, RenewAccept, RenewConfirm, RenewFinalize, RenewOffer, RenewRevoke, SettleAccept, SettleConfirm, SettleFinalize, SettleOffer, SignChannel, }; -use dlc_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; -use dlc_messages::{AcceptDlc, Message as DlcMessage, OfferDlc, SignDlc}; +use ddk_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; +use ddk_messages::{AcceptDlc, Message as DlcMessage, OfferDlc, SignDlc}; use hex::DisplayHex; use lightning::chain::chaininterface::FeeEstimator; use lightning::ln::chan_utils::{ @@ -2259,7 +2259,7 @@ where let signed_tx = match revoked_tx_type { RevokedTxType::Buffer => { - dlc::channel::create_and_sign_punish_buffer_transaction( + ddk_dlc::channel::create_and_sign_punish_buffer_transaction( &self.secp, offer_params, accept_params, @@ -2273,7 +2273,7 @@ where )? } RevokedTxType::Settle => { - dlc::channel::create_and_sign_punish_settle_transaction( + ddk_dlc::channel::create_and_sign_punish_settle_transaction( &self.secp, offer_params, accept_params, @@ -2594,9 +2594,9 @@ where #[cfg(test)] mod test { - use dlc_messages::Message; + use ddk_messages::Message; use mocks::{ - dlc_manager::{manager::Manager, CachedContractSignerProvider, Oracle, SimpleSigner}, + ddk_manager::{manager::Manager, CachedContractSignerProvider, Oracle, SimpleSigner}, memory_storage_provider::MemoryStorage, mock_blockchain::MockBlockchain, mock_oracle_provider::MockOracle, diff --git a/dlc-manager/src/payout_curve.rs b/ddk-manager/src/payout_curve.rs similarity index 99% rename from dlc-manager/src/payout_curve.rs rename to ddk-manager/src/payout_curve.rs index 6d06677c..abad38ed 100644 --- a/dlc-manager/src/payout_curve.rs +++ b/ddk-manager/src/payout_curve.rs @@ -3,7 +3,7 @@ use std::ops::Deref; use crate::error::Error; -use dlc::{Payout, RangePayout}; +use ddk_dlc::{Payout, RangePayout}; #[cfg(feature = "use-serde")] use serde::{Deserialize, Serialize}; diff --git a/dlc-manager/src/utils.rs b/ddk-manager/src/utils.rs similarity index 96% rename from dlc-manager/src/utils.rs rename to ddk-manager/src/utils.rs index f206b4fa..eed67a27 100644 --- a/dlc-manager/src/utils.rs +++ b/ddk-manager/src/utils.rs @@ -2,12 +2,12 @@ use std::ops::Deref; use bitcoin::{consensus::Encodable, Amount, Txid}; -use dlc::{PartyParams, TxInputInfo}; -use dlc_messages::{ +use ddk_dlc::{PartyParams, TxInputInfo}; +use ddk_messages::{ oracle_msgs::{OracleAnnouncement, OracleAttestation}, FundingInput, }; -use dlc_trie::RangeInfo; +use ddk_trie::RangeInfo; #[cfg(not(feature = "fuzztarget"))] use secp256k1_zkp::rand::{thread_rng, Rng, RngCore}; use secp256k1_zkp::{PublicKey, Secp256k1, Signing}; @@ -111,8 +111,9 @@ where let change_serial_id = get_new_serial_id(); // Add base cost of fund tx + CET / 2 and a CET output to the collateral. - let appr_required_amount = - own_collateral + get_half_common_fee(fee_rate)? + dlc::util::weight_to_fee(124, fee_rate)?; + let appr_required_amount = own_collateral + + get_half_common_fee(fee_rate)? + + ddk_dlc::util::weight_to_fee(124, fee_rate)?; let utxos = wallet.get_utxos_for_amount(appr_required_amount, fee_rate, true)?; let mut funding_inputs: Vec = Vec::new(); @@ -171,7 +172,7 @@ where } pub(crate) fn get_half_common_fee(fee_rate: u64) -> Result { - let common_fee = dlc::util::get_common_fee(fee_rate)?; + let common_fee = ddk_dlc::util::get_common_fee(fee_rate)?; Ok((common_fee as f64 / 2_f64).ceil() as u64) } @@ -218,7 +219,7 @@ pub(crate) fn get_latest_maturity_date( mod tests { use std::str::FromStr; - use dlc_messages::oracle_msgs::{EnumEventDescriptor, EventDescriptor, OracleEvent}; + use ddk_messages::oracle_msgs::{EnumEventDescriptor, EventDescriptor, OracleEvent}; use secp256k1_zkp::{ rand::{thread_rng, RngCore}, schnorr::Signature, diff --git a/dlc-manager/test_inputs/Accepted b/ddk-manager/test_inputs/Accepted similarity index 100% rename from dlc-manager/test_inputs/Accepted rename to ddk-manager/test_inputs/Accepted diff --git a/dlc-manager/test_inputs/offer_channel.json b/ddk-manager/test_inputs/offer_channel.json similarity index 100% rename from dlc-manager/test_inputs/offer_channel.json rename to ddk-manager/test_inputs/offer_channel.json diff --git a/dlc-manager/test_inputs/offer_contract.json b/ddk-manager/test_inputs/offer_contract.json similarity index 100% rename from dlc-manager/test_inputs/offer_contract.json rename to ddk-manager/test_inputs/offer_contract.json diff --git a/dlc-manager/test_inputs/offer_enum_collateral_not_equal_payout.json b/ddk-manager/test_inputs/offer_enum_collateral_not_equal_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_enum_collateral_not_equal_payout.json rename to ddk-manager/test_inputs/offer_enum_collateral_not_equal_payout.json diff --git a/dlc-manager/test_inputs/offer_enum_missing_payout.json b/ddk-manager/test_inputs/offer_enum_missing_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_enum_missing_payout.json rename to ddk-manager/test_inputs/offer_enum_missing_payout.json diff --git a/dlc-manager/test_inputs/offer_enum_oracle_with_diff_payout.json b/ddk-manager/test_inputs/offer_enum_oracle_with_diff_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_enum_oracle_with_diff_payout.json rename to ddk-manager/test_inputs/offer_enum_oracle_with_diff_payout.json diff --git a/dlc-manager/test_inputs/offer_numerical_bad_first_payout.json b/ddk-manager/test_inputs/offer_numerical_bad_first_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_bad_first_payout.json rename to ddk-manager/test_inputs/offer_numerical_bad_first_payout.json diff --git a/dlc-manager/test_inputs/offer_numerical_bad_last_payout.json b/ddk-manager/test_inputs/offer_numerical_bad_last_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_bad_last_payout.json rename to ddk-manager/test_inputs/offer_numerical_bad_last_payout.json diff --git a/dlc-manager/test_inputs/offer_numerical_collateral_less_than_payout.json b/ddk-manager/test_inputs/offer_numerical_collateral_less_than_payout.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_collateral_less_than_payout.json rename to ddk-manager/test_inputs/offer_numerical_collateral_less_than_payout.json diff --git a/dlc-manager/test_inputs/offer_numerical_empty_rounding_interval.json b/ddk-manager/test_inputs/offer_numerical_empty_rounding_interval.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_empty_rounding_interval.json rename to ddk-manager/test_inputs/offer_numerical_empty_rounding_interval.json diff --git a/dlc-manager/test_inputs/offer_numerical_invalid_rounding_interval.json b/ddk-manager/test_inputs/offer_numerical_invalid_rounding_interval.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_invalid_rounding_interval.json rename to ddk-manager/test_inputs/offer_numerical_invalid_rounding_interval.json diff --git a/dlc-manager/test_inputs/offer_numerical_non_continuous.json b/ddk-manager/test_inputs/offer_numerical_non_continuous.json similarity index 100% rename from dlc-manager/test_inputs/offer_numerical_non_continuous.json rename to ddk-manager/test_inputs/offer_numerical_non_continuous.json diff --git a/dlc-manager/tests/channel_execution_tests.rs b/ddk-manager/tests/channel_execution_tests.rs similarity index 98% rename from dlc-manager/tests/channel_execution_tests.rs rename to ddk-manager/tests/channel_execution_tests.rs index 05da7bb5..abcfeae0 100644 --- a/dlc-manager/tests/channel_execution_tests.rs +++ b/ddk-manager/tests/channel_execution_tests.rs @@ -4,14 +4,14 @@ mod test_utils; use bitcoin::Amount; use bitcoin_test_utils::rpc_helpers::init_clients; use bitcoincore_rpc::RpcApi; -use dlc_manager::contract::contract_input::ContractInput; -use dlc_manager::manager::Manager; -use dlc_manager::{ +use ddk_manager::contract::contract_input::ContractInput; +use ddk_manager::manager::Manager; +use ddk_manager::{ channel::Channel, contract::Contract, Blockchain, CachedContractSignerProvider, Oracle, SimpleSigner, Storage, Wallet, }; -use dlc_manager::{ChannelId, ContractId}; -use dlc_messages::Message; +use ddk_manager::{ChannelId, ContractId}; +use ddk_messages::Message; use electrs_blockchain_provider::ElectrsBlockchainProvider; use lightning::util::ser::Writeable; use mocks::memory_storage_provider::MemoryStorage; @@ -820,7 +820,7 @@ fn close_established_channel( periodic_check(first.clone()); - let wait = dlc_manager::manager::CET_NSEQUENCE; + let wait = ddk_manager::manager::CET_NSEQUENCE; generate_blocks(10); @@ -1250,7 +1250,7 @@ fn renew_timeout( if let TestPath::RenewOfferTimeout = path { mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(first.clone()); @@ -1271,7 +1271,7 @@ fn renew_timeout( if let TestPath::RenewAcceptTimeout = path { mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(second.clone()); @@ -1280,7 +1280,7 @@ fn renew_timeout( // Process Confirm second_receive.recv().expect("Error synchronizing"); mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(first.clone()); @@ -1291,7 +1291,7 @@ fn renew_timeout( // Process Finalize first_receive.recv().expect("Error synchronizing"); mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(second.clone()); generate_blocks(289); @@ -1327,7 +1327,7 @@ fn settle_timeout( if let TestPath::SettleOfferTimeout = path { mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(first.clone()); @@ -1348,7 +1348,7 @@ fn settle_timeout( if let TestPath::SettleAcceptTimeout = path { mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(second.clone()); @@ -1363,7 +1363,7 @@ fn settle_timeout( // Process Confirm second_receive.recv().expect("Error synchronizing"); mocks::mock_time::set_time( - (EVENT_MATURITY as u64) + dlc_manager::manager::PEER_TIMEOUT + 2, + (EVENT_MATURITY as u64) + ddk_manager::manager::PEER_TIMEOUT + 2, ); periodic_check(first.clone()); diff --git a/dlc-manager/tests/manager_execution_tests.rs b/ddk-manager/tests/manager_execution_tests.rs similarity index 97% rename from dlc-manager/tests/manager_execution_tests.rs rename to ddk-manager/tests/manager_execution_tests.rs index cc2743e1..8ea4509b 100644 --- a/dlc-manager/tests/manager_execution_tests.rs +++ b/ddk-manager/tests/manager_execution_tests.rs @@ -2,26 +2,26 @@ extern crate bitcoin_rpc_provider; extern crate bitcoin_test_utils; extern crate bitcoincore_rpc; extern crate bitcoincore_rpc_json; -extern crate dlc_manager; +extern crate ddk_manager; #[macro_use] #[allow(dead_code)] mod test_utils; use bitcoin::Amount; -use dlc_manager::payout_curve::PayoutFunctionPiece; +use ddk_manager::payout_curve::PayoutFunctionPiece; use electrs_blockchain_provider::ElectrsBlockchainProvider; use simple_wallet::SimpleWallet; use test_utils::*; use bitcoin_test_utils::rpc_helpers::init_clients; use bitcoincore_rpc::RpcApi; -use dlc_manager::contract::{numerical_descriptor::DifferenceParams, Contract}; -use dlc_manager::manager::Manager; -use dlc_manager::{Blockchain, Oracle, Storage, Wallet}; -use dlc_messages::oracle_msgs::OracleAttestation; -use dlc_messages::{AcceptDlc, OfferDlc, SignDlc}; -use dlc_messages::{CetAdaptorSignatures, Message}; +use ddk_manager::contract::{numerical_descriptor::DifferenceParams, Contract}; +use ddk_manager::manager::Manager; +use ddk_manager::{Blockchain, Oracle, Storage, Wallet}; +use ddk_messages::oracle_msgs::OracleAttestation; +use ddk_messages::{AcceptDlc, OfferDlc, SignDlc}; +use ddk_messages::{CetAdaptorSignatures, Message}; use lightning::ln::wire::Type; use lightning::util::ser::Writeable; use secp256k1_zkp::rand::{thread_rng, RngCore}; @@ -41,8 +41,8 @@ struct TestVectorPart { #[cfg_attr( feature = "use-serde", serde( - serialize_with = "dlc_messages::serde_utils::serialize_hex", - deserialize_with = "dlc_messages::serde_utils::deserialize_hex_string" + serialize_with = "ddk_messages::serde_utils::serialize_hex", + deserialize_with = "ddk_messages::serde_utils::deserialize_hex_string" ) )] serialized: Vec, @@ -880,7 +880,7 @@ fn manager_execution_test(test_params: TestParams, path: TestPath, manual_close: periodic_check!(second, contract_id, Confirmed); mocks::mock_time::set_time( - ((EVENT_MATURITY + dlc_manager::manager::REFUND_DELAY) as u64) + 1, + ((EVENT_MATURITY + ddk_manager::manager::REFUND_DELAY) as u64) + 1, ); generate_blocks(10); diff --git a/dlc-manager/tests/test_utils.rs b/ddk-manager/tests/test_utils.rs similarity index 98% rename from dlc-manager/tests/test_utils.rs rename to ddk-manager/tests/test_utils.rs index bb1a7cf8..9f87b6b3 100644 --- a/dlc-manager/tests/test_utils.rs +++ b/ddk-manager/tests/test_utils.rs @@ -4,16 +4,16 @@ extern crate bitcoin_rpc_provider; extern crate bitcoin_test_utils; extern crate bitcoincore_rpc; extern crate bitcoincore_rpc_json; -extern crate dlc_manager; +extern crate ddk_manager; use std::ops::Deref; -use dlc::{EnumerationPayout, Payout}; -use dlc_manager::payout_curve::{ +use ddk_dlc::{EnumerationPayout, Payout}; +use ddk_manager::payout_curve::{ PayoutFunction, PayoutFunctionPiece, PayoutPoint, PolynomialPayoutCurvePiece, RoundingInterval, RoundingIntervals, }; -use dlc_manager::{ +use ddk_manager::{ contract::{ contract_input::{ContractInput, ContractInputInfo, OracleInput}, enum_descriptor::EnumDescriptor, @@ -22,11 +22,11 @@ use dlc_manager::{ }, payout_curve::HyperbolaPayoutCurvePiece, }; -use dlc_manager::{Blockchain, Oracle}; -use dlc_messages::oracle_msgs::{ +use ddk_manager::{Blockchain, Oracle}; +use ddk_messages::oracle_msgs::{ DigitDecompositionEventDescriptor, EnumEventDescriptor, EventDescriptor, }; -use dlc_trie::{digit_decomposition::decompose_value, OracleNumericInfo}; +use ddk_trie::{digit_decomposition::decompose_value, OracleNumericInfo}; use mocks::mock_oracle_provider::MockOracle; use secp256k1_zkp::rand::{seq::SliceRandom, thread_rng, RngCore}; use simple_wallet::{WalletBlockchainProvider, WalletStorage}; @@ -158,7 +158,7 @@ macro_rules! assert_channel_state_unlocked { .get_channel(&$id) .expect("Could not retrieve channel"); if let Some(Channel::$p(c)) = res { - $(if let dlc_manager::channel::signed_channel::SignedChannelState::$s { .. } = c.state { + $(if let ddk_manager::channel::signed_channel::SignedChannelState::$s { .. } = c.state { } else { panic!("Unexpected signed channel state {:?}", c.state); })? diff --git a/dlc-messages/CHANGELOG.md b/ddk-messages/CHANGELOG.md similarity index 100% rename from dlc-messages/CHANGELOG.md rename to ddk-messages/CHANGELOG.md diff --git a/dlc-messages/Cargo.toml b/ddk-messages/Cargo.toml similarity index 61% rename from dlc-messages/Cargo.toml rename to ddk-messages/Cargo.toml index 27ac3fdb..36cbfbba 100644 --- a/dlc-messages/Cargo.toml +++ b/ddk-messages/Cargo.toml @@ -1,28 +1,28 @@ [package] -authors = ["Crypto Garage"] +authors = ["Crypto Garage", "benny b "] description = "Structs and serialization for the Discreet Log Contract (DLC) protocol." -homepage = "https://github.com/p2pderivatives/rust-dlc" +homepage = "https://github.com/bennyhodl/rust-dlc" license-file = "../LICENSE" -name = "dlc-messages" -repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-messages" +name = "ddk-messages" +repository = "https://github.com/bennyhodl/rust-dlc/tree/master/dlc-messages" version = "0.7.0" [features] default = ["std"] -std = ["dlc/std", "bitcoin/std", "lightning/std"] -no-std = ["dlc/no-std", "lightning/no-std"] +std = ["ddk-dlc/std", "bitcoin/std", "lightning/std"] +no-std = ["ddk-dlc/no-std", "lightning/no-std"] use-serde = ["serde", "secp256k1-zkp/serde", "bitcoin/serde"] [dependencies] bitcoin = { version = "0.32.2", default-features = false } -dlc = { version = "0.7.0", path = "../dlc", default-features = false } +ddk-dlc = { version = "0.7.0", path = "../ddk-dlc", default-features = false } lightning = { version = "0.0.125", default-features = false } secp256k1-zkp = {version = "0.11.0"} serde = {version = "1.0", features = ["derive"], optional = true} [dev-dependencies] bitcoin = { version = "0.32.2", default-features = false, features = ["serde"] } -dlc-messages = {path = "./", default-features = false, features = ["use-serde"]} +ddk-messages = {path = "./", default-features = false, features = ["use-serde"]} secp256k1-zkp = {version = "0.11.0", features = ["serde", "global-context"]} serde = {version = "1.0", features = ["derive"]} serde_json = "1.0" diff --git a/dlc-messages/Readme.md b/ddk-messages/Readme.md similarity index 100% rename from dlc-messages/Readme.md rename to ddk-messages/Readme.md diff --git a/dlc-messages/src/channel.rs b/ddk-messages/src/channel.rs similarity index 99% rename from dlc-messages/src/channel.rs rename to ddk-messages/src/channel.rs index c631a154..98346989 100644 --- a/dlc-messages/src/channel.rs +++ b/ddk-messages/src/channel.rs @@ -1,7 +1,7 @@ //! Contains messages used for the establishment and update of DLC channels. use bitcoin::ScriptBuf; -use dlc::Error; +use ddk_dlc::Error; use lightning::ln::msgs::DecodeError; use lightning::util::ser::{Readable, Writeable, Writer}; use secp256k1_zkp::{ diff --git a/dlc-messages/src/compatibility_tests.rs b/ddk-messages/src/compatibility_tests.rs similarity index 99% rename from dlc-messages/src/compatibility_tests.rs rename to ddk-messages/src/compatibility_tests.rs index 6704e5b3..fbf86f04 100644 --- a/dlc-messages/src/compatibility_tests.rs +++ b/ddk-messages/src/compatibility_tests.rs @@ -1,6 +1,6 @@ extern crate bitcoin; extern crate bitcoin_test_utils; -extern crate dlc; +extern crate ddk_dlc; extern crate lightning; extern crate secp256k1; @@ -12,7 +12,7 @@ use bitcoin::consensus::encode::Decodable; use bitcoin::SigHashType; use bitcoin::{Address, OutPoint, Script, Transaction, Txid, VarInt}; use bitcoin_test_utils::*; -use dlc::{DlcTransactions, OracleInfo as DlcOracleInfo, PartyParams, Payout, TxInputInfo}; +use ddk_dlc::{DlcTransactions, OracleInfo as DlcOracleInfo, PartyParams, Payout, TxInputInfo}; use lightning::ln::wire::{write, Encode}; use lightning::util::ser::Writeable; use secp256k1::{ diff --git a/dlc-messages/src/contract_msgs.rs b/ddk-messages/src/contract_msgs.rs similarity index 100% rename from dlc-messages/src/contract_msgs.rs rename to ddk-messages/src/contract_msgs.rs diff --git a/dlc-messages/src/lib.rs b/ddk-messages/src/lib.rs similarity index 99% rename from dlc-messages/src/lib.rs rename to ddk-messages/src/lib.rs index 719350af..04846540 100644 --- a/dlc-messages/src/lib.rs +++ b/ddk-messages/src/lib.rs @@ -11,7 +11,7 @@ #![deny(missing_docs)] extern crate bitcoin; -extern crate dlc; +extern crate ddk_dlc; extern crate lightning; extern crate secp256k1_zkp; #[macro_use] @@ -44,7 +44,7 @@ use channel::{ SettleOffer, SignChannel, }; use contract_msgs::ContractInfo; -use dlc::{Error, TxInputInfo}; +use ddk_dlc::{Error, TxInputInfo}; use lightning::ln::msgs::DecodeError; use lightning::ln::wire::Type; use lightning::util::ser::{Readable, Writeable, Writer}; diff --git a/dlc-messages/src/message_handler.rs b/ddk-messages/src/message_handler.rs similarity index 100% rename from dlc-messages/src/message_handler.rs rename to ddk-messages/src/message_handler.rs diff --git a/dlc-messages/src/oracle_msgs.rs b/ddk-messages/src/oracle_msgs.rs similarity index 98% rename from dlc-messages/src/oracle_msgs.rs rename to ddk-messages/src/oracle_msgs.rs index 5b470c89..f10669b2 100644 --- a/dlc-messages/src/oracle_msgs.rs +++ b/ddk-messages/src/oracle_msgs.rs @@ -5,7 +5,7 @@ use crate::ser_impls::{ write_i32, write_schnorr_pubkey, write_schnorrsig, write_strings_u16, }; use bitcoin::hashes::Hash; -use dlc::{Error, OracleInfo as DlcOracleInfo}; +use ddk_dlc::{Error, OracleInfo as DlcOracleInfo}; use lightning::ln::msgs::DecodeError; use lightning::ln::wire::Type; use lightning::util::ser::{Readable, Writeable, Writer}; @@ -353,7 +353,7 @@ impl OracleAttestation { secp.verify_schnorr(sig, &msg, &self.oracle_public_key) .map_err(|_| Error::InvalidArgument)?; - Ok::<(), dlc::Error>(()) + Ok::<(), ddk_dlc::Error>(()) })?; if !self @@ -575,7 +575,7 @@ mod tests { let hash = bitcoin::hashes::sha256::Hash::hash("1".as_bytes()); let msg = Message::from_digest(hash.to_byte_array()); - let sig = dlc::secp_utils::schnorrsig_sign_with_nonce( + let sig = ddk_dlc::secp_utils::schnorrsig_sign_with_nonce( SECP256K1, &msg, &key_pair, @@ -624,7 +624,7 @@ mod tests { let hash = bitcoin::hashes::sha256::Hash::hash("1".as_bytes()); let msg = Message::from_digest(hash.to_byte_array()); - let sig = dlc::secp_utils::schnorrsig_sign_with_nonce( + let sig = ddk_dlc::secp_utils::schnorrsig_sign_with_nonce( SECP256K1, &msg, &key_pair, diff --git a/dlc-messages/src/segmentation/mod.rs b/ddk-messages/src/segmentation/mod.rs similarity index 100% rename from dlc-messages/src/segmentation/mod.rs rename to ddk-messages/src/segmentation/mod.rs diff --git a/dlc-messages/src/segmentation/segment_reader.rs b/ddk-messages/src/segmentation/segment_reader.rs similarity index 100% rename from dlc-messages/src/segmentation/segment_reader.rs rename to ddk-messages/src/segmentation/segment_reader.rs diff --git a/dlc-messages/src/ser_impls.rs b/ddk-messages/src/ser_impls.rs similarity index 99% rename from dlc-messages/src/ser_impls.rs rename to ddk-messages/src/ser_impls.rs index e34bb0d4..f8205fba 100644 --- a/dlc-messages/src/ser_impls.rs +++ b/ddk-messages/src/ser_impls.rs @@ -2,7 +2,7 @@ use bitcoin::Address; use bitcoin::Network; -use dlc::{EnumerationPayout, PartyParams, Payout, TxInputInfo}; +use ddk_dlc::{EnumerationPayout, PartyParams, Payout, TxInputInfo}; use lightning::io::Read; use lightning::ln::msgs::DecodeError; use lightning::ln::wire::Type; diff --git a/dlc-messages/src/ser_macros.rs b/ddk-messages/src/ser_macros.rs similarity index 100% rename from dlc-messages/src/ser_macros.rs rename to ddk-messages/src/ser_macros.rs diff --git a/dlc-messages/src/serde_utils.rs b/ddk-messages/src/serde_utils.rs similarity index 100% rename from dlc-messages/src/serde_utils.rs rename to ddk-messages/src/serde_utils.rs diff --git a/dlc-messages/src/test_inputs/accept_msg.json b/ddk-messages/src/test_inputs/accept_msg.json similarity index 100% rename from dlc-messages/src/test_inputs/accept_msg.json rename to ddk-messages/src/test_inputs/accept_msg.json diff --git a/dlc-messages/src/test_inputs/dlc_fee_test.json b/ddk-messages/src/test_inputs/dlc_fee_test.json similarity index 100% rename from dlc-messages/src/test_inputs/dlc_fee_test.json rename to ddk-messages/src/test_inputs/dlc_fee_test.json diff --git a/dlc-messages/src/test_inputs/dlc_fee_test_scripts.json b/ddk-messages/src/test_inputs/dlc_fee_test_scripts.json similarity index 100% rename from dlc-messages/src/test_inputs/dlc_fee_test_scripts.json rename to ddk-messages/src/test_inputs/dlc_fee_test_scripts.json diff --git a/dlc-messages/src/test_inputs/dlc_test.json b/ddk-messages/src/test_inputs/dlc_test.json similarity index 100% rename from dlc-messages/src/test_inputs/dlc_test.json rename to ddk-messages/src/test_inputs/dlc_test.json diff --git a/dlc-messages/src/test_inputs/dlc_tx_test.json b/ddk-messages/src/test_inputs/dlc_tx_test.json similarity index 100% rename from dlc-messages/src/test_inputs/dlc_tx_test.json rename to ddk-messages/src/test_inputs/dlc_tx_test.json diff --git a/dlc-messages/src/test_inputs/offer_msg.json b/ddk-messages/src/test_inputs/offer_msg.json similarity index 100% rename from dlc-messages/src/test_inputs/offer_msg.json rename to ddk-messages/src/test_inputs/offer_msg.json diff --git a/dlc-messages/src/test_inputs/offer_msg_disjoint.json b/ddk-messages/src/test_inputs/offer_msg_disjoint.json similarity index 100% rename from dlc-messages/src/test_inputs/offer_msg_disjoint.json rename to ddk-messages/src/test_inputs/offer_msg_disjoint.json diff --git a/dlc-messages/src/test_inputs/segment_chunk_msg.json b/ddk-messages/src/test_inputs/segment_chunk_msg.json similarity index 100% rename from dlc-messages/src/test_inputs/segment_chunk_msg.json rename to ddk-messages/src/test_inputs/segment_chunk_msg.json diff --git a/dlc-messages/src/test_inputs/segment_start_msg.json b/ddk-messages/src/test_inputs/segment_start_msg.json similarity index 100% rename from dlc-messages/src/test_inputs/segment_start_msg.json rename to ddk-messages/src/test_inputs/segment_start_msg.json diff --git a/dlc-messages/src/test_inputs/sign_msg.json b/ddk-messages/src/test_inputs/sign_msg.json similarity index 100% rename from dlc-messages/src/test_inputs/sign_msg.json rename to ddk-messages/src/test_inputs/sign_msg.json diff --git a/dlc-trie/CHANGELOG.md b/ddk-trie/CHANGELOG.md similarity index 100% rename from dlc-trie/CHANGELOG.md rename to ddk-trie/CHANGELOG.md diff --git a/dlc-trie/Cargo.toml b/ddk-trie/Cargo.toml similarity index 53% rename from dlc-trie/Cargo.toml rename to ddk-trie/Cargo.toml index 23bfbbba..91b60d71 100644 --- a/dlc-trie/Cargo.toml +++ b/ddk-trie/Cargo.toml @@ -1,22 +1,22 @@ [package] -authors = ["Crypto Garage"] +authors = ["Crypto Garage", "benny b "] description = "Data structures for storage and retrival of numerical Discreet Log Contracts (DLC)." -homepage = "https://github.com/p2pderivatives/rust-dlc" +homepage = "https://github.com/bennyhodl/rust-dlc" license-file = "../LICENSE" -name = "dlc-trie" -repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-trie" +name = "ddk-trie" +repository = "https://github.com/bennyhodl/rust-dlc/tree/master/dlc-trie" version = "0.7.0" [features] default = ["std"] -std = ["dlc/std", "bitcoin/std"] -no-std = ["dlc/no-std"] +std = ["ddk-dlc/std", "bitcoin/std"] +no-std = ["ddk-dlc/no-std"] parallel = ["rayon"] -use-serde = ["serde", "dlc/use-serde"] +use-serde = ["serde", "ddk-dlc/use-serde"] [dependencies] bitcoin = { version = "0.32.2", default-features = false } -dlc = {version = "0.7.0", default-features = false, path = "../dlc"} +ddk-dlc = {version = "0.7.0", default-features = false, path = "../ddk-dlc"} rayon = {version = "1.5", optional = true} secp256k1-zkp = {version = "0.11.0" } serde = {version = "1.0", optional = true, default-features = false, features = ["derive"]} diff --git a/dlc-trie/Readme.md b/ddk-trie/Readme.md similarity index 100% rename from dlc-trie/Readme.md rename to ddk-trie/Readme.md diff --git a/dlc-trie/src/combination_iterator.rs b/ddk-trie/src/combination_iterator.rs similarity index 100% rename from dlc-trie/src/combination_iterator.rs rename to ddk-trie/src/combination_iterator.rs diff --git a/dlc-trie/src/digit_decomposition.rs b/ddk-trie/src/digit_decomposition.rs similarity index 99% rename from dlc-trie/src/digit_decomposition.rs rename to ddk-trie/src/digit_decomposition.rs index b40f50e6..22bbb38e 100644 --- a/dlc-trie/src/digit_decomposition.rs +++ b/ddk-trie/src/digit_decomposition.rs @@ -1,6 +1,6 @@ //! Utility functions to decompose numeric outcome values -use dlc::{Payout, RangePayout}; +use ddk_dlc::{Payout, RangePayout}; /// Decompose a numeric value into digits in the specified base. If the decomposed /// value contains less than `nb_digits`, zeroes will be prepended to reach `nb_digits` @@ -195,7 +195,7 @@ pub fn group_by_ignoring_digits( #[cfg(test)] mod tests { - use dlc::{Payout, RangePayout}; + use ddk_dlc::{Payout, RangePayout}; struct DecompositionTestCase { composed: usize, decomposed: Vec, diff --git a/dlc-trie/src/digit_trie.rs b/ddk-trie/src/digit_trie.rs similarity index 99% rename from dlc-trie/src/digit_trie.rs rename to ddk-trie/src/digit_trie.rs index 6f035a4d..ff357b78 100644 --- a/dlc-trie/src/digit_trie.rs +++ b/ddk-trie/src/digit_trie.rs @@ -2,7 +2,7 @@ //! Data structure to store and lookup digit decomposition data. use crate::{LookupResult, Node}; -use dlc::Error; +use ddk_dlc::Error; /// Structure to store data inserted and looked-up based on digit paths. #[derive(Clone)] diff --git a/dlc-trie/src/lib.rs b/ddk-trie/src/lib.rs similarity index 97% rename from dlc-trie/src/lib.rs rename to ddk-trie/src/lib.rs index 1522a922..38187d91 100644 --- a/dlc-trie/src/lib.rs +++ b/ddk-trie/src/lib.rs @@ -1,7 +1,7 @@ //! # Dlc-trie //! Package for storing and retrieving DLC data using tries. -#![crate_name = "dlc_trie"] +#![crate_name = "ddk_trie"] // Coding conventions #![forbid(unsafe_code)] #![deny(non_upper_case_globals)] @@ -13,7 +13,7 @@ #![deny(missing_docs)] extern crate bitcoin; -extern crate dlc; +extern crate ddk_dlc; #[cfg(feature = "parallel")] extern crate rayon; extern crate secp256k1_zkp; @@ -21,7 +21,7 @@ extern crate secp256k1_zkp; extern crate serde; use bitcoin::{Script, Transaction}; -use dlc::{Error, RangePayout}; +use ddk_dlc::{Error, RangePayout}; #[cfg(feature = "parallel")] use rayon::prelude::*; use secp256k1_zkp::{All, EcdsaAdaptorSignature, PublicKey, Secp256k1, SecretKey}; @@ -240,7 +240,7 @@ fn sign_helper>( &x.paths, precomputed_points, )?; - let adaptor_sig = dlc::create_cet_adaptor_sig_from_point( + let adaptor_sig = ddk_dlc::create_cet_adaptor_sig_from_point( secp, &cets[x.value.cet_index], &adaptor_point, @@ -274,7 +274,7 @@ fn sign_helper>( &x.paths, precomputed_points, )?; - let adaptor_sig = dlc::create_cet_adaptor_sig_from_point( + let adaptor_sig = ddk_dlc::create_cet_adaptor_sig_from_point( secp, &cets[x.value.cet_index], &adaptor_point, @@ -309,7 +309,7 @@ fn verify_helper>( if x.value.adaptor_index > max_adaptor_index { max_adaptor_index = x.value.adaptor_index; } - dlc::verify_cet_adaptor_sig_from_point( + ddk_dlc::verify_cet_adaptor_sig_from_point( secp, &adaptor_sig, cet, @@ -343,7 +343,7 @@ fn verify_helper>( utils::get_adaptor_point_for_indexed_paths(&x.indexes, &x.paths, precomputed_points)?; let adaptor_sig = adaptor_sigs[x.value.adaptor_index]; let cet = &cets[x.value.cet_index]; - dlc::verify_cet_adaptor_sig_from_point( + ddk_dlc::verify_cet_adaptor_sig_from_point( secp, &adaptor_sig, cet, diff --git a/dlc-trie/src/multi_oracle.rs b/ddk-trie/src/multi_oracle.rs similarity index 100% rename from dlc-trie/src/multi_oracle.rs rename to ddk-trie/src/multi_oracle.rs diff --git a/dlc-trie/src/multi_oracle_trie.rs b/ddk-trie/src/multi_oracle_trie.rs similarity index 99% rename from dlc-trie/src/multi_oracle_trie.rs rename to ddk-trie/src/multi_oracle_trie.rs index 20f979a2..ed71ccc8 100644 --- a/dlc-trie/src/multi_oracle_trie.rs +++ b/ddk-trie/src/multi_oracle_trie.rs @@ -9,7 +9,7 @@ use crate::digit_trie::{DigitTrie, DigitTrieDump, DigitTrieIter}; use crate::multi_trie::{MultiTrie, MultiTrieDump, MultiTrieIterator}; use crate::utils::{get_value_callback, pre_pad_vec}; use crate::{DlcTrie, IndexedPath, LookupResult, OracleNumericInfo, RangeInfo, TrieIterInfo}; -use dlc::{Error, RangePayout}; +use ddk_dlc::{Error, RangePayout}; /// Data structure used to store adaptor signature information for numerical /// outcome DLC with t of n oracles where at least t oracles need to sign the @@ -259,7 +259,7 @@ impl<'a> DlcTrie<'a, MultiOracleTrieIter<'a>> for MultiOracleTrie { Ok(trie_infos) } - fn iter(&'a self) -> MultiOracleTrieIter { + fn iter(&'a self) -> MultiOracleTrieIter<'a> { let digit_trie_iterator = DigitTrieIter::new(&self.digit_trie); let extra_cover_trie_iterator = self.extra_cover_trie.as_ref().map(MultiTrieIterator::new); MultiOracleTrieIter { @@ -358,7 +358,7 @@ impl<'a> Iterator for MultiOracleTrieIter<'a> { #[cfg(test)] mod tests { - use dlc::{Payout, RangePayout}; + use ddk_dlc::{Payout, RangePayout}; use crate::{test_utils::get_variable_oracle_numeric_infos, DlcTrie}; diff --git a/dlc-trie/src/multi_oracle_trie_with_diff.rs b/ddk-trie/src/multi_oracle_trie_with_diff.rs similarity index 99% rename from dlc-trie/src/multi_oracle_trie_with_diff.rs rename to ddk-trie/src/multi_oracle_trie_with_diff.rs index 67c87c76..dd1b4a8a 100644 --- a/dlc-trie/src/multi_oracle_trie_with_diff.rs +++ b/ddk-trie/src/multi_oracle_trie_with_diff.rs @@ -8,7 +8,7 @@ use crate::multi_trie::{MultiTrie, MultiTrieDump, MultiTrieIterator}; use crate::utils::get_value_callback; use crate::{DlcTrie, OracleNumericInfo, RangeInfo, TrieIterInfo}; -use dlc::{Error, RangePayout}; +use ddk_dlc::{Error, RangePayout}; /// Data structure used to store adaptor signature information for numerical /// outcome DLC with multiple oracles where some difference between the outcomes @@ -167,7 +167,7 @@ impl<'a> Iterator for MultiOracleTrieWithDiffIter<'a> { #[cfg(test)] mod tests { - use dlc::{Payout, RangePayout}; + use ddk_dlc::{Payout, RangePayout}; use crate::{test_utils::get_variable_oracle_numeric_infos, DlcTrie}; diff --git a/dlc-trie/src/multi_trie.rs b/ddk-trie/src/multi_trie.rs similarity index 99% rename from dlc-trie/src/multi_trie.rs rename to ddk-trie/src/multi_trie.rs index e7b8760a..77cba119 100644 --- a/dlc-trie/src/multi_trie.rs +++ b/ddk-trie/src/multi_trie.rs @@ -6,8 +6,8 @@ use crate::{ LookupResult, Node, OracleNumericInfo, }; use combination_iterator::CombinationIterator; +use ddk_dlc::Error; use digit_trie::{DigitTrie, DigitTrieDump, DigitTrieIter}; -use dlc::Error; use multi_oracle::compute_outcome_combinations; #[derive(Clone, Debug)] diff --git a/dlc-trie/src/test_utils.rs b/ddk-trie/src/test_utils.rs similarity index 100% rename from dlc-trie/src/test_utils.rs rename to ddk-trie/src/test_utils.rs diff --git a/dlc-trie/src/utils.rs b/ddk-trie/src/utils.rs similarity index 99% rename from dlc-trie/src/utils.rs rename to ddk-trie/src/utils.rs index e559fcff..0384baaa 100644 --- a/dlc-trie/src/utils.rs +++ b/ddk-trie/src/utils.rs @@ -1,6 +1,6 @@ //! Utility functions when working with DLC trie -use dlc::Error; +use ddk_dlc::Error; use secp256k1_zkp::PublicKey; use crate::{ diff --git a/dlc-sled-storage-provider/Cargo.toml b/dlc-sled-storage-provider/Cargo.toml index 6a747954..756244f7 100644 --- a/dlc-sled-storage-provider/Cargo.toml +++ b/dlc-sled-storage-provider/Cargo.toml @@ -13,7 +13,7 @@ wallet = ["bitcoin", "secp256k1-zkp", "simple-wallet"] [dependencies] bitcoin = {version = "0.32.2", optional = true} -dlc-manager = {path = "../dlc-manager"} +ddk-manager = {path = "../ddk-manager"} lightning = "0.0.125" secp256k1-zkp = {version = "0.11.0", optional = true} simple-wallet = {path = "../simple-wallet", optional = true} diff --git a/dlc-sled-storage-provider/src/lib.rs b/dlc-sled-storage-provider/src/lib.rs index 470e958f..100d02c3 100644 --- a/dlc-sled-storage-provider/src/lib.rs +++ b/dlc-sled-storage-provider/src/lib.rs @@ -11,28 +11,28 @@ #![deny(unused_imports)] #![deny(missing_docs)] -extern crate dlc_manager; +extern crate ddk_manager; extern crate sled; #[cfg(feature = "wallet")] use bitcoin::{address::NetworkUnchecked, Address, Txid}; -use dlc_manager::chain_monitor::ChainMonitor; -use dlc_manager::channel::accepted_channel::AcceptedChannel; -use dlc_manager::channel::offered_channel::OfferedChannel; -use dlc_manager::channel::signed_channel::{SignedChannel, SignedChannelStateType}; -use dlc_manager::channel::{ +use ddk_manager::chain_monitor::ChainMonitor; +use ddk_manager::channel::accepted_channel::AcceptedChannel; +use ddk_manager::channel::offered_channel::OfferedChannel; +use ddk_manager::channel::signed_channel::{SignedChannel, SignedChannelStateType}; +use ddk_manager::channel::{ Channel, ClosedChannel, ClosedPunishedChannel, ClosingChannel, FailedAccept, FailedSign, }; -use dlc_manager::contract::accepted_contract::AcceptedContract; -use dlc_manager::contract::offered_contract::OfferedContract; -use dlc_manager::contract::ser::Serializable; -use dlc_manager::contract::signed_contract::SignedContract; -use dlc_manager::contract::{ +use ddk_manager::contract::accepted_contract::AcceptedContract; +use ddk_manager::contract::offered_contract::OfferedContract; +use ddk_manager::contract::ser::Serializable; +use ddk_manager::contract::signed_contract::SignedContract; +use ddk_manager::contract::{ ClosedContract, Contract, FailedAcceptContract, FailedSignContract, PreClosedContract, }; #[cfg(feature = "wallet")] -use dlc_manager::Utxo; -use dlc_manager::{error::Error, ContractId, Storage}; +use ddk_manager::Utxo; +use ddk_manager::{error::Error, ContractId, Storage}; use lightning::io::{Cursor, Read}; #[cfg(feature = "wallet")] use lightning::util::ser::{Readable, Writeable}; @@ -343,14 +343,14 @@ impl Storage for SledStorageProvider { Ok(()) } - fn delete_channel(&self, channel_id: &dlc_manager::ChannelId) -> Result<(), Error> { + fn delete_channel(&self, channel_id: &ddk_manager::ChannelId) -> Result<(), Error> { self.channel_tree()? .remove(channel_id) .map_err(to_storage_error)?; Ok(()) } - fn get_channel(&self, channel_id: &dlc_manager::ChannelId) -> Result, Error> { + fn get_channel(&self, channel_id: &ddk_manager::ChannelId) -> Result, Error> { match self .channel_tree()? .get(channel_id) @@ -394,7 +394,7 @@ impl Storage for SledStorageProvider { .map_err(|e| Error::StorageError(format!("Error writing chain monitor: {}", e)))?; Ok(()) } - fn get_chain_monitor(&self) -> Result, dlc_manager::error::Error> { + fn get_chain_monitor(&self) -> Result, ddk_manager::error::Error> { let serialized = self .open_tree(&[CHAIN_MONITOR_TREE])? .get([CHAIN_MONITOR_KEY]) @@ -924,11 +924,11 @@ mod tests { let signed_channels = storage .get_signed_channels(Some( - dlc_manager::channel::signed_channel::SignedChannelStateType::Established, + ddk_manager::channel::signed_channel::SignedChannelStateType::Established, )) .expect("Error retrieving offered channels"); assert_eq!(1, signed_channels.len()); - if let dlc_manager::channel::signed_channel::SignedChannelState::Established { + if let ddk_manager::channel::signed_channel::SignedChannelState::Established { .. } = &signed_channels[0].state { diff --git a/electrs-blockchain-provider/Cargo.toml b/electrs-blockchain-provider/Cargo.toml index 4b639332..af3535c5 100644 --- a/electrs-blockchain-provider/Cargo.toml +++ b/electrs-blockchain-provider/Cargo.toml @@ -8,7 +8,7 @@ version = "0.1.0" [dependencies] bitcoin = {version = "0.32.2"} bitcoin-test-utils = {path = "../bitcoin-test-utils"} -dlc-manager = {path = "../dlc-manager"} +ddk-manager = {path = "../ddk-manager"} lightning = {version = "0.0.125"} lightning-block-sync = {version = "0.0.125"} reqwest = {version = "0.11", features = ["blocking", "json"]} diff --git a/electrs-blockchain-provider/src/lib.rs b/electrs-blockchain-provider/src/lib.rs index 91960966..9d9d631c 100644 --- a/electrs-blockchain-provider/src/lib.rs +++ b/electrs-blockchain-provider/src/lib.rs @@ -10,7 +10,7 @@ use bitcoin::{ block::Header, Block, BlockHash, Network, OutPoint, ScriptBuf, Transaction, TxOut, Txid, }; use bitcoin_test_utils::tx_to_string; -use dlc_manager::{error::Error, Blockchain, Utxo}; +use ddk_manager::{error::Error, Blockchain, Utxo}; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; use lightning_block_sync::{BlockData, BlockHeaderData, BlockSource, BlockSourceError}; use reqwest::blocking::Response; @@ -57,7 +57,7 @@ impl ElectrsBlockchainProvider { .get(format!("{}{}", self.host, sub_url)) .send() .map_err(|x| { - dlc_manager::error::Error::IOError(lightning::io::Error::new( + ddk_manager::error::Error::IOError(lightning::io::Error::new( lightning::io::ErrorKind::Other, x, )) @@ -73,7 +73,7 @@ impl ElectrsBlockchainProvider { fn get_text(&self, sub_url: &str) -> Result { self.get(sub_url)?.text().map_err(|x| { - dlc_manager::error::Error::IOError(lightning::io::Error::new( + ddk_manager::error::Error::IOError(lightning::io::Error::new( lightning::io::ErrorKind::Other, x, )) @@ -109,36 +109,36 @@ impl ElectrsBlockchainProvider { } impl Blockchain for ElectrsBlockchainProvider { - fn send_transaction(&self, transaction: &Transaction) -> Result<(), dlc_manager::error::Error> { + fn send_transaction(&self, transaction: &Transaction) -> Result<(), ddk_manager::error::Error> { let res = self .client .post(format!("{}tx", self.host)) .body(tx_to_string(transaction)) .send() .map_err(|x| { - dlc_manager::error::Error::IOError(lightning::io::Error::new( + ddk_manager::error::Error::IOError(lightning::io::Error::new( lightning::io::ErrorKind::Other, x, )) })?; if let Err(error) = res.error_for_status_ref() { let body = res.text().unwrap_or_default(); - return Err(dlc_manager::error::Error::InvalidParameters(format!( + return Err(ddk_manager::error::Error::InvalidParameters(format!( "Server returned error: {error} {body}" ))); } Ok(()) } - fn get_network(&self) -> Result { + fn get_network(&self) -> Result { Ok(self.network) } - fn get_blockchain_height(&self) -> Result { + fn get_blockchain_height(&self) -> Result { self.get_u64("blocks/tip/height") } - fn get_block_at_height(&self, height: u64) -> Result { + fn get_block_at_height(&self, height: u64) -> Result { let hash_at_height = self.get_text(&format!("block-height/{height}"))?; let raw_block = self.get_bytes(&format!("block/{hash_at_height}/raw"))?; // TODO: Bitcoin IO for all @@ -146,7 +146,7 @@ impl Blockchain for ElectrsBlockchainProvider { .map_err(|e| Error::BlockchainError(e.to_string())) } - fn get_transaction(&self, tx_id: &Txid) -> Result { + fn get_transaction(&self, tx_id: &Txid) -> Result { let raw_tx = self.get_bytes(&format!("tx/{tx_id}/raw"))?; Transaction::consensus_decode(&mut lightning::io::Cursor::new(&*raw_tx)) .map_err(|e| Error::BlockchainError(e.to_string())) @@ -155,7 +155,7 @@ impl Blockchain for ElectrsBlockchainProvider { fn get_transaction_confirmations( &self, tx_id: &Txid, - ) -> Result { + ) -> Result { let tx_status = self.get_from_json::(&format!("tx/{tx_id}/status"))?; if tx_status.confirmed { let block_chain_height = self.get_blockchain_height()?; diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 64d8183d..bdaa35cb 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -8,7 +8,7 @@ version = "0.1.0" cargo-fuzz = true [dependencies] -dlc-messages = {path = "../dlc-messages"} +ddk-messages = {path = "../ddk-messages"} honggfuzz = "0.5" lightning = {version = "0.0.125" } diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml index b51fd906..1a8e9f7d 100644 --- a/mocks/Cargo.toml +++ b/mocks/Cargo.toml @@ -6,9 +6,9 @@ version = "0.1.0" [dependencies] bitcoin = "0.32.2" -dlc = {path = "../dlc"} -dlc-manager = {path = "../dlc-manager"} -dlc-messages = {path = "../dlc-messages"} +ddk-dlc = {path = "../ddk-dlc"} +ddk-manager = {path = "../ddk-manager"} +ddk-messages = {path = "../ddk-messages"} lightning = {version = "0.0.125"} secp256k1-zkp = {version = "0.11.0", features = ["hashes", "global-context", "rand", "rand-std"]} simple-wallet = {path = "../simple-wallet"} diff --git a/mocks/src/lib.rs b/mocks/src/lib.rs index 4692f4cb..ab08782f 100644 --- a/mocks/src/lib.rs +++ b/mocks/src/lib.rs @@ -4,5 +4,5 @@ pub mod mock_oracle_provider; pub mod mock_time; pub mod mock_wallet; -pub use dlc_manager; +pub use ddk_manager; pub use simple_wallet; diff --git a/mocks/src/memory_storage_provider.rs b/mocks/src/memory_storage_provider.rs index c0a61762..e3270a2c 100644 --- a/mocks/src/memory_storage_provider.rs +++ b/mocks/src/memory_storage_provider.rs @@ -1,15 +1,15 @@ use bitcoin::{Address, OutPoint, Txid}; -use dlc_manager::chain_monitor::ChainMonitor; -use dlc_manager::channel::{ +use ddk_manager::chain_monitor::ChainMonitor; +use ddk_manager::channel::{ offered_channel::OfferedChannel, signed_channel::{SignedChannel, SignedChannelStateType}, Channel, }; -use dlc_manager::contract::{ +use ddk_manager::contract::{ offered_contract::OfferedContract, signed_contract::SignedContract, Contract, PreClosedContract, }; -use dlc_manager::Storage; -use dlc_manager::{error::Error as DaemonError, ChannelId, ContractId, Utxo}; +use ddk_manager::Storage; +use ddk_manager::{error::Error as DaemonError, ChannelId, ContractId, Utxo}; use secp256k1_zkp::SecretKey; use simple_wallet::WalletStorage; use std::collections::HashMap; diff --git a/mocks/src/mock_blockchain.rs b/mocks/src/mock_blockchain.rs index cdb6b7ac..46d42d3e 100644 --- a/mocks/src/mock_blockchain.rs +++ b/mocks/src/mock_blockchain.rs @@ -1,7 +1,7 @@ use std::sync::Mutex; use bitcoin::{Block, Transaction, Txid}; -use dlc_manager::{error::Error, Blockchain, Utxo}; +use ddk_manager::{error::Error, Blockchain, Utxo}; use lightning::chain::chaininterface::FeeEstimator; use simple_wallet::WalletBlockchainProvider; diff --git a/mocks/src/mock_oracle_provider.rs b/mocks/src/mock_oracle_provider.rs index 2bc03916..678430c3 100644 --- a/mocks/src/mock_oracle_provider.rs +++ b/mocks/src/mock_oracle_provider.rs @@ -1,7 +1,7 @@ use bitcoin::hashes::Hash; -use dlc_manager::error::Error as DaemonError; -use dlc_manager::Oracle; -use dlc_messages::oracle_msgs::{ +use ddk_manager::error::Error as DaemonError; +use ddk_manager::Oracle; +use ddk_messages::oracle_msgs::{ EventDescriptor, OracleAnnouncement, OracleAttestation, OracleEvent, }; use lightning::util::ser::Writeable; @@ -138,7 +138,7 @@ impl MockOracle { .map(|(x, nonce)| { let hash = bitcoin::hashes::sha256::Hash::hash(x.as_bytes()).to_byte_array(); let msg = Message::from_digest(hash); - dlc::secp_utils::schnorrsig_sign_with_nonce( + ddk_dlc::secp_utils::schnorrsig_sign_with_nonce( &self.secp, &msg, &self.key_pair, diff --git a/mocks/src/mock_time.rs b/mocks/src/mock_time.rs index 876fbcd6..d7ae032c 100644 --- a/mocks/src/mock_time.rs +++ b/mocks/src/mock_time.rs @@ -1,6 +1,6 @@ -extern crate dlc_manager; +extern crate ddk_manager; -use dlc_manager::Time; +use ddk_manager::Time; use std::cell::RefCell; thread_local! { diff --git a/mocks/src/mock_wallet.rs b/mocks/src/mock_wallet.rs index 5bb062fc..00671ce0 100644 --- a/mocks/src/mock_wallet.rs +++ b/mocks/src/mock_wallet.rs @@ -4,7 +4,7 @@ use bitcoin::psbt::Psbt; use bitcoin::transaction::Version; use bitcoin::{absolute::LockTime, Address, OutPoint, ScriptBuf, Transaction, TxOut}; use bitcoin::{Amount, CompressedPublicKey}; -use dlc_manager::{error::Error, Blockchain, ContractSignerProvider, SimpleSigner, Utxo, Wallet}; +use ddk_manager::{error::Error, Blockchain, ContractSignerProvider, SimpleSigner, Utxo, Wallet}; use secp256k1_zkp::{rand::seq::SliceRandom, PublicKey, SecretKey}; use crate::mock_blockchain::MockBlockchain; @@ -68,11 +68,11 @@ impl ContractSignerProvider for MockWallet { } impl Wallet for MockWallet { - fn get_new_address(&self) -> Result { + fn get_new_address(&self) -> Result { Ok(get_address()) } - fn get_new_change_address(&self) -> Result { + fn get_new_change_address(&self) -> Result { Ok(get_address()) } @@ -81,7 +81,7 @@ impl Wallet for MockWallet { amount: u64, _fee_rate: u64, _lock_utxos: bool, - ) -> Result, Error> { + ) -> Result, Error> { let mut utxo_pool = self.utxos.clone(); let seed = 1; utxo_pool.shuffle(&mut secp256k1_zkp::rand::rngs::mock::StepRng::new( @@ -109,7 +109,7 @@ impl Wallet for MockWallet { Err(Error::InvalidParameters("Not enought UTXOs".to_string())) } - fn import_address(&self, _address: &Address) -> Result<(), dlc_manager::error::Error> { + fn import_address(&self, _address: &Address) -> Result<(), ddk_manager::error::Error> { Ok(()) } diff --git a/p2pd-oracle-client/Cargo.toml b/p2pd-oracle-client/Cargo.toml index f8211c6a..bfa531e7 100644 --- a/p2pd-oracle-client/Cargo.toml +++ b/p2pd-oracle-client/Cargo.toml @@ -9,8 +9,8 @@ version = "0.1.0" [dependencies] chrono = {version = "0.4.19", features = ["serde"]} -dlc-manager = {path = "../dlc-manager"} -dlc-messages = {path = "../dlc-messages", features = ["use-serde"]} +ddk-manager = {path = "../ddk-manager"} +ddk-messages = {path = "../ddk-messages", features = ["use-serde"]} reqwest = {version = "0.11", features = ["blocking", "json"]} secp256k1-zkp = {version = "0.11.0" } serde = {version = "*", features = ["derive"]} diff --git a/p2pd-oracle-client/src/lib.rs b/p2pd-oracle-client/src/lib.rs index 15038df4..7b82fb9c 100644 --- a/p2pd-oracle-client/src/lib.rs +++ b/p2pd-oracle-client/src/lib.rs @@ -12,16 +12,16 @@ #![deny(missing_docs)] extern crate chrono; -extern crate dlc_manager; -extern crate dlc_messages; +extern crate ddk_manager; +extern crate ddk_messages; extern crate reqwest; extern crate secp256k1_zkp; extern crate serde; use chrono::{DateTime, SecondsFormat, Utc}; -use dlc_manager::error::Error as DlcManagerError; -use dlc_manager::Oracle; -use dlc_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; +use ddk_manager::error::Error as DlcManagerError; +use ddk_manager::Oracle; +use ddk_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation}; use secp256k1_zkp::{schnorr::Signature, XOnlyPublicKey}; /// Enables interacting with a DLC oracle. @@ -75,12 +75,12 @@ where { reqwest::blocking::get(path) .map_err(|x| { - dlc_manager::error::Error::IOError( + ddk_manager::error::Error::IOError( std::io::Error::new(std::io::ErrorKind::Other, x).into(), ) })? .json::() - .map_err(|e| dlc_manager::error::Error::OracleError(e.to_string())) + .map_err(|e| ddk_manager::error::Error::OracleError(e.to_string())) } fn pubkey_path(host: &str) -> String { @@ -159,7 +159,7 @@ impl Oracle for P2PDOracleClient { fn get_attestation( &self, event_id: &str, - ) -> Result { + ) -> Result { let (asset_id, date_time) = parse_event_id(event_id)?; let path = attestation_path(&self.host, &asset_id, &date_time); let AttestationResponse { diff --git a/sample/Cargo.toml b/sample/Cargo.toml index 8219d04c..5a7a6d6d 100644 --- a/sample/Cargo.toml +++ b/sample/Cargo.toml @@ -7,9 +7,9 @@ version = "0.1.0" [dependencies] bitcoin = {version = "0.32.2"} bitcoin-rpc-provider = {path = "../bitcoin-rpc-provider"} -dlc = {path = "../dlc", features = ["use-serde"]} -dlc-manager = {path = "../dlc-manager", features = ["use-serde", "parallel"]} -dlc-messages = {path = "../dlc-messages"} +ddk-dlc = {path = "../ddk-dlc", features = ["use-serde"]} +ddk-manager = {path = "../ddk-manager", features = ["use-serde", "parallel"]} +ddk-messages = {path = "../ddk-messages"} dlc-sled-storage-provider = {path = "../dlc-sled-storage-provider"} futures = "0.3" lightning = {version = "0.0.125"} diff --git a/sample/src/cli.rs b/sample/src/cli.rs index c55b3795..b51f93b9 100644 --- a/sample/src/cli.rs +++ b/sample/src/cli.rs @@ -4,12 +4,12 @@ use crate::DlcManager; use crate::DlcMessageHandler; use crate::PeerManager; use bitcoin::secp256k1::PublicKey; -use dlc_manager::channel::signed_channel::SignedChannelState; -use dlc_manager::channel::signed_channel::SignedChannelStateType; -use dlc_manager::contract::contract_input::ContractInput; -use dlc_manager::contract::Contract; -use dlc_manager::Storage; -use dlc_messages::Message as DlcMessage; +use ddk_manager::channel::signed_channel::SignedChannelState; +use ddk_manager::channel::signed_channel::SignedChannelStateType; +use ddk_manager::contract::contract_input::ContractInput; +use ddk_manager::contract::Contract; +use ddk_manager::Storage; +use ddk_messages::Message as DlcMessage; use hex_utils::{hex_str, to_slice}; use serde::Deserialize; use serde_json::Value; diff --git a/sample/src/main.rs b/sample/src/main.rs index 5bea995f..e725e26b 100644 --- a/sample/src/main.rs +++ b/sample/src/main.rs @@ -7,8 +7,8 @@ use disk::FilesystemLogger; use bitcoin::secp256k1::rand::{thread_rng, RngCore}; use bitcoin::secp256k1::SecretKey; use bitcoin_rpc_provider::BitcoinCoreProvider; -use dlc_manager::{CachedContractSignerProvider, Oracle, SimpleSigner, SystemTimeProvider}; -use dlc_messages::message_handler::MessageHandler as DlcMessageHandler; +use ddk_manager::{CachedContractSignerProvider, Oracle, SimpleSigner, SystemTimeProvider}; +use ddk_messages::message_handler::MessageHandler as DlcMessageHandler; use lightning::ln::peer_handler::{ ErroringMessageHandler, IgnoringMessageHandler, MessageHandler, PeerManager as LdkPeerManager, }; @@ -31,7 +31,7 @@ pub(crate) type PeerManager = LdkPeerManager< Arc, >; -pub(crate) type DlcManager = dlc_manager::manager::Manager< +pub(crate) type DlcManager = ddk_manager::manager::Manager< Arc, Arc, SimpleSigner>>, Arc, @@ -82,7 +82,7 @@ async fn main() { // Instantiate a DlcManager. let dlc_manager = Arc::new(Mutex::new( - dlc_manager::manager::Manager::new( + ddk_manager::manager::Manager::new( bitcoind_provider.clone(), bitcoind_provider.clone(), bitcoind_provider.clone(), @@ -91,7 +91,7 @@ async fn main() { .expect("Error creating storage."), ), oracles, - Arc::new(dlc_manager::SystemTimeProvider {}), + Arc::new(ddk_manager::SystemTimeProvider {}), bitcoind_provider.clone(), ) .expect("Could not create manager."), diff --git a/sample/tests/cli_tests.rs b/sample/tests/cli_tests.rs index e3d1cbe7..018712de 100644 --- a/sample/tests/cli_tests.rs +++ b/sample/tests/cli_tests.rs @@ -1,7 +1,7 @@ use std::{process::Command, thread::sleep, time::Duration}; use assert_cmd::cargo::cargo_bin; -use dlc_manager::contract::contract_input::ContractInput; +use ddk_manager::contract::contract_input::ContractInput; use rexpect::session::{spawn_command, PtySession}; #[test] diff --git a/simple-wallet/Cargo.toml b/simple-wallet/Cargo.toml index 268e296e..e09ccf05 100644 --- a/simple-wallet/Cargo.toml +++ b/simple-wallet/Cargo.toml @@ -8,8 +8,8 @@ version = "0.1.0" [dependencies] bdk_wallet = "1.0.0-beta.2" bitcoin = "0.32.2" -dlc = {path = "../dlc"} -dlc-manager = {path = "../dlc-manager"} +ddk-dlc = {path = "../ddk-dlc"} +ddk-manager = {path = "../ddk-manager"} lightning = {version = "0.0.125"} secp256k1-zkp = {version = "0.11.0"} diff --git a/simple-wallet/src/lib.rs b/simple-wallet/src/lib.rs index a2ed414b..9a59e331 100644 --- a/simple-wallet/src/lib.rs +++ b/simple-wallet/src/lib.rs @@ -10,7 +10,7 @@ use bitcoin::{ Sequence, Transaction, TxIn, TxOut, Txid, Weight, Witness, }; use bitcoin::{psbt::Psbt, ScriptBuf}; -use dlc_manager::{ +use ddk_manager::{ error::Error, Blockchain, ContractSignerProvider, KeysId, SimpleSigner, Utxo, Wallet, }; use lightning::chain::chaininterface::{ConfirmationTarget, FeeEstimator}; @@ -341,7 +341,7 @@ where .expect("to have the requested private key"); let mut tx = psbt.unsigned_tx.clone(); - dlc::util::sign_p2wpkh_input( + ddk_dlc::util::sign_p2wpkh_input( &self.secp_ctx, &seckey, &mut tx, @@ -361,7 +361,7 @@ where mod tests { use std::rc::Rc; - use dlc_manager::ContractSignerProvider; + use ddk_manager::ContractSignerProvider; use mocks::simple_wallet::SimpleWallet; use mocks::{memory_storage_provider::MemoryStorage, mock_blockchain::MockBlockchain}; use secp256k1_zkp::{PublicKey, SECP256K1};