diff --git a/contrib/remote_hsmd/NOTES.md b/contrib/remote_hsmd/NOTES.md index f9a651c8a3ae..4d8d204d4530 100644 --- a/contrib/remote_hsmd/NOTES.md +++ b/contrib/remote_hsmd/NOTES.md @@ -3,8 +3,8 @@ c-lightning Setup - cd contrib/remote_hsmd && \ - ln -s /path/to/rust-lightning-signer/src/server/remotesigner.proto + (cd contrib/remote_hsmd && \ + ln -s ../../../rust-lightning-signer/src/server/remotesigner.proto) Building @@ -20,6 +20,10 @@ https://github.com/golemfactory/golem/issues/2168 for background. pip3 install --user base58 pip3 install --user bitstring pip3 install --user secp256k1 + pip3 install --user mrkd + + # in c-lightning root: + pip3 install --user -r requirements.txt Run all of the integration tests: @@ -83,14 +87,3 @@ rust-lightning-signer ---------------------------------------------------------------- cargo run --bin server |& tee log3 - -Signing Formats -``` -rust-lightning c-lightning rust-lightning-signer -p2pkh P2PKH -p2sh -p2wpkh p2wpkh P2WPKH -p2shwpkh p2sh-p2wpkh P2SH_P2WPKH -p2wsh -p2shwsh -``` diff --git a/contrib/remote_hsmd/proxy.cc b/contrib/remote_hsmd/proxy.cc index d7e4d2db5120..9d2e04795808 100644 --- a/contrib/remote_hsmd/proxy.cc +++ b/contrib/remote_hsmd/proxy.cc @@ -572,7 +572,10 @@ proxy_stat proxy_handle_ready_channel( req.mutable_remote_basepoints()); req.set_remote_to_self_delay(remote_to_self_delay); marshal_script(remote_shutdown_script, req.mutable_remote_shutdown_script()); - req.set_option_static_remotekey(option_static_remotekey); + req.set_commitment_type( + option_static_remotekey ? + ReadyChannelRequest_CommitmentType_STATIC_REMOTEKEY : + ReadyChannelRequest_CommitmentType_LEGACY); ClientContext context; ReadyChannelReply rsp;