diff --git a/channeld/channeld.c b/channeld/channeld.c index 2adcea329..2ba89b073 100644 --- a/channeld/channeld.c +++ b/channeld/channeld.c @@ -1160,7 +1160,7 @@ static u8 *send_commit_part(const tal_t *ctx, * send unless negotiated */ if (feature_negotiated(peer->our_features, peer->their_features, - OPT_EXPERIMENTAL_SPLICE)) { + OPT_SPLICE)) { status_debug("send_commit_part(splice: %d, remote_splice: %d," " index: %"PRIu64")", (int)splice_amnt, (int)remote_splice_amnt, diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c index 98ab7a316..d4c0ccfb2 100644 --- a/lightningd/hsm_control.c +++ b/lightningd/hsm_control.c @@ -177,7 +177,7 @@ struct ext_key *hsm_init(struct lightningd *ld) } if (feature_offered(ld->our_features->bits[INIT_FEATURE], - OPT_EXPERIMENTAL_SPLICE) + OPT_SPLICE) && !hsm_capable(ld, WIRE_HSMD_SIGN_SPLICE_TX)) { fatal("--experimental-splicing needs HSM capable of signing splices!"); } diff --git a/lightningd/options.c b/lightningd/options.c index 379b89ac3..43d32700a 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -1263,7 +1263,7 @@ static char *opt_set_splicing(struct lightningd *ld) { feature_set_or(ld->our_features, take(feature_set_for_feature(NULL, - OPTIONAL_FEATURE(OPT_EXPERIMENTAL_SPLICE)))); + OPTIONAL_FEATURE(OPT_SPLICE)))); return NULL; } @@ -2058,7 +2058,7 @@ void add_config_deprecated(struct lightningd *ld, json_add_bool(response, name0, feature_offered(ld->our_features ->bits[INIT_FEATURE], - OPT_EXPERIMENTAL_SPLICE)); + OPT_SPLICE)); } else if (opt->cb == (void *)opt_set_onion_messages) { json_add_bool(response, name0, feature_offered(ld->our_features diff --git a/tests/utils.py b/tests/utils.py index fd96c319d..ddcc4bb1b 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -45,7 +45,7 @@ def expected_peer_features(extra=[]): # option_dual_fund features += [29] if EXPERIMENTAL_SPLICING: - features += [163] # option_experimental_splice + features += [63] # option_splice if TEST_NETWORK != 'liquid-regtest': # Anchors, except for elements features += [23] @@ -61,7 +61,7 @@ def expected_node_features(extra=[]): # option_dual_fund features += [29] if EXPERIMENTAL_SPLICING: - features += [163] # option_experimental_splice + features += [63] # option_splice if TEST_NETWORK != 'liquid-regtest': # Anchors, except for elements features += [23] diff --git a/wire/peer_wire.csv b/wire/peer_wire.csv index 66bb631a4..c36d90807 100644 --- a/wire/peer_wire.csv +++ b/wire/peer_wire.csv @@ -211,13 +211,13 @@ subtypedata,lease_rates,channel_fee_max_base_msat,tu32, msgtype,stfu,2 msgdata,stfu,channel_id,channel_id, msgdata,stfu,initiator,u8, -msgtype,splice,75 +msgtype,splice,80 msgdata,splice,channel_id,channel_id, msgdata,splice,relative_satoshis,s64, msgdata,splice,funding_feerate_perkw,u32, msgdata,splice,locktime,u32, msgdata,splice,funding_pubkey,point, -msgtype,splice_ack,76 +msgtype,splice_ack,81 msgdata,splice_ack,channel_id,channel_id, msgdata,splice_ack,relative_satoshis,s64, msgdata,splice_ack,funding_pubkey,point,