Skip to content

Commit 1affe42

Browse files
ksedgwicksedgwic
committed
Adapted to remoteserver API cleanup.
1 parent d9ae567 commit 1affe42

File tree

1 file changed

+48
-80
lines changed

1 file changed

+48
-80
lines changed

‎contrib/remote_hsmd/proxy.cc‎

Lines changed: 48 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,14 @@ string serialized_tx(struct bitcoin_tx const *tx, bool bip144)
110110
return retval;
111111
}
112112

113-
void marshal_secret(struct secret const *ss, Secret * o_sp)
113+
void marshal_channel_nonce(struct node_id *peer_id, u64 dbid,
114+
ChannelNonce *o_np)
115+
{
116+
o_np->set_data(string((char const *)peer_id->k, sizeof(peer_id->k)) +
117+
string((char const *)&dbid, sizeof(dbid)));
118+
}
119+
120+
void marshal_secret(struct secret const *ss, Secret *o_sp)
114121
{
115122
o_sp->set_data(ss->data, sizeof(ss->data));
116123
}
@@ -140,12 +147,6 @@ void marshal_single_input_tx(struct bitcoin_tx const *tx, Transaction *o_tp)
140147
}
141148
}
142149

143-
string channel_nonce(struct node_id *peer_id, u64 dbid)
144-
{
145-
return string((char const *)peer_id->k, sizeof(peer_id->k)) +
146-
string((char const *)&dbid, sizeof(dbid));
147-
}
148-
149150
void unmarshal_secret(Secret const &ss, struct secret *o_sp)
150151
{
151152
assert(ss.data().size() == sizeof(o_sp->data));
@@ -267,40 +268,8 @@ proxy_stat proxy_init_hsm(struct bip32_key_version *bip32_key_version,
267268
last_message = "";
268269
InitRequest req;
269270

270-
auto kv = req.mutable_key_version();
271-
kv->set_pubkey_version(bip32_key_version->bip32_pubkey_version);
272-
kv->set_privkey_version(bip32_key_version->bip32_privkey_version);
273-
274271
auto cp = req.mutable_chainparams();
275272
cp->set_network_name(chainparams->network_name);
276-
cp->set_bip173_name(chainparams->bip173_name);
277-
cp->set_bip70_name(chainparams->bip70_name);
278-
cp->set_genesis_blockhash(
279-
&chainparams->genesis_blockhash.shad.sha.u.u8,
280-
sizeof(chainparams->genesis_blockhash.shad.sha.u.u8));
281-
cp->set_rpc_port(chainparams->rpc_port);
282-
cp->set_cli(chainparams->cli);
283-
cp->set_cli_args(chainparams->cli_args);
284-
cp->set_cli_min_supported_version(
285-
chainparams->cli_min_supported_version);
286-
cp->set_dust_limit_sat(chainparams->dust_limit.satoshis);
287-
cp->set_max_funding_sat(chainparams->max_funding.satoshis);
288-
cp->set_max_payment_msat(chainparams->max_payment.millisatoshis);
289-
cp->set_when_lightning_became_cool(
290-
chainparams->when_lightning_became_cool);
291-
cp->set_p2pkh_version(chainparams->p2pkh_version);
292-
cp->set_p2sh_version(chainparams->p2sh_version);
293-
cp->set_testnet(chainparams->testnet);
294-
295-
auto kv2 = cp->mutable_bip32_key_version();
296-
kv2->set_pubkey_version(
297-
chainparams->bip32_key_version.bip32_pubkey_version);
298-
kv2->set_privkey_version(
299-
chainparams->bip32_key_version.bip32_privkey_version);
300-
301-
cp->set_is_elements(chainparams->is_elements);
302-
cp->set_fee_asset_tag(&chainparams->fee_asset_tag,
303-
sizeof(chainparams->fee_asset_tag));
304273

305274
/* FIXME - Sending the secret instead of generating on the remote. */
306275
marshal_secret(hsm_secret, req.mutable_hsm_secret());
@@ -309,8 +278,8 @@ proxy_stat proxy_init_hsm(struct bip32_key_version *bip32_key_version,
309278
InitReply rsp;
310279
Status status = stub->Init(&context, req, &rsp);
311280
if (status.ok()) {
312-
unmarshal_node_id(rsp.self_node_id(), o_node_id);
313-
unmarshal_node_id(rsp.self_node_id(), &self_id);
281+
unmarshal_node_id(rsp.node_id(), o_node_id);
282+
unmarshal_node_id(rsp.node_id(), &self_id);
314283
status_debug("%s:%d %s node_id=%s",
315284
__FILE__, __LINE__, __FUNCTION__,
316285
dump_node_id(o_node_id).c_str());
@@ -337,7 +306,7 @@ proxy_stat proxy_handle_ecdh(const struct pubkey *point,
337306

338307
last_message = "";
339308
ECDHRequest req;
340-
marshal_node_id(&self_id, req.mutable_self_node_id());
309+
marshal_node_id(&self_id, req.mutable_node_id());
341310
marshal_pubkey(point, req.mutable_point());
342311

343312
ClientContext context;
@@ -378,9 +347,8 @@ proxy_stat proxy_handle_pass_client_hsmfd(
378347

379348
last_message = "";
380349
NewChannelRequest req;
381-
marshal_node_id(&self_id, req.mutable_self_node_id());
382-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
383-
req.set_capabilities(capabilities);
350+
marshal_node_id(&self_id, req.mutable_node_id());
351+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
384352

385353
ClientContext context;
386354
NewChannelReply rsp;
@@ -431,8 +399,8 @@ proxy_stat proxy_handle_sign_withdrawal_tx(
431399

432400
last_message = "";
433401
SignFundingTxRequest req;
434-
marshal_node_id(&self_id, req.mutable_self_node_id());
435-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
402+
marshal_node_id(&self_id, req.mutable_node_id());
403+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
436404

437405
req.mutable_tx()->set_raw_tx_bytes(serialized_tx(tx, true));
438406
assert(tx->wtx->num_inputs == tal_count(utxos));
@@ -517,8 +485,8 @@ proxy_stat proxy_handle_sign_remote_commitment_tx(
517485

518486
last_message = "";
519487
SignRemoteCommitmentTxRequest req;
520-
marshal_node_id(&self_id, req.mutable_self_node_id());
521-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
488+
marshal_node_id(&self_id, req.mutable_node_id());
489+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
522490
marshal_pubkey(remote_funding_pubkey,
523491
req.mutable_remote_funding_pubkey());
524492
marshal_pubkey(remote_per_commit,
@@ -573,8 +541,8 @@ proxy_stat proxy_handle_get_per_commitment_point(
573541

574542
last_message = "";
575543
GetPerCommitmentPointRequest req;
576-
marshal_node_id(&self_id, req.mutable_self_node_id());
577-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
544+
marshal_node_id(&self_id, req.mutable_node_id());
545+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
578546
req.set_n(n);
579547

580548
ClientContext context;
@@ -710,7 +678,7 @@ proxy_stat proxy_handle_channel_update_sig(
710678

711679
last_message = "";
712680
SignChannelUpdateRequest req;
713-
marshal_node_id(&self_id, req.mutable_self_node_id());
681+
marshal_node_id(&self_id, req.mutable_node_id());
714682
req.set_channel_update(channel_update + offset, cusz - offset);
715683

716684
ClientContext context;
@@ -750,8 +718,8 @@ proxy_stat proxy_handle_get_channel_basepoints(
750718

751719
last_message = "";
752720
GetChannelBasepointsRequest req;
753-
marshal_node_id(&self_id, req.mutable_self_node_id());
754-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
721+
marshal_node_id(&self_id, req.mutable_node_id());
722+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
755723

756724
ClientContext context;
757725
GetChannelBasepointsReply rsp;
@@ -829,8 +797,8 @@ proxy_stat proxy_handle_sign_mutual_close_tx(
829797

830798
last_message = "";
831799
SignMutualCloseTxRequest req;
832-
marshal_node_id(&self_id, req.mutable_self_node_id());
833-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
800+
marshal_node_id(&self_id, req.mutable_node_id());
801+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
834802
marshal_pubkey(remote_funding_pubkey,
835803
req.mutable_remote_funding_pubkey());
836804
marshal_single_input_tx(tx, req.mutable_tx());
@@ -883,8 +851,8 @@ proxy_stat proxy_handle_sign_commitment_tx(
883851

884852
last_message = "";
885853
SignCommitmentTxRequest req;
886-
marshal_node_id(&self_id, req.mutable_self_node_id());
887-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
854+
marshal_node_id(&self_id, req.mutable_node_id());
855+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
888856
marshal_pubkey(remote_funding_pubkey,
889857
req.mutable_remote_funding_pubkey());
890858
marshal_single_input_tx(tx, req.mutable_tx());
@@ -934,8 +902,8 @@ proxy_stat proxy_handle_cannouncement_sig(
934902

935903
last_message = "";
936904
SignChannelAnnouncementRequest req;
937-
marshal_node_id(&self_id, req.mutable_self_node_id());
938-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
905+
marshal_node_id(&self_id, req.mutable_node_id());
906+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
939907
req.set_channel_announcement(channel_announcement,
940908
tal_count(channel_announcement));
941909

@@ -992,10 +960,10 @@ proxy_stat proxy_handle_sign_local_htlc_tx(
992960

993961
last_message = "";
994962
SignLocalHTLCTxRequest req;
995-
marshal_node_id(&self_id, req.mutable_self_node_id());
996-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
997-
req.set_commit_num(commit_num);
998-
req.set_wscript(wscript, tal_count(wscript));
963+
marshal_node_id(&self_id, req.mutable_node_id());
964+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
965+
req.set_n(commit_num);
966+
req.set_witscript(wscript, tal_count(wscript));
999967
marshal_single_input_tx(tx, req.mutable_tx());
1000968

1001969
ClientContext context;
@@ -1047,11 +1015,11 @@ proxy_stat proxy_handle_sign_remote_htlc_tx(
10471015

10481016
last_message = "";
10491017
SignRemoteHTLCTxRequest req;
1050-
marshal_node_id(&self_id, req.mutable_self_node_id());
1051-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
1018+
marshal_node_id(&self_id, req.mutable_node_id());
1019+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
10521020
marshal_pubkey(remote_per_commit_point,
10531021
req.mutable_remote_per_commit_point());
1054-
req.set_wscript(wscript, tal_count(wscript));
1022+
req.set_witscript(wscript, tal_count(wscript));
10551023
marshal_single_input_tx(tx, req.mutable_tx());
10561024

10571025
ClientContext context;
@@ -1104,10 +1072,10 @@ proxy_stat proxy_handle_sign_delayed_payment_to_us(
11041072

11051073
last_message = "";
11061074
SignDelayedPaymentToUsRequest req;
1107-
marshal_node_id(&self_id, req.mutable_self_node_id());
1108-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
1109-
req.set_commit_num(commit_num);
1110-
req.set_wscript(wscript, tal_count(wscript));
1075+
marshal_node_id(&self_id, req.mutable_node_id());
1076+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
1077+
req.set_n(commit_num);
1078+
req.set_witscript(wscript, tal_count(wscript));
11111079
marshal_single_input_tx(tx, req.mutable_tx());
11121080

11131081
ClientContext context;
@@ -1157,11 +1125,11 @@ proxy_stat proxy_handle_sign_remote_htlc_to_us(
11571125

11581126
last_message = "";
11591127
SignRemoteHTLCToUsRequest req;
1160-
marshal_node_id(&self_id, req.mutable_self_node_id());
1161-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
1128+
marshal_node_id(&self_id, req.mutable_node_id());
1129+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
11621130
marshal_pubkey(remote_per_commit_point,
11631131
req.mutable_remote_per_commit_point());
1164-
req.set_wscript(wscript, tal_count(wscript));
1132+
req.set_witscript(wscript, tal_count(wscript));
11651133
marshal_single_input_tx(tx, req.mutable_tx());
11661134

11671135
ClientContext context;
@@ -1215,10 +1183,10 @@ proxy_stat proxy_handle_sign_penalty_to_us(
12151183

12161184
last_message = "";
12171185
SignPenaltyToUsRequest req;
1218-
marshal_node_id(&self_id, req.mutable_self_node_id());
1219-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
1186+
marshal_node_id(&self_id, req.mutable_node_id());
1187+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
12201188
marshal_secret(revocation_secret, req.mutable_revocation_secret());
1221-
req.set_wscript(wscript, tal_count(wscript));
1189+
req.set_witscript(wscript, tal_count(wscript));
12221190
marshal_single_input_tx(tx, req.mutable_tx());
12231191

12241192
ClientContext context;
@@ -1267,8 +1235,8 @@ proxy_stat proxy_handle_check_future_secret(
12671235

12681236
last_message = "";
12691237
CheckFutureSecretRequest req;
1270-
marshal_node_id(&self_id, req.mutable_self_node_id());
1271-
req.set_channel_nonce(channel_nonce(peer_id, dbid));
1238+
marshal_node_id(&self_id, req.mutable_node_id());
1239+
marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
12721240
req.set_n(n);
12731241
marshal_secret(suggested, req.mutable_suggested());
12741242

@@ -1310,7 +1278,7 @@ proxy_stat proxy_handle_sign_node_announcement(
13101278

13111279
last_message = "";
13121280
SignNodeAnnouncementRequest req;
1313-
marshal_node_id(&self_id, req.mutable_self_node_id());
1281+
marshal_node_id(&self_id, req.mutable_node_id());
13141282
req.set_node_announcement(node_announcement + offset, cusz - offset);
13151283

13161284
ClientContext context;

0 commit comments

Comments
 (0)