projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cast weights to u64 to support the new rust-bitcoin api
[rust-lightning]
/
src
/
ln
/
chan_utils.rs
diff --git
a/src/ln/chan_utils.rs
b/src/ln/chan_utils.rs
index eab80a54e797cd9489e2fe25c59dc76f15375c48..1d8dd30760f4b7384ec247a5bfae1f6482d523a7 100644
(file)
--- a/
src/ln/chan_utils.rs
+++ b/
src/ln/chan_utils.rs
@@
-133,7
+133,7
@@
pub fn get_revokeable_redeemscript(revocation_key: &PublicKey, to_self_delay: u1
.push_slice(&revocation_key.serialize())
.push_opcode(opcodes::all::OP_ELSE)
.push_int(to_self_delay as i64)
.push_slice(&revocation_key.serialize())
.push_opcode(opcodes::all::OP_ELSE)
.push_int(to_self_delay as i64)
- .push_opcode(opcodes::OP_CSV)
+ .push_opcode(opcodes::
all::
OP_CSV)
.push_opcode(opcodes::all::OP_DROP)
.push_slice(&delayed_payment_key.serialize())
.push_opcode(opcodes::all::OP_ENDIF)
.push_opcode(opcodes::all::OP_DROP)
.push_slice(&delayed_payment_key.serialize())
.push_opcode(opcodes::all::OP_ENDIF)
@@
-206,7
+206,7
@@
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a
.push_opcode(opcodes::all::OP_ELSE)
.push_opcode(opcodes::all::OP_DROP)
.push_int(htlc.cltv_expiry as i64)
.push_opcode(opcodes::all::OP_ELSE)
.push_opcode(opcodes::all::OP_DROP)
.push_int(htlc.cltv_expiry as i64)
- .push_opcode(opcodes::OP_CLTV)
+ .push_opcode(opcodes::
all::
OP_CLTV)
.push_opcode(opcodes::all::OP_DROP)
.push_opcode(opcodes::all::OP_CHECKSIG)
.push_opcode(opcodes::all::OP_ENDIF)
.push_opcode(opcodes::all::OP_DROP)
.push_opcode(opcodes::all::OP_CHECKSIG)
.push_opcode(opcodes::all::OP_ENDIF)