lightningd: remove deprecations due in v26.12
What changed, and why it matters
This commit removes old, previously-announced deprecated API fields and shapes from Core Lightning. It is a planned cleanup, not a security fix. Plugins or clients that still relied on the old fields will break or need to be updated, but there is no new vulnerability introduced.
Treat as a normal API-cleanup commit. Operators and plugin authors should verify their integrations no longer depend on the removed deprecated fields. No urgent security patch is required.
Security signals we found
Removal of deprecated API surface reduces attack surface and maintenance burden
No new memory safety, cryptographic, or authorization issue visible in diff
Changes are cleanup of previously announced deprecations with explicit version lifetimes
Potential compatibility breakage for downstream plugins/clients still using removed fields
Evidence from the diff
The commit deletes deprecated output compatibility for several JSON-RPC/plugin notifications and the wait response: coin_movement legacy tags/txid/utxo_txid/vout, channel_state_changed null short_channel_id, plugin notification legacy payload object and flat unwrapped fields, pay_notifications raw fields, and wait.details. Corresponding code, schemas, gRPC/Protobuf definitions, Rust and Python client shims, and tests are updated. The changes are guarded by prior deprecation notices and version windows (v25.05/v25.09 through v26.06/v26.09).
Changed components
lightningd/coin_mvts.c/hlightningd/notification.clightningd/wait.cplugins/libplugin-pay.cplugins/src/lib.rscln-grpc/proto/node.protocln-grpc/src/convert.rscln-rpc/src/model.rscln-rpc/src/notifications.rscontrib/pyln-client/pyln/client/plugin.pycontrib/pyln-testing/pyln/testing/fixtures.pycontrib/pyln-testing/pyln/testing/grpc2py.pydoc/schemas/notification/channel_state_changed.jsondoc/schemas/notification/coin_movement.jsondoc/schemas/wait.jsondoc/developers-guide/deprecated-features.mdcontrib/msggen/msggen/schema.jsonInspect captured patch +663 / −1398
### cln-grpc/proto/node.proto
@@ -3059,7 +3059,6 @@ message WaitResponse {
optional uint64 created = 2;
optional uint64 updated = 3;
optional uint64 deleted = 4;
- optional WaitDetails details = 5 [deprecated = true];
optional WaitForwards forwards = 6;
optional WaitInvoices invoices = 7;
optional WaitSendpays sendpays = 8;
@@ -3081,33 +3080,6 @@ message WaitChannelmoves {
Amount debit_msat = 3;
}
-message WaitDetails {
- // Wait.details.status
- enum WaitDetailsStatus {
- UNPAID = 0 [deprecated = true];
- PAID = 1 [deprecated = true];
- EXPIRED = 2 [deprecated = true];
- PENDING = 3 [deprecated = true];
- FAILED = 4 [deprecated = true];
- COMPLETE = 5 [deprecated = true];
- OFFERED = 6 [deprecated = true];
- SETTLED = 7 [deprecated = true];
- LOCAL_FAILED = 8 [deprecated = true];
- }
- optional WaitDetailsStatus status = 1 [deprecated = true];
- optional string label = 2 [deprecated = true];
- optional string description = 3 [deprecated = true];
- optional string bolt11 = 4 [deprecated = true];
- optional string bolt12 = 5 [deprecated = true];
- optional uint64 partid = 6 [deprecated = true];
- optional uint64 groupid = 7 [deprecated = true];
- optional bytes payment_hash = 8 [deprecated = true];
- optional string in_channel = 9 [deprecated = true];
- optional uint64 in_htlc_id = 10 [deprecated = true];
- optional Amount in_msat = 11 [deprecated = true];
- optional string out_channel = 12 [deprecated = true];
-}
-
message WaitForwards {
// Wait.forwards.status
enum WaitForwardsStatus {
@@ -4813,7 +4785,6 @@ message CoinMovementNotification {
Amount credit_msat = 7;
Amount debit_msat = 8;
uint64 timestamp = 9;
- repeated string tags = 10 [deprecated = true];
optional CoinMovementPrimaryTag primary_tag = 11;
repeated string extra_tags = 12;
optional bytes payment_hash = 13;
@@ -4823,10 +4794,7 @@ message CoinMovementNotification {
optional Outpoint utxo = 17;
optional bytes peer_id = 18;
optional string originating_account = 19;
- optional bytes txid = 20 [deprecated = true];
optional bytes spending_txid = 21;
- optional bytes utxo_txid = 22 [deprecated = true];
- optional uint32 vout = 23 [deprecated = true];
optional Amount output_msat = 24;
optional uint32 output_count = 25;
optional uint32 blockheight = 26;
### cln-grpc/src/convert.rs
@@ -2942,37 +2942,6 @@ impl From<responses::WaitChannelmoves> for pb::WaitChannelmoves {
}
}
-#[allow(unused_variables,deprecated)]
-impl From<responses::WaitDetails> for pb::WaitDetails {
- fn from(c: responses::WaitDetails) -> Self {
- Self {
- #[allow(deprecated)]
- bolt11: c.bolt11, // Rule #2 for type string?
- #[allow(deprecated)]
- bolt12: c.bolt12, // Rule #2 for type string?
- #[allow(deprecated)]
- description: c.description, // Rule #2 for type string?
- #[allow(deprecated)]
- groupid: c.groupid, // Rule #2 for type u64?
- #[allow(deprecated)]
- in_channel: c.in_channel.map(|v| v.to_string()), // Rule #2 for type short_channel_id?
- #[allow(deprecated)]
- in_htlc_id: c.in_htlc_id, // Rule #2 for type u64?
- #[allow(deprecated)]
- in_msat: c.in_msat.map(|f| f.into()), // Rule #2 for type msat?
- #[allow(deprecated)]
- label: c.label, // Rule #2 for type string?
- #[allow(deprecated)]
- out_channel: c.out_channel.map(|v| v.to_string()), // Rule #2 for type short_channel_id?
- #[allow(deprecated)]
- partid: c.partid, // Rule #2 for type u64?
- #[allow(deprecated)]
- payment_hash: c.payment_hash.map(|v| <Sha256 as AsRef<[u8]>>::as_ref(&v).to_vec()), // Rule #2 for type hash?
- status: c.status.map(|v| v as i32),
- }
- }
-}
-
#[allow(unused_variables)]
impl From<responses::WaitForwards> for pb::WaitForwards {
fn from(c: responses::WaitForwards) -> Self {
@@ -3037,15 +3006,14 @@ impl From<responses::WaitSendpays> for pb::WaitSendpays {
}
}
-#[allow(unused_variables,deprecated)]
+#[allow(unused_variables)]
impl From<responses::WaitResponse> for pb::WaitResponse {
fn from(c: responses::WaitResponse) -> Self {
Self {
chainmoves: c.chainmoves.map(|v| v.into()),
channelmoves: c.channelmoves.map(|v| v.into()),
created: c.created, // Rule #2 for type u64?
deleted: c.deleted, // Rule #2 for type u64?
- details: c.details.map(|v| v.into()),
forwards: c.forwards.map(|v| v.into()),
htlcs: c.htlcs.map(|v| v.into()),
invoices: c.invoices.map(|v| v.into()),
@@ -5180,7 +5148,7 @@ impl From<notifications::ConnectNotification> for pb::PeerConnectNotification {
}
}
-#[allow(unused_variables,deprecated)]
+#[allow(unused_variables)]
impl From<notifications::CoinMovementNotification> for pb::CoinMovementNotification {
fn from(c: notifications::CoinMovementNotification) -> Self {
Self {
@@ -5203,18 +5171,10 @@ impl From<notifications::CoinMovementNotification> for pb::CoinMovementNotificat
peer_id: c.peer_id.map(|v| v.serialize().to_vec()), // Rule #2 for type pubkey?
primary_tag: c.primary_tag.map(|v| v as i32),
spending_txid: c.spending_txid.map(|v| hex::decode(v).unwrap()), // Rule #2 for type txid?
- // Field: coin_movement.tags[]
- tags: c.tags.map(|arr| arr.into_iter().map(|i| i.into()).collect()).unwrap_or(vec![]), // Rule #3
timestamp: c.timestamp, // Rule #2 for type u64
- #[allow(deprecated)]
- txid: c.txid.map(|v| hex::decode(v).unwrap()), // Rule #2 for type txid?
item_type: c.item_type as i32,
utxo: c.utxo.map(|o|o.into()), // Rule #2 for type outpoint?
- #[allow(deprecated)]
- utxo_txid: c.utxo_txid.map(|v| hex::decode(v).unwrap()), // Rule #2 for type txid?
version: c.version, // Rule #2 for type u32
- #[allow(deprecated)]
- vout: c.vout, // Rule #2 for type u32?
}
}
}
### cln-rpc/src/model.rs
@@ -10582,105 +10582,6 @@ pub mod responses {
}
}
- /// ['Status of the payment.', 'Still ongoing, completed, failed locally, or failed after forwarding.', "Whether it's paid, unpaid or unpayable."]
- #[deprecated]
- #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
- #[allow(non_camel_case_types)]
- pub enum WaitDetailsStatus {
- #[serde(rename = "unpaid")]
- UNPAID = 0,
- #[serde(rename = "paid")]
- PAID = 1,
- #[serde(rename = "expired")]
- EXPIRED = 2,
- #[serde(rename = "pending")]
- PENDING = 3,
- #[serde(rename = "failed")]
- FAILED = 4,
- #[serde(rename = "complete")]
- COMPLETE = 5,
- #[serde(rename = "offered")]
- OFFERED = 6,
- #[serde(rename = "settled")]
- SETTLED = 7,
- #[serde(rename = "local_failed")]
- LOCAL_FAILED = 8,
- }
-
- impl TryFrom<i32> for WaitDetailsStatus {
- type Error = anyhow::Error;
- fn try_from(c: i32) -> Result<WaitDetailsStatus, anyhow::Error> {
- match c {
- 0 => Ok(WaitDetailsStatus::UNPAID),
- 1 => Ok(WaitDetailsStatus::PAID),
- 2 => Ok(WaitDetailsStatus::EXPIRED),
- 3 => Ok(WaitDetailsStatus::PENDING),
- 4 => Ok(WaitDetailsStatus::FAILED),
- 5 => Ok(WaitDetailsStatus::COMPLETE),
- 6 => Ok(WaitDetailsStatus::OFFERED),
- 7 => Ok(WaitDetailsStatus::SETTLED),
- 8 => Ok(WaitDetailsStatus::LOCAL_FAILED),
- o => Err(anyhow::anyhow!("Unknown variant {} for enum WaitDetailsStatus", o)),
- }
- }
- }
-
- impl ToString for WaitDetailsStatus {
- fn to_string(&self) -> String {
- match self {
- WaitDetailsStatus::COMPLETE => "COMPLETE",
- WaitDetailsStatus::EXPIRED => "EXPIRED",
- WaitDetailsStatus::FAILED => "FAILED",
- WaitDetailsStatus::LOCAL_FAILED => "LOCAL_FAILED",
- WaitDetailsStatus::OFFERED => "OFFERED",
- WaitDetailsStatus::PAID => "PAID",
- WaitDetailsStatus::PENDING => "PENDING",
- WaitDetailsStatus::SETTLED => "SETTLED",
- WaitDetailsStatus::UNPAID => "UNPAID",
- }.to_string()
- }
- }
-
- #[deprecated = "deprecated since CLN v25.05"]
- #[derive(Clone, Debug, Deserialize, Serialize)]
- pub struct WaitDetails {
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub bolt11: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub bolt12: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub description: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub groupid: Option<u64>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub in_channel: Option<ShortChannelId>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub in_htlc_id: Option<u64>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub in_msat: Option<Amount>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub label: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub out_channel: Option<ShortChannelId>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub partid: Option<u64>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub payment_hash: Option<Sha256>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub status: Option<WaitDetailsStatus>,
- }
-
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct WaitChainmoves {
pub account: String,
@@ -10988,9 +10889,6 @@ pub mod responses {
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct WaitResponse {
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub details: Option<WaitDetails>,
#[serde(skip_serializing_if = "Option::is_none")]
pub chainmoves: Option<WaitChainmoves>,
#[serde(skip_serializing_if = "Option::is_none")]
### cln-rpc/src/notifications.rs
@@ -398,18 +398,6 @@ impl ToString for CoinMovementType {
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct CoinMovementNotification {
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub txid: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub utxo_txid: Option<String>,
- #[deprecated]
- #[serde(skip_serializing_if = "Option::is_none")]
- pub vout: Option<u32>,
- #[deprecated]
- #[serde(skip_serializing_if = "crate::is_none_or_empty")]
- pub tags: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub blockheight: Option<u32>,
#[serde(skip_serializing_if = "Option::is_none")]
### contrib/msggen/msggen/schema.json
@@ -39457,8 +39457,7 @@
"htlcs": {},
"chainmoves": {},
"channelmoves": {},
- "networkevents": {},
- "details": {}
+ "networkevents": {}
},
"allOf": [
{
@@ -39480,51 +39479,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "unpaid",
- "paid",
- "expired"
- ],
- "description": [
- "Whether it's paid, unpaid or unpayable."
- ]
- },
- "label": {
- "type": "string",
- "description": [
- "Unique label supplied at invoice creation."
- ]
- },
- "description": {
- "type": "string",
- "description": [
- "Description used in the invoice."
- ]
- },
- "bolt11": {
- "type": "string",
- "description": [
- "The BOLT11 string."
- ]
- },
- "bolt12": {
- "type": "string",
- "description": [
- "The BOLT12 string."
- ]
- }
- }
- },
"invoices": {
"type": "object",
"added": "v25.05",
@@ -39594,52 +39548,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "offered",
- "settled",
- "failed",
- "local_failed"
- ],
- "description": [
- "Still ongoing, completed, failed locally, or failed after forwarding."
- ]
- },
- "in_channel": {
- "type": "short_channel_id",
- "description": [
- "Unique label supplied at invoice creation."
- ]
- },
- "in_htlc_id": {
- "type": "u64",
- "description": [
- "The unique HTLC id the sender gave this (not present if incoming channel was closed before upgrade to v22.11)."
- ]
- },
- "in_msat": {
- "type": "msat",
- "description": [
- "The value of the incoming HTLC."
- ]
- },
- "out_channel": {
- "type": "short_channel_id",
- "description": [
- "The channel that the HTLC (trying to) forward to."
- ]
- }
- }
- },
"forwards": {
"added": "v25.05",
"type": "object",
@@ -39710,45 +39618,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "pending",
- "failed",
- "complete"
- ],
- "description": [
- "Status of the payment."
- ]
- },
- "partid": {
- "type": "u64",
- "description": [
- "Part number (for multiple parts to a single payment)."
- ]
- },
- "groupid": {
- "type": "u64",
- "description": [
- "Grouping key to disambiguate multiple attempts to pay an invoice or the same payment_hash."
- ]
- },
- "payment_hash": {
- "type": "hash",
- "description": [
- "The hash of the *payment_preimage* which will prove payment."
- ]
- }
- }
- },
"sendpays": {
"type": "object",
"added": "v25.05",
@@ -41764,7 +41633,7 @@
"short_channel_id": {
"type": "short_channel_id",
"description": [
- "The short channel id of the channel. If the channel is not yet confirmed, this field will be null."
+ "The short channel id of the channel. If the channel is not yet confirmed, this field will be missing."
]
},
"timestamp": {
@@ -41928,22 +41797,6 @@
"The UNIX timestamp when the movement was recorded."
]
},
- "tags": {
- "type": "array",
- "description": [
- "Deprecated legacy combined tag array, emitted only for deprecated output compatibility."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ],
- "items": {
- "type": "string",
- "description": [
- "A legacy movement tag."
- ]
- }
- },
"primary_tag": {
"type": "string",
"enum": [
@@ -42032,43 +41885,13 @@
"The originating account for an external chain movement, if any."
]
},
- "txid": {
- "type": "txid",
- "description": [
- "Deprecated legacy field for the spending transaction id."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
"spending_txid": {
"type": "txid",
"description": [
"The spending transaction id for a chain movement, if any."
],
"added": "v25.09"
},
- "utxo_txid": {
- "type": "txid",
- "description": [
- "Deprecated legacy field for the outpoint transaction id."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
- "vout": {
- "type": "u32",
- "description": [
- "Deprecated legacy field for the outpoint output index."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
"output_msat": {
"type": "msat",
"description": [
### contrib/pyln-client/pyln/client/plugin.py
@@ -754,10 +754,6 @@ def _dispatch_notification(self, request: Request) -> None:
# Old style?
if 'payload' in request.params and request.method not in request.params:
request.params[request.method] = request.params['payload']
- # New style?
- elif 'payload' not in request.params and request.method in request.params and self.deprecated_apis:
- # Create payload for older plugins, on modern systems.
- request.params['payload'] = request.params[request.method]
# Always hoist origin into params:
if request.origin and 'origin' not in request.params:
### contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
[binary or diff unavailable]
### contrib/pyln-testing/pyln/testing/fixtures.py
@@ -785,14 +785,15 @@ def checkPluginJSON(node):
req = io["params"][parts[1]]
direction = 1
- # Until v26.09, with channel_state_changed.null_scid, that notification will be non-schema compliant.
- if (
- f.name.startswith("notification_out-channel_state_changed-")
- and node.daemon.opts.get("allow-deprecated-apis", True) is True
- ):
- continue
-
if schema is not None:
+ # channel_state_changed.message is still allowed to be null
+ # while the null_message deprecation is in effect.
+ if (
+ f.name.startswith("notification_out-channel_state_changed-")
+ and node.daemon.opts.get("allow-deprecated-apis", True) is True
+ and req.get("message", "") is None
+ ):
+ continue
try:
schema[direction].validate(req)
except jsonschema.exceptions.ValidationError as e:
### contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -2137,23 +2137,6 @@ def wait_channelmoves2py(m):
})
-def wait_details2py(m):
- return remove_default({
- "status": str(m.status), # EnumField in generate_composite
- "bolt11": m.bolt11, # PrimitiveField in generate_composite
- "bolt12": m.bolt12, # PrimitiveField in generate_composite
- "description": m.description, # PrimitiveField in generate_composite
- "groupid": m.groupid, # PrimitiveField in generate_composite
- "in_channel": m.in_channel, # PrimitiveField in generate_composite
- "in_htlc_id": m.in_htlc_id, # PrimitiveField in generate_composite
- "in_msat": amount2msat(m.in_msat), # PrimitiveField in generate_composite
- "label": m.label, # PrimitiveField in generate_composite
- "out_channel": m.out_channel, # PrimitiveField in generate_composite
- "partid": m.partid, # PrimitiveField in generate_composite
- "payment_hash": hexlify(m.payment_hash), # PrimitiveField in generate_composite
- })
-
-
def wait_forwards2py(m):
return remove_default({
"status": str(m.status), # EnumField in generate_composite
### doc/developers-guide/deprecated-features.md
@@ -9,13 +9,6 @@ privacy:
| Name | Type | First Deprecated | Last Supported | Description |
|----------------------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------|
-| wait.details | Field | v25.05 | v26.06 | Use subsystem-specific object instead |
-| coin_movement.tags | Notification Field | v25.09 | v26.09 | Use `primary_tag` (first tag) and `extra_tags` instead |
-| coin_movement.utxo_txid | Notification Field | v25.09 | v26.09 | Use `utxo` instead of `utxo_txid` & `vout` |
-| coin_movement.txid | Notification Field | v25.09 | v26.09 | Use `spending_txid` instead |
-| channel_state_changed.null_scid | Notification Field | v25.09 | v26.09 | In channel_state_changed notification, `short_channel_id` will be missing instead of `null` |
-| notification.payload | Notification Field | v25.09 | v26.09 | Notifications from plugins used to have fields in `payload` sub-object, now they are not (just like normal notifications) |
-| pay_notifications.raw_fields | Field | v25.09 | v26.09 | `channel_hint_update`, `pay_failure` and `pay_success` notifications now wrap members in an object of the same name |
| encrypted_hsm | Config | v25.12 | v26.12 | `hsm-passphrase` is a name which also makes sense for modern hsm_secrets which use BIP 39 |
| newaddr.addresstype.defaultbech32 | Parameter | v25.12 | v26.12 | Use `p2tr` in the response (present since v23.08 if `addresstype` is `p2tr`, and always present since v24.12). |
| channel_state_changed.null_message | Notification Field | v25.12 | v26.12 | In channel_state_changed notification, `message` will be missing instead of `null` |
### doc/schemas/notification/channel_state_changed.json
@@ -33,7 +33,7 @@
"short_channel_id": {
"type": "short_channel_id",
"description": [
- "The short channel id of the channel. If the channel is not yet confirmed, this field will be null."
+ "The short channel id of the channel. If the channel is not yet confirmed, this field will be missing."
]
},
"timestamp": {
### doc/schemas/notification/coin_movement.json
@@ -83,22 +83,6 @@
"The UNIX timestamp when the movement was recorded."
]
},
- "tags": {
- "type": "array",
- "description": [
- "Deprecated legacy combined tag array, emitted only for deprecated output compatibility."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ],
- "items": {
- "type": "string",
- "description": [
- "A legacy movement tag."
- ]
- }
- },
"primary_tag": {
"type": "string",
"enum": [
@@ -187,43 +171,13 @@
"The originating account for an external chain movement, if any."
]
},
- "txid": {
- "type": "txid",
- "description": [
- "Deprecated legacy field for the spending transaction id."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
"spending_txid": {
"type": "txid",
"description": [
"The spending transaction id for a chain movement, if any."
],
"added": "v25.09"
},
- "utxo_txid": {
- "type": "txid",
- "description": [
- "Deprecated legacy field for the outpoint transaction id."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
- "vout": {
- "type": "u32",
- "description": [
- "Deprecated legacy field for the outpoint output index."
- ],
- "deprecated": [
- "v25.09",
- "v26.09"
- ]
- },
"output_msat": {
"type": "msat",
"description": [
### doc/schemas/wait.json
@@ -101,8 +101,7 @@
"htlcs": {},
"chainmoves": {},
"channelmoves": {},
- "networkevents": {},
- "details": {}
+ "networkevents": {}
},
"allOf": [
{
@@ -124,51 +123,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "unpaid",
- "paid",
- "expired"
- ],
- "description": [
- "Whether it's paid, unpaid or unpayable."
- ]
- },
- "label": {
- "type": "string",
- "description": [
- "Unique label supplied at invoice creation."
- ]
- },
- "description": {
- "type": "string",
- "description": [
- "Description used in the invoice."
- ]
- },
- "bolt11": {
- "type": "string",
- "description": [
- "The BOLT11 string."
- ]
- },
- "bolt12": {
- "type": "string",
- "description": [
- "The BOLT12 string."
- ]
- }
- }
- },
"invoices": {
"type": "object",
"added": "v25.05",
@@ -238,52 +192,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "offered",
- "settled",
- "failed",
- "local_failed"
- ],
- "description": [
- "Still ongoing, completed, failed locally, or failed after forwarding."
- ]
- },
- "in_channel": {
- "type": "short_channel_id",
- "description": [
- "Unique label supplied at invoice creation."
- ]
- },
- "in_htlc_id": {
- "type": "u64",
- "description": [
- "The unique HTLC id the sender gave this (not present if incoming channel was closed before upgrade to v22.11)."
- ]
- },
- "in_msat": {
- "type": "msat",
- "description": [
- "The value of the incoming HTLC."
- ]
- },
- "out_channel": {
- "type": "short_channel_id",
- "description": [
- "The channel that the HTLC (trying to) forward to."
- ]
- }
- }
- },
"forwards": {
"added": "v25.05",
"type": "object",
@@ -354,45 +262,6 @@
"created": {},
"updated": {},
"deleted": {},
- "details": {
- "type": "object",
- "additionalProperties": false,
- "deprecated": [
- "v25.05",
- "v26.06"
- ],
- "properties": {
- "status": {
- "type": "string",
- "enum": [
- "pending",
- "failed",
- "complete"
- ],
- "description": [
- "Status of the payment."
- ]
- },
- "partid": {
- "type": "u64",
- "description": [
- "Part number (for multiple parts to a single payment)."
- ]
- },
- "groupid": {
- "type": "u64",
- "description": [
- "Grouping key to disambiguate multiple attempts to pay an invoice or the same payment_hash."
- ]
- },
- "payment_hash": {
- "type": "hash",
- "description": [
- "The hash of the *payment_preimage* which will prove payment."
- ]
- }
- }
- },
"sendpays": {
"type": "object",
"added": "v25.05",
### lightningd/coin_mvts.c
@@ -151,19 +151,11 @@ void send_account_balance_snapshot(struct lightningd *ld)
}
static void add_movement_tags(struct json_stream *stream,
- bool include_tags_arr,
const struct mvt_tags tags,
bool extra_tags_field)
{
const char **tagstrs = mvt_tag_strs(tmpctx, tags);
- if (include_tags_arr) {
- json_array_start(stream, "tags");
- for (size_t i = 0; i < tal_count(tagstrs); i++)
- json_add_string(stream, NULL, tagstrs[i]);
- json_array_end(stream);
- }
-
json_add_string(stream, "primary_tag", tagstrs[0]);
if (extra_tags_field) {
json_array_start(stream, "extra_tags");
@@ -186,9 +178,6 @@ static void json_add_mvt_account_id(struct json_stream *stream,
}
void json_add_chain_mvt_fields(struct json_stream *stream,
- bool include_tags_arr,
- bool include_old_utxo_fields,
- bool include_old_txid_field,
const struct chain_coin_mvt *chain_mvt,
u64 id)
{
@@ -198,7 +187,7 @@ void json_add_chain_mvt_fields(struct json_stream *stream,
json_add_amount_msat(stream, "credit_msat", chain_mvt->credit);
json_add_amount_msat(stream, "debit_msat", chain_mvt->debit);
json_add_u64(stream, "timestamp", chain_mvt->timestamp);
- add_movement_tags(stream, include_tags_arr, chain_mvt->tags, true);
+ add_movement_tags(stream, chain_mvt->tags, true);
json_add_outpoint(stream, "utxo", &chain_mvt->outpoint);
if (chain_mvt->peer_id)
@@ -207,19 +196,8 @@ void json_add_chain_mvt_fields(struct json_stream *stream,
if (chain_mvt->originating_acct)
json_add_mvt_account_id(stream, "originating_account", chain_mvt->originating_acct);
- if (chain_mvt->spending_txid) {
- if (include_old_txid_field)
- json_add_txid(stream, "txid",
- chain_mvt->spending_txid);
+ if (chain_mvt->spending_txid)
json_add_txid(stream, "spending_txid", chain_mvt->spending_txid);
- }
-
- if (include_old_utxo_fields) {
- json_add_string(stream, "utxo_txid",
- fmt_bitcoin_txid(tmpctx,
- &chain_mvt->outpoint.txid));
- json_add_u32(stream, "vout", chain_mvt->outpoint.n);
- }
/* on-chain htlcs include a payment hash */
if (chain_mvt->payment_hash)
@@ -233,7 +211,6 @@ void json_add_chain_mvt_fields(struct json_stream *stream,
}
void json_add_channel_mvt_fields(struct json_stream *stream,
- bool include_tags_arr,
const struct channel_coin_mvt *chan_mvt,
u64 id,
bool extra_tags_field)
@@ -244,7 +221,7 @@ void json_add_channel_mvt_fields(struct json_stream *stream,
json_add_amount_msat(stream, "credit_msat", chan_mvt->credit);
json_add_amount_msat(stream, "debit_msat", chan_mvt->debit);
json_add_u64(stream, "timestamp", chan_mvt->timestamp);
- add_movement_tags(stream, include_tags_arr, chan_mvt->tags, extra_tags_field);
+ add_movement_tags(stream, chan_mvt->tags, extra_tags_field);
/* push funding / leases don't have a payment_hash */
if (chan_mvt->payment_hash)
@@ -332,7 +309,7 @@ static struct command_result *json_listchainmoves(struct command *cmd,
u64 id;
chain_mvt = wallet_chain_move_extract(cmd, stmt, cmd->ld, &id);
json_object_start(response, NULL);
- json_add_chain_mvt_fields(response, false, false, false, chain_mvt, id);
+ json_add_chain_mvt_fields(response, chain_mvt, id);
json_object_end(response);
}
json_array_end(response);
@@ -385,8 +362,8 @@ static struct command_result *json_listchannelmoves(struct command *cmd,
u64 id;
chan_mvt = wallet_channel_move_extract(cmd, stmt, cmd->ld, &id);
json_object_start(response, NULL);
- /* No deprecated tags[], no extra_tags field */
- json_add_channel_mvt_fields(response, false, chan_mvt, id, false);
+ /* No extra_tags field */
+ json_add_channel_mvt_fields(response, chan_mvt, id, false);
json_object_end(response);
}
json_array_end(response);
### lightningd/coin_mvts.h
@@ -44,13 +44,9 @@ void send_account_balance_snapshot(struct lightningd *ld);
/* Shared by listcoinmoves and notifications code */
void json_add_chain_mvt_fields(struct json_stream *stream,
- bool include_tags_arr,
- bool include_old_utxo_fields,
- bool include_old_txid_field,
const struct chain_coin_mvt *chain_mvt,
u64 id);
void json_add_channel_mvt_fields(struct json_stream *stream,
- bool include_tags_arr,
const struct channel_coin_mvt *chan_mvt,
u64 id,
bool extra_tags_field);
### lightningd/notification.c
@@ -306,11 +306,6 @@ static void channel_state_changed_notification_serialize(struct json_stream *str
json_add_channel_id(stream, "channel_id", cid);
if (scid)
json_add_short_channel_id(stream, "short_channel_id", *scid);
- else if (lightningd_deprecated_out_ok(ld, ld->deprecated_ok,
- "channel_state_changed",
- "null_scid",
- "v25.09", "v26.09"))
- json_add_null(stream, "short_channel_id");
json_add_timeiso(stream, "timestamp", timestamp);
if (old_state != 0)
json_add_string(stream, "old_state", channel_state_str(old_state));
@@ -484,45 +479,26 @@ void notify_channel_mvt(struct lightningd *ld,
const struct channel_coin_mvt *chan_mvt,
u64 id)
{
- bool include_tags_arr;
struct jsonrpc_notification *n = notify_start(ld, "coin_movement");
if (!n)
return;
- include_tags_arr = lightningd_deprecated_out_ok(ld, ld->deprecated_ok,
- "coin_movement", "tags",
- "v25.09", "v26.09");
json_add_standard_notify_mvt_fields(n->stream, ld, "channel_mvt");
/* Adding (empty) extra_tags field unifies this with notify_chain_mvt */
- json_add_channel_mvt_fields(n->stream, include_tags_arr, chan_mvt, id, true);
+ json_add_channel_mvt_fields(n->stream, chan_mvt, id, true);
notify_send(ld, n);
}
void notify_chain_mvt(struct lightningd *ld,
const struct chain_coin_mvt *chain_mvt,
u64 id)
{
- bool include_tags_arr, include_old_utxo_fields, include_old_txid_field;
struct jsonrpc_notification *n = notify_start(ld, "coin_movement");
if (!n)
return;
- include_tags_arr = lightningd_deprecated_out_ok(ld, ld->deprecated_ok,
- "coin_movement", "tags",
- "v25.09", "v26.09");
- include_old_utxo_fields = lightningd_deprecated_out_ok(ld, ld->deprecated_ok,
- "coin_movement", "utxo_txid",
- "v25.09", "v26.09");
- include_old_txid_field = lightningd_deprecated_out_ok(ld, ld->deprecated_ok,
- "coin_movement", "txid",
- "v25.09", "v26.09");
-
json_add_standard_notify_mvt_fields(n->stream, ld, "chain_mvt");
- json_add_chain_mvt_fields(n->stream,
- include_tags_arr,
- include_old_utxo_fields,
- include_old_txid_field,
- chain_mvt, id);
+ json_add_chain_mvt_fields(n->stream, chain_mvt, id);
notify_send(ld, n);
}
### lightningd/wait.c
@@ -77,8 +77,7 @@ static u64 *wait_index_ptr(struct lightningd *ld,
return &indexes->i[index];
}
-static void json_add_index(struct command *cmd,
- struct json_stream *response,
+static void json_add_index(struct json_stream *response,
enum wait_subsystem subsystem,
enum wait_index index,
u64 val,
@@ -93,26 +92,6 @@ static void json_add_index(struct command *cmd,
return;
va_copy(ap2, *ap);
- /* "htlcs" etc never had details field: they came after! */
- if (subsystem < WAIT_SUBSYSTEM_HTLCS
- && command_deprecated_out_ok(cmd, "details", "v25.05", "v26.06")) {
- json_object_start(response, "details");
- while ((name = va_arg(*ap, const char *)) != NULL) {
- value = va_arg(*ap, const char *);
- if (!value)
- continue;
-
- /* This is a hack! */
- if (name[0] == '=') {
- /* Copy in literallty! */
- json_add_jsonstr(response, name + 1, value, strlen(value));
- } else {
- json_add_string(response, name, value);
- }
- }
- json_object_end(response);
- }
-
json_object_start(response, wait_subsystem_name(subsystem));
while ((name = va_arg(ap2, const char *)) != NULL) {
value = va_arg(ap2, const char *);
@@ -168,7 +147,7 @@ static u64 wait_index_bump(struct lightningd *ld,
response = json_stream_success(i->cmd);
va_copy(ap, ap_master);
- json_add_index(i->cmd, response, subsystem, index, *idxval, &ap);
+ json_add_index(response, subsystem, index, *idxval, &ap);
va_end(ap);
/* Delete before freeing */
list_del_from(&ld->wait_commands, &i->list);
@@ -269,7 +248,7 @@ static struct command_result *json_wait(struct command *cmd,
struct json_stream *response;
response = json_stream_success(cmd);
- json_add_index(cmd, response,
+ json_add_index(response,
*waiter->subsystem,
*waiter->index,
val, NULL);
### plugins/libplugin-pay.c
@@ -397,15 +397,6 @@ static void channel_hint_notify(struct plugin *plugin,
struct json_stream *js =
plugin_notification_start_obs(plugin, "channel_hint_update");
- /* Fake up the old "payload" style, *and* the old unwrapped style */
- if (notification_deprecated_out_ok(plugin, "notification", "payload",
- "v25.09", "v26.09")) {
- json_add_string(js, "origin", "pay");
- json_object_start(js, "payload");
- channel_hint_notify_core(plugin, js, "channel_hint", hint);
- json_object_end(js);
- }
-
channel_hint_notify_core(plugin, js, "channel_hint_update", hint);
plugin_notification_end_obs(plugin, js);
}
@@ -2132,15 +2123,6 @@ static void payment_notify_failure(struct payment *p, const char *error_message)
struct json_stream *n;
n = plugin_notification_start_obs(p->plugin, "pay_failure");
- /* Fake up the old "payload" style, *and* the old unwrapped style */
- if (notification_deprecated_out_ok(p->plugin, "notification", "payload",
- "v25.09", "v26.09")) {
- json_add_string(n, "origin", "pay");
- json_object_start(n, "payload");
- payment_failure_notify_core(p, n, error_message);
- json_object_end(n);
- }
-
json_object_start(n, "pay_failure");
payment_failure_notify_core(p, n, error_message);
json_object_end(n);
@@ -2180,17 +2162,6 @@ void json_add_payment_success(struct json_stream *js,
json_add_string(js, "status", "complete");
n = plugin_notification_start_obs(p->plugin, "pay_success");
- /* Fake up the old "payload" style, *and* the old unwrapped style */
- if (notification_deprecated_out_ok(p->plugin, "notification", "payload",
- "v25.09", "v26.09")) {
- json_add_string(n, "origin", "pay");
- json_object_start(n, "payload");
- json_add_sha256(n, "payment_hash", p->payment_hash);
- if (root->invstring != NULL)
- json_add_string(n, "bolt11", root->invstring);
- json_object_end(n);
- }
-
json_object_start(n, "pay_success");
json_add_sha256(n, "payment_hash", p->payment_hash);
if (root->invstring != NULL)
### plugins/src/lib.rs
@@ -1223,13 +1223,8 @@ where
method: String,
v: serde_json::Value,
) -> Result<(), Error> {
- // Modern has them inside object of same name.
- // This is deprecated, scheduled for removal 26.09.
- let mut params = match &v {
- serde_json::Value::Object(map) => map.clone(),
- _ => return Err(anyhow::anyhow!("params must be a JSON object")),
- };
- params.insert(method.clone(), json!(v));
+ let mut params = serde_json::Map::new();
+ params.insert(method.clone(), v);
self.sender
.send(json!({
### tests/test_plugin.py
@@ -5316,8 +5316,6 @@ def zero_timestamps(obj):
'enabled': True}
channel_hint_update = {'origin': 'pay',
'channel_hint_update': channel_hint_update_core}
- # pyln-client's plugin.py duplicated payload into same name as update.
- channel_hint_update['payload'] = {'channel_hint': channel_hint_update_core}
assert data == channel_hint_update
@@ -5329,8 +5327,6 @@ def zero_timestamps(obj):
'bolt11': inv1['bolt11']}
success = {'origin': 'pay',
'pay_success': success_core}
- # pyln-client's plugin.py duplicated payload into same name as update.
- success['payload'] = success_core
assert data == success
inv2 = l3.rpc.invoice(10000, "second", "desc")
@@ -5344,8 +5340,6 @@ def zero_timestamps(obj):
failure_core = {'payment_hash': inv2['payment_hash'], 'bolt11': inv2['bolt11'], 'error': {'message': 'failed: WIRE_INCORRECT_OR_UNKNOWN_PAYMENT_DETAILS (reply from remote)'}}
failure = {'origin': 'pay',
'pay_failure': failure_core}
- # pyln-client's plugin.py duplicated payload into same name as update.
- failure['payload'] = failure_core
assert data == failure
Why this scored 29/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.