Upgrade to baru 0.2

Author: da-kami

Cargo.lock

@@ -7,12 +7,12 @@ edition = "2018"
 [dependencies]
 anyhow = "1"
 async-trait = "0.1"
-baru = "0.1"
+baru = "0.2"
 bitcoin_hashes = "0.9.0"
 diesel = { version = "1.4", features = ["sqlite"] }
 diesel_migrations = "1.4"
 directories = "3.0"
-elements = { version = "0.17", features = ["serde-feature"] }
+elements = { version = "0.18", features = ["serde-feature"] }
 elements-harness = { git = "https://github.com/comit-network/elements-harness" }
 futures = { version = "0.3", default-features = false }
 hex = "0.4"

bobtimus/Cargo.toml

@@ -1,7 +1,7 @@
 use anyhow::{bail, Context, Result};
 use bitcoin_hashes::hex::FromHex;
 use elements::{
-    bitcoin::{Amount, PrivateKey},
+    bitcoin::Amount,
     confidential::{Asset, Nonce, Value},
     encode::serialize_hex,
     secp256k1_zkp::{SecretKey, Signature},
@@ -338,18 +338,16 @@ impl Client {
         Ok(sig)
     }
 
-    pub async fn dump_private_key(&self, address: &Address) -> Result<SecretKey> {
-        let privkey = self.dumpprivkey(address).await?;
-        let privkey = PrivateKey::from_wif(&privkey)?;
-
-        Ok(privkey.key)
-    }
-
     pub async fn get_blockcount(&self) -> Result<u32> {
         let blockcount = self.getblockcount().await?;
 
         Ok(blockcount)
     }
+
+    pub async fn get_address_blinding_key(&self, address: &Address) -> Result<SecretKey> {
+        let key = self.dumpblindingkey(address).await?;
+        Ok(key)
+    }
 }
 
 #[derive(Debug, Deserialize)]

bobtimus/src/elements_rpc.rs

@@ -3,7 +3,7 @@ extern crate diesel;
 #[macro_use]
 extern crate diesel_migrations;
 
-use std::{collections::HashMap, convert::TryInto};
+use std::collections::HashMap;
 
 use crate::{
     database::{queries, Sqlite},
@@ -45,6 +45,7 @@ pub mod schema;
 
 use crate::loan::{Interest, LoanOffer};
 pub use amounts::*;
+use elements::bitcoin::PublicKey;
 use rust_decimal_macros::dec;
 
 pub const USDT_ASSET_ID: &str = "ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2";
@@ -295,17 +296,31 @@ where
         //  Currently there is no ID for incoming loan requests, that would associate them with an offer,
         //  so we just have to ensure that the loan is still "acceptable" in the current state of Bobtimus.
 
+        let oracle_secret_key = elements::secp256k1_zkp::key::ONE_KEY;
+        let oralce_priv_key = elements::bitcoin::PrivateKey::new(
+            oracle_secret_key,
+            elements::bitcoin::Network::Regtest,
+        );
+        let oracle_pk = PublicKey::from_private_key(&self.secp, &oralce_priv_key);
+
         let lender_address = self
             .elementsd
             .get_new_segwit_confidential_address()
             .await
             .context("failed to get lender address")?;
 
+        let address_blinder = self
+            .elementsd
+            .get_address_blinding_key(&lender_address)
+            .await?;
+
         let lender0 = Lender0::new(
             &mut self.rng,
             self.btc_asset_id,
             self.usdt_asset_id,
             lender_address,
+            address_blinder,
+            oracle_pk,
         )
         .unwrap();
 
@@ -328,7 +343,7 @@ where
         let loan_response = lender1.loan_response();
 
         self.lender_states
-            .insert(loan_response.transaction.txid(), lender1);
+            .insert(loan_response.transaction().txid(), lender1);
 
         Ok(loan_response)
     }
@@ -360,16 +375,14 @@ where
 
         let txid = self.elementsd.send_raw_transaction(&transaction).await?;
 
-        let liquidation_tx =
-            lender.liquidation_transaction(&mut self.rng, &self.secp, Amount::ONE_SAT)?;
-        let locktime = lender
-            .timelock
-            .try_into()
-            .expect("TODO: locktimes should be modelled as u32");
+        let liquidation_tx = lender
+            .liquidation_transaction(&mut self.rng, &self.secp, Amount::ONE_SAT)
+            .await?;
+        let locktime = lender.collateral_contract().timelock();
 
         self.db
             .do_in_transaction(|conn| {
-                LiquidationForm::new(txid, &liquidation_tx, locktime).insert(conn)?;
+                LiquidationForm::new(txid, &liquidation_tx, *locktime).insert(conn)?;
 
                 Ok(())
             })

bobtimus/src/lib.rs

@@ -6,6 +6,6 @@ edition = "2018"
 
 [dependencies]
 bdk = { version = "0.4", default-features = false }
-elements = "0.17"
+elements = "0.18"
 estimate_transaction_size = { path = "../estimate_transaction_size" }
 thiserror = "1"

coin_selection/Cargo.toml

@@ -1,11 +1,13 @@
 use bdk::{
-    bitcoin::{Amount, Denomination},
     database::{BatchOperations, Database},
     wallet::coin_selection::{
         BranchAndBoundCoinSelection, CoinSelectionAlgorithm, CoinSelectionResult,
     },
 };
-use elements::{AssetId, OutPoint, Script};
+use elements::{
+    bitcoin::{Amount, Denomination},
+    AssetId, OutPoint, Script,
+};
 use estimate_transaction_size::avg_vbytes;
 
 /// Select a subset of `utxos` to cover the `target` amount.
@@ -70,7 +72,8 @@ pub fn coin_select(
             utxos
                 .iter()
                 .find(|utxo| {
-                    bdk_utxo.outpoint.txid.as_hash() == utxo.outpoint.txid.as_hash()
+                    format!("{}", bdk_utxo.outpoint.txid)
+                        == format!("{}", utxo.outpoint.txid.as_hash())
                         && bdk_utxo.outpoint.vout == utxo.outpoint.vout
                 })
                 .expect("same source of utxos")
@@ -100,7 +103,7 @@ pub enum Error {
     #[error("All UTXOs must have the same asset ID")]
     HeterogeneousUtxos,
     #[error("Failed to parse recommended fee: {0}")]
-    ParseFee(#[from] bdk::bitcoin::util::amount::ParseAmountError),
+    ParseFee(#[from] elements::bitcoin::util::amount::ParseAmountError),
     #[error("Error from bdk: {0}")]
     Bdk(#[from] bdk::Error),
 }
@@ -121,7 +124,9 @@ impl From<Utxo> for bdk::UTXO {
 
         Self {
             outpoint: bdk::bitcoin::OutPoint {
-                txid: bdk::bitcoin::Txid::from_hash(utxo.outpoint.txid.as_hash()),
+                txid: format!("{}", utxo.outpoint.txid)
+                    .parse()
+                    .expect("txid to be a txid"),
                 vout: utxo.outpoint.vout,
             },
             txout: bdk::bitcoin::TxOut {

coin_selection/src/lib.rs

@@ -13,13 +13,12 @@ default = ["console_error_panic_hook"]
 [dependencies]
 aes-gcm-siv = { version = "0.9", features = ["std"] }
 anyhow = "1"
-baru = "0.1"
-bdk = { version = "0.4", default-features = false }
+baru = "0.2"
 bip32 = { version = "0.2", features = ["secp256k1-ffi", "bip39"], default-features = false }
 coin_selection = { path = "../../coin_selection" }
 conquer-once = "0.3"
 console_error_panic_hook = { version = "0.1.6", optional = true }
-elements = { version = "0.17", features = ["serde-feature"] }
+elements = { version = "0.18", features = ["serde-feature"] }
 estimate_transaction_size = { path = "../../estimate_transaction_size" }
 futures = "0.3"
 getrandom = { version = "0.2", features = ["wasm-bindgen", "js"] }
@@ -48,7 +47,7 @@ wasm-bindgen-test = "0.3.13"
 [build-dependencies]
 anyhow = "1"
 conquer-once = "0.3"
-elements = { version = "0.17" }
+elements = { version = "0.18" }
 
 # By default wasm-opt is true which makes the build fail.
 [package.metadata.wasm-pack.profile.release]

extension/wallet/Cargo.toml

@@ -240,7 +240,7 @@ pub async fn make_loan_request(
     // TODO: Change the UI to handle SATs not BTC
     let collateral_in_btc = map_err_from_anyhow!(parse_to_bitcoin_amount(collateral))?;
     let fee_rate_in_sat = Amount::from_sat(map_err_from_anyhow!(u64::from_str(fee_rate.as_str()))?);
-    let timeout = map_err_from_anyhow!(u64::from_str(timeout.as_str()))?;
+    let timeout = map_err_from_anyhow!(u32::from_str(timeout.as_str()))?;
     let loan_request = map_err_from_anyhow!(
         wallet::make_loan_request(
             wallet_name,

extension/wallet/src/lib.rs

@@ -310,8 +310,8 @@ impl fmt::Display for ListOfWallets {
 pub struct CreateSwapPayload {
     pub alice_inputs: Vec<SwapUtxo>,
     pub address: Address,
-    #[serde(with = "bdk::bitcoin::util::amount::serde::as_sat")]
-    pub amount: bdk::bitcoin::Amount,
+    #[serde(with = "elements::bitcoin::util::amount::serde::as_sat")]
+    pub amount: elements::bitcoin::Amount,
 }
 
 #[derive(Clone, Copy, Debug, serde::Serialize, serde::Deserialize)]
@@ -426,7 +426,7 @@ pub struct LoanDetails {
     pub principal: TradeSide,
     pub principal_repayment: Decimal,
     // TODO: Express as target date or number of days instead?
-    pub term: u64,
+    pub term: u32,
     pub txid: Txid,
 }
 
@@ -439,7 +439,7 @@ impl LoanDetails {
         principal_asset: AssetId,
         principal_amount: Amount,
         principal_balance: Decimal,
-        timelock: u64,
+        timelock: u32,
         txid: Txid,
     ) -> Result<Self> {
         let collateral = TradeSide::new_sell(