[lightning-listfunds] Missing field

[bubelov]

It looks like reserved_to_block field is missing from gRPC mapping:

lightning/cln-grpc/proto/node.proto

Lines 261 to 277 in 5444a84

	message ListfundsOutputs {
	// ListFunds.outputs[].status
	enum ListfundsOutputsStatus {
	UNCONFIRMED = 0;
	CONFIRMED = 1;
	SPENT = 2;
	}
	bytes txid = 1;
	uint32 output = 2;
	Amount amount_msat = 3;
	bytes scriptpubkey = 4;
	optional string address = 5;
	optional bytes redeemscript = 6;
	ListfundsOutputsStatus status = 7;
	bool reserved = 9;
	optional uint32 blockheight = 8;
	}

Is it intentional? It looks like CLI can return this field under certain conditions:

lightning/wallet/walletrpc.c

Lines 284 to 286 in 9a880a0

	if (reserved)
	json_add_num(response, "reserved_to_block",
	utxo->reserved_til);

[vincenzopalazzo]

Yeah this was reported in some other issue as well, I think the code generator has bug for the optional filed

[bubelov]

@vincenzopalazzo does it generate from this?

lightning/.msggen.json

Lines 580 to 589 in 9a880a0

	"ListfundsOutputs": {
	"ListFunds.outputs[].address": 5,
	"ListFunds.outputs[].amount_msat": 3,
	"ListFunds.outputs[].blockheight": 8,
	"ListFunds.outputs[].output": 2,
	"ListFunds.outputs[].redeemscript": 6,
	"ListFunds.outputs[].reserved": 9,
	"ListFunds.outputs[].scriptpubkey": 4,
	"ListFunds.outputs[].status": 7,
	"ListFunds.outputs[].txid": 1

lightning/cln-rpc/src/model.rs

Lines 1273 to 1292 in 9a880a0

	pub struct ListfundsOutputs {
	#[serde(alias = "txid")]
	pub txid: String,
	#[serde(alias = "output")]
	pub output: u32,
	#[serde(alias = "amount_msat")]
	pub amount_msat: Amount,
	#[serde(alias = "scriptpubkey")]
	pub scriptpubkey: String,
	#[serde(alias = "address", skip_serializing_if = "Option::is_none")]
	pub address: Option<String>,
	#[serde(alias = "redeemscript", skip_serializing_if = "Option::is_none")]
	pub redeemscript: Option<String>,
	// Path `ListFunds.outputs[].status`
	#[serde(rename = "status")]
	pub status: ListfundsOutputsStatus,
	#[serde(alias = "reserved")]
	pub reserved: bool,
	#[serde(alias = "blockheight", skip_serializing_if = "Option::is_none")]
	pub blockheight: Option<u32>,

It has a bunch of optional fields already so it doesn't look like it can't parse Rust's Option enums or something

[vincenzopalazzo]

The optional field can be also filed that exist only in a if-else JSON schema clause

[daywalker90]

fixed in master with #7218

[vincenzopalazzo]

Lovelly @daywalker90 thanks! Looks like that you are the new msggen kind 😸