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