Feature/ln dlc channels

.github/workflows/rust.yml

@@ -35,7 +35,7 @@ jobs:
           key: test-cache-${{ github.run_id }}-${{ github.run_number }}
       - uses: actions/checkout@v2
       - id: set-matrix
-        run: cargo test --no-run && echo "::set-output name=matrix::$(scripts/get_test_list.sh execution manager channel_execution)"
+        run: cargo test --no-run && echo "::set-output name=matrix::$(scripts/get_test_list.sh manager channel_execution ln_dlc)"
   integration_tests:
     name: integration-tests
     needs: integration_tests_prepare
@@ -58,6 +58,6 @@ jobs:
       - name: Wait for electrs to be ready
         run: ./scripts/wait_for_electrs.sh
       - name: Run test
-        run: RUST_BACKTRACE=1 ${{ matrix.tests }} --ignored
+        run: RUST_MIN_STACK=104857600 RUST_BACKTRACE=1 ${{ matrix.tests }} --ignored --exact
       - name: Stop bitcoin node
         run: ./scripts/stop_node.sh

Cargo.toml

@@ -1,5 +1,4 @@
 [workspace]
-
 members = [
   "bitcoin-test-utils",
   "bitcoin-rpc-provider",
@@ -14,3 +13,9 @@ members = [
   "dlc-sled-storage-provider",
   "electrs-blockchain-provider",
 ]
+resolver = "2"
+
+[patch.crates-io]
+lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }
+lightning-net-tokio = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }
+lightning-persister = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }

bitcoin-rpc-provider/Cargo.toml

@@ -9,7 +9,7 @@ bitcoin = {version = "0.29.2"}
 bitcoincore-rpc = {version = "0.16.0"}
 bitcoincore-rpc-json = {version = "0.16.0"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
 log = "0.4.14"
-rust-bitcoin-coin-selection = {version = "0.1.0", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
+rust-bitcoin-coin-selection = { rev = "23a6bf85", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 simple-wallet = {path = "../simple-wallet"}

bitcoin-rpc-provider/src/lib.rs

@@ -25,18 +25,11 @@ use rust_bitcoin_coin_selection::select_coins;
 /// The minimum feerate we are allowed to send, as specify by LDK.
 const MIN_FEERATE: u32 = 253;
 
-#[derive(Clone, Eq, Hash, PartialEq)]
-pub enum Target {
-    Background,
-    Normal,
-    HighPriority,
-}
-
 pub struct BitcoinCoreProvider {
     client: Arc<Mutex<Client>>,
     // Used to implement the FeeEstimator interface, heavily inspired by
     // https://github.com/lightningdevkit/ldk-sample/blob/main/src/bitcoind_client.rs#L26
-    fees: Arc<HashMap<Target, AtomicU32>>,
+    fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>,
 }
 
 #[derive(Debug)]
@@ -107,10 +100,10 @@ impl BitcoinCoreProvider {
 
     pub fn new_from_rpc_client(rpc_client: Client) -> Self {
         let client = Arc::new(Mutex::new(rpc_client));
-        let mut fees: HashMap<Target, AtomicU32> = HashMap::new();
-        fees.insert(Target::Background, AtomicU32::new(MIN_FEERATE));
-        fees.insert(Target::Normal, AtomicU32::new(2000));
-        fees.insert(Target::HighPriority, AtomicU32::new(5000));
+        let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
+        fees.insert(ConfirmationTarget::Background, AtomicU32::new(MIN_FEERATE));
+        fees.insert(ConfirmationTarget::Normal, AtomicU32::new(2000));
+        fees.insert(ConfirmationTarget::HighPriority, AtomicU32::new(5000));
         let fees = Arc::new(fees);
         poll_for_fee_estimates(client.clone(), fees.clone());
         BitcoinCoreProvider { client, fees }
@@ -372,35 +365,22 @@ impl Blockchain for BitcoinCoreProvider {
 }
 
 impl FeeEstimator for BitcoinCoreProvider {
-    fn get_est_sat_per_1000_weight(
-        &self,
-        confirmation_target: lightning::chain::chaininterface::ConfirmationTarget,
-    ) -> u32 {
-        match confirmation_target {
-            ConfirmationTarget::Background => self
-                .fees
-                .get(&Target::Background)
-                .unwrap()
-                .load(Ordering::Acquire),
-            ConfirmationTarget::Normal => self
-                .fees
-                .get(&Target::Normal)
-                .unwrap()
-                .load(Ordering::Acquire),
-            ConfirmationTarget::HighPriority => self
-                .fees
-                .get(&Target::HighPriority)
-                .unwrap()
-                .load(Ordering::Acquire),
-        }
+    fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
+        self.fees
+            .get(&confirmation_target)
+            .unwrap()
+            .load(Ordering::Acquire)
     }
 }
 
-fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target, AtomicU32>>) {
+fn poll_for_fee_estimates(
+    client: Arc<Mutex<Client>>,
+    fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>,
+) {
     std::thread::spawn(move || loop {
         match query_fee_estimate(&client, 144, EstimateMode::Economical) {
             Ok(fee_rate) => {
-                fees.get(&Target::Background)
+                fees.get(&ConfirmationTarget::Background)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }
@@ -410,7 +390,7 @@ fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target,
         };
         match query_fee_estimate(&client, 18, EstimateMode::Conservative) {
             Ok(fee_rate) => {
-                fees.get(&Target::Normal)
+                fees.get(&ConfirmationTarget::Normal)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }
@@ -420,7 +400,7 @@ fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target,
         };
         match query_fee_estimate(&client, 6, EstimateMode::Conservative) {
             Ok(fee_rate) => {
-                fees.get(&Target::HighPriority)
+                fees.get(&ConfirmationTarget::HighPriority)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }

bitcoin-test-utils/src/lib.rs

@@ -42,8 +42,7 @@ pub fn from_hex(hex: &str, target: &mut [u8]) -> Result<usize, ()> {
 /// Transforms an hex string to a Vec<u8>.
 /// Panics if the string is not valid hex.
 pub fn str_to_hex(hex_str: &str) -> Vec<u8> {
-    let mut hex = Vec::<u8>::new();
-    hex.resize(hex_str.len() / 2, 0);
+    let mut hex = vec![0; hex_str.len() / 2];
     from_hex(hex_str, &mut hex).unwrap();
     hex
 }

dlc-manager/Cargo.toml

@@ -19,22 +19,26 @@ bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
 dlc-messages = {version = "0.4.0", path = "../dlc-messages"}
 dlc-trie = {version = "0.4.0", path = "../dlc-trie"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
 log = "0.4.14"
 rand_chacha = {version = "0.3.1", optional = true}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
 serde = {version = "1.0", optional = true}
 
 [dev-dependencies]
+bitcoin-bech32 = "0.12.1"
 bitcoin-rpc-provider = {path = "../bitcoin-rpc-provider"}
 bitcoin-test-utils = {path = "../bitcoin-test-utils"}
 bitcoincore-rpc = {version = "0.16.0"}
 bitcoincore-rpc-json = {version = "0.16.0"}
 criterion = "0.4.0"
+chrono = "0.4"
 dlc-manager = {path = ".", features = ["use-serde"]}
 dlc-messages = {path = "../dlc-messages", features = ["serde"]}
 electrs-blockchain-provider = {path = "../electrs-blockchain-provider"}
 env_logger = "0.9.1"
+lightning-persister = {version = "0.0.116"}
+lightning-transaction-sync = {version = "0.0.116", features=["esplora-blocking"]}
 mocks = {path = "../mocks"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std", "global-context", "use-serde"]}
 serde = "1.0"