projects / rust-lightning / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #276 from TheBlueMatt/2018-12-async-fail
[rust-lightning] / src / ln / chan_utils.rs
diff --git a/src/ln/chan_utils.rs b/src/ln/chan_utils.rs
index eaae62f92f118d756564f4c55c1338e7c820f6f3..2efa9ff5cc3f27a48ce4582882d4b63e44d5c32f 100644 (file)
--- a/src/ln/chan_utils.rs
+++ b/src/ln/chan_utils.rs
@@ -1,17 +1,19 @@
 use bitcoin::blockdata::script::{Script,Builder};
 use bitcoin::blockdata::opcodes;
-use bitcoin::blockdata::transaction::{TxIn,TxOut,Transaction};
-use bitcoin::util::hash::{Hash160,Sha256dHash};
+use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
+use bitcoin::util::hash::{Sha256dHash};
+
+use bitcoin_hashes::{Hash, HashEngine};
+use bitcoin_hashes::sha256::Hash as Sha256;
+use bitcoin_hashes::ripemd160::Hash as Ripemd160;
+use bitcoin_hashes::hash160::Hash as Hash160;
+
+use ln::channelmanager::PaymentHash;
 
 use secp256k1::key::{PublicKey,SecretKey};
 use secp256k1::Secp256k1;
 use secp256k1;
 
-use crypto::digest::Digest;
-use crypto::ripemd160::Ripemd160;
-
-use util::sha2::Sha256;
-
 pub const HTLC_SUCCESS_TX_WEIGHT: u64 = 703;
 pub const HTLC_TIMEOUT_TX_WEIGHT: u64 = 663;
 
@@ -24,59 +26,51 @@ pub fn build_commitment_secret(commitment_seed: [u8; 32], idx: u64) -> [u8; 32]
                let bitpos = 47 - i;
                if idx & (1 << bitpos) == (1 << bitpos) {
                        res[bitpos / 8] ^= 1 << (bitpos & 7);
-                       let mut sha = Sha256::new();
-                       sha.input(&res);
-                       sha.result(&mut res);
+                       res = Sha256::hash(&res).into_inner();
                }
        }
        res
 }
 
-pub fn derive_private_key(secp_ctx: &Secp256k1, per_commitment_point: &PublicKey, base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
-       let mut sha = Sha256::new();
+pub fn derive_private_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
+       let mut sha = Sha256::engine();
        sha.input(&per_commitment_point.serialize());
-       sha.input(&PublicKey::from_secret_key(&secp_ctx, &base_secret).unwrap().serialize());
-       let mut res = [0; 32];
-       sha.result(&mut res);
+       sha.input(&PublicKey::from_secret_key(&secp_ctx, &base_secret).serialize());
+       let res = Sha256::from_engine(sha).into_inner();
 
        let mut key = base_secret.clone();
        key.add_assign(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &res)?)?;
        Ok(key)
 }
 
-pub fn derive_public_key(secp_ctx: &Secp256k1, per_commitment_point: &PublicKey, base_point: &PublicKey) -> Result<PublicKey, secp256k1::Error> {
-       let mut sha = Sha256::new();
+pub fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, base_point: &PublicKey) -> Result<PublicKey, secp256k1::Error> {
+       let mut sha = Sha256::engine();
        sha.input(&per_commitment_point.serialize());
        sha.input(&base_point.serialize());
-       let mut res = [0; 32];
-       sha.result(&mut res);
+       let res = Sha256::from_engine(sha).into_inner();
 
-       let hashkey = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &res)?).unwrap();
+       let hashkey = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &res)?);
        base_point.combine(&secp_ctx, &hashkey)
 }
 
 /// Derives a revocation key from its constituent parts
-pub fn derive_private_revocation_key(secp_ctx: &Secp256k1, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
-       let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret).unwrap();
-       let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret).unwrap();
+pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
+       let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
+       let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 
        let rev_append_commit_hash_key = {
-               let mut sha = Sha256::new();
+               let mut sha = Sha256::engine();
                sha.input(&revocation_base_point.serialize());
                sha.input(&per_commitment_point.serialize());
-               let mut res = [0; 32];
-               sha.result(&mut res);
 
-               SecretKey::from_slice(&secp_ctx, &res)?
+               SecretKey::from_slice(&secp_ctx, &Sha256::from_engine(sha).into_inner())?
        };
        let commit_append_rev_hash_key = {
-               let mut sha = Sha256::new();
+               let mut sha = Sha256::engine();
                sha.input(&per_commitment_point.serialize());
                sha.input(&revocation_base_point.serialize());
-               let mut res = [0; 32];
-               sha.result(&mut res);
 
-               SecretKey::from_slice(&secp_ctx, &res)?
+               SecretKey::from_slice(&secp_ctx, &Sha256::from_engine(sha).into_inner())?
        };
 
        let mut part_a = revocation_base_secret.clone();
@@ -87,24 +81,20 @@ pub fn derive_private_revocation_key(secp_ctx: &Secp256k1, per_commitment_secret
        Ok(part_a)
 }
 
-pub fn derive_public_revocation_key(secp_ctx: &Secp256k1, per_commitment_point: &PublicKey, revocation_base_point: &PublicKey) -> Result<PublicKey, secp256k1::Error> {
+pub fn derive_public_revocation_key<T: secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, revocation_base_point: &PublicKey) -> Result<PublicKey, secp256k1::Error> {
        let rev_append_commit_hash_key = {
-               let mut sha = Sha256::new();
+               let mut sha = Sha256::engine();
                sha.input(&revocation_base_point.serialize());
                sha.input(&per_commitment_point.serialize());
-               let mut res = [0; 32];
-               sha.result(&mut res);
 
-               SecretKey::from_slice(&secp_ctx, &res)?
+               SecretKey::from_slice(&secp_ctx, &Sha256::from_engine(sha).into_inner())?
        };
        let commit_append_rev_hash_key = {
-               let mut sha = Sha256::new();
+               let mut sha = Sha256::engine();
                sha.input(&per_commitment_point.serialize());
                sha.input(&revocation_base_point.serialize());
-               let mut res = [0; 32];
-               sha.result(&mut res);
 
-               SecretKey::from_slice(&secp_ctx, &res)?
+               SecretKey::from_slice(&secp_ctx, &Sha256::from_engine(sha).into_inner())?
        };
 
        let mut part_a = revocation_base_point.clone();
@@ -124,7 +114,7 @@ pub struct TxCreationKeys {
 }
 
 impl TxCreationKeys {
-       pub fn new(secp_ctx: &Secp256k1, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
+       pub fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
                Ok(TxCreationKeys {
                        per_commitment_point: per_commitment_point.clone(),
                        revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
@@ -151,28 +141,22 @@ pub fn get_revokeable_redeemscript(revocation_key: &PublicKey, to_self_delay: u1
                      .into_script()
 }
 
-#[derive(Clone)]
+#[derive(Clone, PartialEq)]
 pub struct HTLCOutputInCommitment {
        pub offered: bool,
        pub amount_msat: u64,
        pub cltv_expiry: u32,
-       pub payment_hash: [u8; 32],
+       pub payment_hash: PaymentHash,
        pub transaction_output_index: u32,
 }
 
 #[inline]
 pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
-       let payment_hash160 = {
-               let mut ripemd = Ripemd160::new();
-               ripemd.input(&htlc.payment_hash);
-               let mut res = [0; 20];
-               ripemd.result(&mut res);
-               res
-       };
+       let payment_hash160 = Ripemd160::hash(&htlc.payment_hash.0[..]).into_inner();
        if htlc.offered {
                Builder::new().push_opcode(opcodes::All::OP_DUP)
                              .push_opcode(opcodes::All::OP_HASH160)
-                             .push_slice(&Hash160::from_data(&revocation_key.serialize())[..])
+                             .push_slice(&Hash160::hash(&revocation_key.serialize())[..])
                              .push_opcode(opcodes::All::OP_EQUAL)
                              .push_opcode(opcodes::All::OP_IF)
                              .push_opcode(opcodes::All::OP_CHECKSIG)
@@ -200,7 +184,7 @@ pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a
        } else {
                Builder::new().push_opcode(opcodes::All::OP_DUP)
                              .push_opcode(opcodes::All::OP_HASH160)
-                             .push_slice(&Hash160::from_data(&revocation_key.serialize())[..])
+                             .push_slice(&Hash160::hash(&revocation_key.serialize())[..])
                              .push_opcode(opcodes::All::OP_EQUAL)
                              .push_opcode(opcodes::All::OP_IF)
                              .push_opcode(opcodes::All::OP_CHECKSIG)
@@ -241,8 +225,10 @@ pub fn get_htlc_redeemscript(htlc: &HTLCOutputInCommitment, keys: &TxCreationKey
 pub fn build_htlc_transaction(prev_hash: &Sha256dHash, feerate_per_kw: u64, to_self_delay: u16, htlc: &HTLCOutputInCommitment, a_delayed_payment_key: &PublicKey, revocation_key: &PublicKey) -> Transaction {
        let mut txins: Vec<TxIn> = Vec::new();
        txins.push(TxIn {
-               prev_hash: prev_hash.clone(),
-               prev_index: htlc.transaction_output_index,
+               previous_output: OutPoint {
+                       txid: prev_hash.clone(),
+                       vout: htlc.transaction_output_index,
+               },
                script_sig: Script::new(),
                sequence: 0,
                witness: Vec::new(),
Personal fork of Rust-Lightning. Upstream is https://github.com/rust-bitcoin/rust-lightning