deps: update to publish dlc, dlc-messages, & dlc-trie

.github/workflows/rust.yml

@@ -48,6 +48,38 @@ jobs:
           override: true
       - name: cargo check
         run: cargo check --all-features
+  unit-tests:
+    name: unit tests
+    runs-on: ubuntu-latest
+    env:
+      DATABASE_URL: postgresql://dlcdevkit:dlcdevkit@localhost:5433/postgres
+      BITCOIND_HOST: http://localhost:18443
+      ESPLORA_HOST: http://localhost:30000
+
+    steps:
+      - name: Install Protoc
+        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.88.0
+          components: rustfmt
+          override: true
+      - name: Start Docker Compose services
+        run: docker compose up -d
+      - name: Wait for Bitcoin container
+        run: |
+          chmod +x ./testconfig/scripts/wait_for_container.sh
+          ./testconfig/scripts/wait_for_container.sh bitcoin
+      - name: Wait for Electrs to be ready
+        run: |
+          chmod +x ./testconfig/scripts/wait_for_electrs.sh
+          ./testconfig/scripts/wait_for_electrs.sh
+      - name: Run unit tests
+        run: cargo test --all-features
+      - name: Stop Docker Compose services
+        if: always()
+        run: docker compose down -v
   integration_tests_prepare:
     runs-on: ubuntu-latest
     timeout-minutes: 30

ddk-manager/Cargo.toml

@@ -10,18 +10,18 @@ version = "0.7.6"
 
 [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.6", default-features = false }
 
-dlc = { path = "../dlc", features = ["use-serde"] }
-dlc-messages = { path = "../dlc-messages", features = [ "use-serde"] }
-dlc-trie = { path = "../dlc-trie", features = ["use-serde"] }
+ddk-dlc = { path = "../dlc", features = ["use-serde"] }
+ddk-messages = { path = "../dlc-messages", features = [ "use-serde"] }
+ddk-trie = { path = "../dlc-trie", features = ["use-serde"] }
 
 futures = "0.3.31"
 hex = { package = "hex-conservative", version = "0.1" }

ddk-manager/benches/benchmarks.rs

@@ -4,6 +4,11 @@ use bitcoin::OutPoint;
 use bitcoin::ScriptBuf;
 use bitcoin::WPubkeyHash;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
+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;
@@ -14,15 +19,10 @@ 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 dlc::create_dlc_transactions;
-use dlc::DlcTransactions;
-use dlc::PartyParams;
-use dlc::Payout;
-use dlc::TxInputInfo;
-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_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,
 };
@@ -121,7 +121,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)

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;

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};

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};

ddk-manager/src/channel/offered_channel.rs

@@ -1,9 +1,8 @@
 //! # 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 secp256k1_zkp::PublicKey;
 
 use crate::{

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

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),

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::{Amount, ScriptBuf, Transaction};
-use dlc::PartyParams;
+use ddk_dlc::PartyParams;
 use lightning::ln::chan_utils::CounterpartyCommitmentSecrets;
 use secp256k1_zkp::{ecdsa::Signature, EcdsaAdaptorSignature, PublicKey};