BOLT update: remove INVALID_REALM error.

rustyrussell · rustyrussell · commit a8b68c97b364 · 2024-09-19T16:39:26.000+09:30
This is obsolete (since modern onions) and so removed from spec.
We should not set it, and don't need to handle it specially.

Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := 93b7ee031b50acd59967a105f1326176a37628f9
+DEFAULT_BOLTVERSION := 6a51861d93ad617438fe24195768e2742d7708ac
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 
diff --git a/common/sphinx.c b/common/sphinx.c
@@ -219,7 +219,7 @@ struct onionpacket *parse_onionpacket(const tal_t *ctx,
 
 	assert(max == 0);
 	if (cursor == NULL) {
-		*failcode = WIRE_INVALID_REALM;
+		*failcode = WIRE_INVALID_ONION_HMAC;
 		return tal_free(dest);
 	}
 
diff --git a/plugins/libplugin-pay.c b/plugins/libplugin-pay.c
@@ -1494,7 +1494,6 @@ handle_final_failure(struct command *cmd,
 		goto strange_error;
 
 	case WIRE_INVALID_ONION_PAYLOAD:
-	case WIRE_INVALID_REALM:
 	case WIRE_PERMANENT_NODE_FAILURE:
 	case WIRE_TEMPORARY_NODE_FAILURE:
 	case WIRE_REQUIRED_NODE_FEATURE_MISSING:
@@ -1597,7 +1596,6 @@ handle_intermediate_failure(struct command *cmd,
 	case WIRE_TEMPORARY_NODE_FAILURE:
 	case WIRE_REQUIRED_NODE_FEATURE_MISSING:
 	case WIRE_INVALID_ONION_PAYLOAD:
-	case WIRE_INVALID_REALM:
 	case WIRE_INVALID_ONION_BLINDING:
 		tal_arr_expand(&root->excluded_nodes, *errnode);
 		goto error;
@@ -2569,7 +2567,6 @@ static bool payment_can_retry(struct payment *p)
 	case WIRE_INCORRECT_OR_UNKNOWN_PAYMENT_DETAILS:
 	case WIRE_INVALID_ONION_PAYLOAD:
 	case WIRE_INVALID_ONION_VERSION:
-	case WIRE_INVALID_REALM:
 	case WIRE_MPP_TIMEOUT:
 	case WIRE_PERMANENT_NODE_FAILURE:
 	case WIRE_REQUIRED_NODE_FEATURE_MISSING:
diff --git a/plugins/renepay/routefail.c b/plugins/renepay/routefail.c
@@ -303,7 +303,6 @@ static struct command_result *handle_failure(struct routefail *r)
 	case WIRE_PERMANENT_NODE_FAILURE:
 	case WIRE_REQUIRED_NODE_FEATURE_MISSING:
 	case WIRE_TEMPORARY_NODE_FAILURE:
-	case WIRE_INVALID_REALM:
 	case WIRE_INVALID_ONION_PAYLOAD:
 
 		if (node_type == FINAL_NODE) {
diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
@@ -35,7 +35,6 @@ tlvdata,encrypted_data_tlv,payment_constraints,max_cltv_expiry,u32,
 tlvdata,encrypted_data_tlv,payment_constraints,htlc_minimum_msat,tu64,
 tlvtype,encrypted_data_tlv,allowed_features,14
 tlvdata,encrypted_data_tlv,allowed_features,features,byte,...
-msgtype,invalid_realm,PERM|1
 msgtype,temporary_node_failure,NODE|2
 msgtype,permanent_node_failure,PERM|NODE|2
 msgtype,required_node_feature_missing,PERM|NODE|3

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ struct onionpacket parse_onionpacket(const tal_t ctx,`
`219`	`219`
`220`	`220`	`assert(max == 0);`
`221`	`221`	`if (cursor == NULL) {`
`222`		`- *failcode = WIRE_INVALID_REALM;`
	`222`	`+ *failcode = WIRE_INVALID_ONION_HMAC;`
`223`	`223`	`return tal_free(dest);`
`224`	`224`	`}`
`225`	`225`