@@ -136,7 +136,7 @@ void marshal_pubkey(struct pubkey const *pp, PubKey *o_pp)
136136void marshal_utxo (struct utxo const *up, InputDescriptor *idesc)
137137{
138138 idesc->mutable_key_loc ()->set_key_index (up->keyindex );
139- idesc->mutable_prev_output ()->set_value (up->amount .satoshis );
139+ idesc->mutable_prev_output ()->set_value_sat (up->amount .satoshis );
140140 /* FIXME - where does pk_script come from? */
141141 idesc->set_spend_type (up->is_p2sh
142142 ? SpendType::P2SH_P2WPKH
@@ -192,7 +192,7 @@ void marshal_single_input_tx(struct bitcoin_tx const *tx,
192192
193193 assert (tx->wtx ->num_inputs == 1 );
194194 InputDescriptor *idesc = o_tp->add_input_descs ();
195- idesc->mutable_prev_output ()->set_value (tx->input_amounts [0 ]->satoshis );
195+ idesc->mutable_prev_output ()->set_value_sat (tx->input_amounts [0 ]->satoshis );
196196 /* FIXME - What else needs to be set? */
197197
198198 for (size_t ii = 0 ; ii < tx->wtx ->num_outputs ; ii++) {
@@ -561,7 +561,7 @@ proxy_stat proxy_handle_ready_channel(
561561 marshal_node_id (&self_id, req.mutable_node_id ());
562562 marshal_channel_nonce (peer_id, dbid, req.mutable_channel_nonce ());
563563 req.set_is_outbound (is_outbound);
564- req.set_channel_value_satoshi (channel_value->satoshis );
564+ req.set_channel_value_sat (channel_value->satoshis );
565565 marshal_outpoint (funding_txid, funding_txout, req.mutable_funding_outpoint ());
566566 req.set_local_to_self_delay (local_to_self_delay);
567567 marshal_script (local_shutdown_script, req.mutable_local_shutdown_script ());
0 commit comments