Skip to content

Commit 131a866

Browse files
authored
Replaced option_static_remotekey w/ CommitmentType. (#18)
* Replaced option_static_remotekey w/ CommitmentType. * Improved NOTES
1 parent b8ff4fa commit 131a866

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

contrib/remote_hsmd/NOTES.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ c-lightning
33

44
Setup
55

6-
cd contrib/remote_hsmd && \
7-
ln -s /path/to/rust-lightning-signer/src/server/remotesigner.proto
6+
(cd contrib/remote_hsmd && \
7+
ln -s ../../../rust-lightning-signer/src/server/remotesigner.proto)
88

99
Building
1010

@@ -20,6 +20,10 @@ https://github.com/golemfactory/golem/issues/2168 for background.
2020
pip3 install --user base58
2121
pip3 install --user bitstring
2222
pip3 install --user secp256k1
23+
pip3 install --user mrkd
24+
25+
# in c-lightning root:
26+
pip3 install --user -r requirements.txt
2327

2428
Run all of the integration tests:
2529

@@ -83,14 +87,3 @@ rust-lightning-signer
8387
----------------------------------------------------------------
8488

8589
cargo run --bin server |& tee log3
86-
87-
Signing Formats
88-
```
89-
rust-lightning c-lightning rust-lightning-signer
90-
p2pkh P2PKH
91-
p2sh
92-
p2wpkh p2wpkh P2WPKH
93-
p2shwpkh p2sh-p2wpkh P2SH_P2WPKH
94-
p2wsh
95-
p2shwsh
96-
```

contrib/remote_hsmd/proxy.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,10 @@ proxy_stat proxy_handle_ready_channel(
572572
req.mutable_remote_basepoints());
573573
req.set_remote_to_self_delay(remote_to_self_delay);
574574
marshal_script(remote_shutdown_script, req.mutable_remote_shutdown_script());
575-
req.set_option_static_remotekey(option_static_remotekey);
575+
req.set_commitment_type(
576+
option_static_remotekey ?
577+
ReadyChannelRequest_CommitmentType_STATIC_REMOTEKEY :
578+
ReadyChannelRequest_CommitmentType_LEGACY);
576579

577580
ClientContext context;
578581
ReadyChannelReply rsp;

0 commit comments

Comments
 (0)