splice: Remove experiemental splicing feature

ddustin · ddustin · commit 53a144f546d7 · 2026-04-01T22:41:10.000-04:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -500,7 +500,6 @@ jobs:
         env:
           COMPILER: ${{ matrix.COMPILER }}
           EXPERIMENTAL_DUAL_FUND: ${{ matrix.EXPERIMENTAL_DUAL_FUND }}
-          EXPERIMENTAL_SPLICING: ${{ matrix.EXPERIMENTAL_SPLICING }}
           COMPAT: 1
           SLOW_MACHINE: 1
           TEST_DEBUG: 1
@@ -553,13 +552,6 @@ jobs:
             COMPILER: gcc
             TEST_NETWORK: regtest
             EXPERIMENTAL_DUAL_FUND: 1
-          # And splicing!
-          - NAME: splicing
-            CFG: compile-gcc-O3
-            TEST_DB_PROVIDER: sqlite3
-            COMPILER: gcc
-            TEST_NETWORK: regtest
-            EXPERIMENTAL_SPLICING: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -606,7 +598,6 @@ jobs:
         env:
           COMPILER: ${{ matrix.COMPILER }}
           EXPERIMENTAL_DUAL_FUND: ${{ matrix.EXPERIMENTAL_DUAL_FUND }}
-          EXPERIMENTAL_SPLICING: ${{ matrix.EXPERIMENTAL_SPLICING }}
           COMPAT: 1
           SLOW_MACHINE: 1
           TEST_DEBUG: 1
diff --git a/common/features.c b/common/features.c
@@ -140,10 +140,6 @@ static const struct feature_style feature_styles[] = {
 	  .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT,
 			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT,
 			  [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT} },
-	{ OPT_EXPERIMENTAL_SPLICE,
-	  .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT,
-			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT,
-			  [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT} },
 };
 
 struct dependency {
diff --git a/common/features.h b/common/features.h
@@ -122,6 +122,8 @@ struct feature_set *feature_set_dup(const tal_t *ctx,
  * | 46/47 | `option_scid_alias`               | ... IN ...
  * | 48/49 | `option_payment_metadata`         |...  9 ...
  * | 50/51 | `option_zeroconf`                 | ... IN ...
+ * | 60/61 | `option_simple_close`             |... IN ...
+ * | 62/63 | `option_splice`                   |... IN ...
  */
 #define OPT_DATA_LOSS_PROTECT			0
 #define OPT_UPFRONT_SHUTDOWN_SCRIPT		4
@@ -144,17 +146,12 @@ struct feature_set *feature_set_dup(const tal_t *ctx,
 #define OPT_SCID_ALIAS				46
 #define OPT_PAYMENT_METADATA			48
 #define OPT_ZEROCONF				50
+#define OPT_SPLICE				62
 
 /* The old pre-zero-fee-anchors were deprecated, and we never supported them
  * outside experimental options */
 #define OPT_ANCHOR_OUTPUTS_DEPRECATED		20
 
-/* BOLT-splice #9:
- * | 62/63 | `option_splice` |  ... IN ...
- */
-#define OPT_SPLICE				62
-#define OPT_EXPERIMENTAL_SPLICE			162
-
 #define OPT_SHUTDOWN_WRONG_FUNDING		104
 
 #endif /* LIGHTNING_COMMON_FEATURES_H */
diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json
@@ -11384,7 +11384,6 @@
       "added": "v24.11",
       "rpc": "dev-splice",
       "title": "Command to initiate a channel to a peer",
-      "warning": "experimental-splicing only",
       "description": [
         "`splice` is the command to move funds into or out of a channel. Multiple actions can be combined together resulting in a single onchain transaction. Funds may be moved out of a channel and into another in a single batch enabling cross-channel movement."
       ],
@@ -19273,29 +19272,6 @@
                   }
                 }
               },
-              "experimental-splicing": {
-                "added": "v23.08",
-                "type": "object",
-                "additionalProperties": false,
-                "required": [
-                  "set",
-                  "source"
-                ],
-                "properties": {
-                  "set": {
-                    "type": "boolean",
-                    "description": [
-                      "`true` if set in config or cmdline."
-                    ]
-                  },
-                  "source": {
-                    "type": "string",
-                    "description": [
-                      "Source of configuration setting."
-                    ]
-                  }
-                }
-              },
               "experimental-onion-messages": {
                 "deprecated": [
                   "v24.08",
@@ -20770,10 +20746,6 @@
                 "set": false,
                 "source": "default"
               },
-              "experimental-splicing": {
-                "set": false,
-                "source": "default"
-              },
               "exposesecret-passphrase": {
                 "value_str": "...",
                 "source": "default",
@@ -33929,7 +33901,6 @@
       "added": "v23.08",
       "rpc": "splice_init",
       "title": "Command to initiate a channel to a peer",
-      "warning": "experimental-splicing only",
       "description": [
         "`splice_init` is a low level RPC command which initiates a channel splice for a given channel specified by `channel_id`."
       ],
@@ -34072,7 +34043,6 @@
       "added": "v23.08",
       "rpc": "splice_signed",
       "title": "Command to initiate a channel to a peer",
-      "warning": "experimental-splicing only",
       "description": [
         "`splice_signed` is a low level RPC command which finishes the active channel splice associated with `channel_id`.",
         "",
@@ -34240,7 +34210,6 @@
       "added": "v23.08",
       "rpc": "splice_update",
       "title": "Command to initiate a channel to a peer",
-      "warning": "experimental-splicing only",
       "description": [
         "`splice_update` is a low level RPC command which updates the active channel splice associated with `channel_id`.",
         "",
@@ -34407,7 +34376,6 @@
       "added": "v26.04",
       "rpc": "splicein",
       "title": "Command to splice funds into a channel",
-      "warning": "experimental-splicing only",
       "description": [
         "`splicein` is the command to move funds into a channel."
       ],
@@ -34474,7 +34442,6 @@
       "added": "v26.04",
       "rpc": "spliceout",
       "title": "Command to splice funds out of a channel",
-      "warning": "experimental-splicing only",
       "description": [
         "`spliceout` is the command to move funds into a channel."
       ],
diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -2420,13 +2420,6 @@ def listconfigs_configs_experimental_shutdown_wrong_funding2py(m):
     })
 
 
-def listconfigs_configs_experimental_splicing2py(m):
-    return remove_default({
-        "set": m.set,  # PrimitiveField in generate_composite
-        "source": m.source,  # PrimitiveField in generate_composite
-    })
-
-
 def listconfigs_configs_fee_base2py(m):
     return remove_default({
         "source": m.source,  # PrimitiveField in generate_composite
diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py
@@ -82,7 +82,6 @@ def env(name, default=None):
 DEPRECATED_APIS = env("DEPRECATED_APIS", "0") == "1"
 TIMEOUT = int(env("TIMEOUT", 180 if SLOW_MACHINE else 60))
 EXPERIMENTAL_DUAL_FUND = env("EXPERIMENTAL_DUAL_FUND", "0") == "1"
-EXPERIMENTAL_SPLICING = env("EXPERIMENTAL_SPLICING", "0") == "1"
 GENERATE_EXAMPLES = env("GENERATE_EXAMPLES", "0") == "1"
 RUST = env("RUST", "0") == "1"
 
@@ -963,8 +962,6 @@ def __init__(self, node_id, lightning_dir, bitcoind, executor, may_fail=False,
             self.daemon.opts["dev-no-reconnect"] = None
         if EXPERIMENTAL_DUAL_FUND:
             self.daemon.opts["experimental-dual-fund"] = None
-        if EXPERIMENTAL_SPLICING:
-            self.daemon.opts["experimental-splicing"] = None
         # Avoid test flakes cause by this option unless explicitly set.
         if self.cln_version >= "v24.11":
             self.daemon.opts.update({"autoconnect-seeker-peers": 0})
diff --git a/contrib/startup_regtest.sh b/contrib/startup_regtest.sh
@@ -199,7 +199,6 @@ start_nodes() {
 		dev-fast-gossip
 		dev-bitcoind-poll=5
 		experimental-dual-fund
-		experimental-splicing
 		funder-policy=match
 		funder-policy-mod=100
 		funder-min-their-funding=10000
diff --git a/doc/contribute-to-core-lightning/testing.md b/doc/contribute-to-core-lightning/testing.md
@@ -63,7 +63,6 @@ Our Github Actions instance (see `.github/workflows/*.yml`) runs all these for e
 
 ```text
 EXPERIMENTAL_DUAL_FUND=[0|1]          - Enable dual-funding tests.
-EXPERIMENTAL_SPLICING=[0|1]           - Enable splicing tests.
 TEST_CHECK_DBSTMTS=[0|1]              - When running blackbox tests, this will
                                         load a plugin that logs all compiled
                                         and expanded database statements.
diff --git a/doc/schemas/dev-splice.json b/doc/schemas/dev-splice.json
@@ -5,7 +5,6 @@
   "added": "v24.11",
   "rpc": "dev-splice",
   "title": "Command to initiate a channel to a peer",
-  "warning": "experimental-splicing only",
   "description": [
     "`splice` is the command to move funds into or out of a channel. Multiple actions can be combined together resulting in a single onchain transaction. Funds may be moved out of a channel and into another in a single batch enabling cross-channel movement."
   ],
diff --git a/doc/schemas/listconfigs.json b/doc/schemas/listconfigs.json
@@ -528,29 +528,6 @@
               }
             }
           },
-          "experimental-splicing": {
-            "added": "v23.08",
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-              "set",
-              "source"
-            ],
-            "properties": {
-              "set": {
-                "type": "boolean",
-                "description": [
-                  "`true` if set in config or cmdline."
-                ]
-              },
-              "source": {
-                "type": "string",
-                "description": [
-                  "Source of configuration setting."
-                ]
-              }
-            }
-          },
           "experimental-onion-messages": {
             "deprecated": [
               "v24.08",
@@ -2025,10 +2002,6 @@
             "set": false,
             "source": "default"
           },
-          "experimental-splicing": {
-            "set": false,
-            "source": "default"
-          },
           "exposesecret-passphrase": {
             "value_str": "...",
             "source": "default",
diff --git a/doc/schemas/splice_init.json b/doc/schemas/splice_init.json
@@ -4,7 +4,6 @@
   "added": "v23.08",
   "rpc": "splice_init",
   "title": "Command to initiate a channel to a peer",
-  "warning": "experimental-splicing only",
   "description": [
     "`splice_init` is a low level RPC command which initiates a channel splice for a given channel specified by `channel_id`."
   ],
diff --git a/doc/schemas/splice_signed.json b/doc/schemas/splice_signed.json
@@ -4,7 +4,6 @@
   "added": "v23.08",
   "rpc": "splice_signed",
   "title": "Command to initiate a channel to a peer",
-  "warning": "experimental-splicing only",
   "description": [
     "`splice_signed` is a low level RPC command which finishes the active channel splice associated with `channel_id`.",
     "",
diff --git a/doc/schemas/splice_update.json b/doc/schemas/splice_update.json
@@ -4,7 +4,6 @@
   "added": "v23.08",
   "rpc": "splice_update",
   "title": "Command to initiate a channel to a peer",
-  "warning": "experimental-splicing only",
   "description": [
     "`splice_update` is a low level RPC command which updates the active channel splice associated with `channel_id`.",
     "",
diff --git a/doc/schemas/splicein.json b/doc/schemas/splicein.json
@@ -5,7 +5,6 @@
   "added": "v26.04",
   "rpc": "splicein",
   "title": "Command to splice funds into a channel",
-  "warning": "experimental-splicing only",
   "description": [
     "`splicein` is the command to move funds into a channel."
   ],
diff --git a/doc/schemas/spliceout.json b/doc/schemas/spliceout.json
@@ -5,7 +5,6 @@
   "added": "v26.04",
   "rpc": "spliceout",
   "title": "Command to splice funds out of a channel",
-  "warning": "experimental-splicing only",
   "description": [
     "`spliceout` is the command to move funds into a channel."
   ],
diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c
@@ -186,7 +186,7 @@ struct ext_key *hsm_init(struct lightningd *ld)
 	if (feature_offered(ld->our_features->bits[INIT_FEATURE],
 			    OPT_SPLICE)
 	    && !hsm_capable(ld, WIRE_HSMD_SIGN_SPLICE_TX)) {
-		fatal("--experimental-splicing needs HSM capable of signing splices!");
+		fatal("splicing needs HSM capable of signing splices!");
 	}
 
 	/* Check if we have a mnemonic-based HSM secret from TLV */
diff --git a/lightningd/options.c b/lightningd/options.c
@@ -1250,14 +1250,6 @@ static char *opt_set_dual_fund(struct lightningd *ld)
 	return NULL;
 }
 
-static char *opt_set_splicing(struct lightningd *ld)
-{
-	feature_set_or(ld->our_features,
-		       take(feature_set_for_feature(NULL,
-						    OPTIONAL_FEATURE(OPT_SPLICE))));
-	return NULL;
-}
-
 static char *opt_set_shutdown_wrong_funding(struct lightningd *ld)
 {
 	feature_set_or(ld->our_features,
@@ -1486,11 +1478,6 @@ static void register_opts(struct lightningd *ld)
 				 " and allow peers to establish channels"
 				 " via v2 channel open protocol.");
 
-	opt_register_early_noarg("--experimental-splicing",
-				 opt_set_splicing, ld,
-				 "experimental: Enables the ability to resize"
-				 " channels using splicing");
-
 	/* This affects our features, so set early. */
 	opt_register_early_noarg("--experimental-shutdown-wrong-funding",
 				 opt_set_shutdown_wrong_funding, ld,
diff --git a/tests/autogenerate-rpc-examples.py b/tests/autogenerate-rpc-examples.py
@@ -1318,7 +1318,6 @@ def generate_splice_examples(node_factory, bitcoind):
         # Basic setup for l7->l8
         options = [
             {
-                'experimental-splicing': None,
                 'allow-deprecated-apis': True,
                 'allow_bad_gossip': True,
                 'broken_log': '.*',
diff --git a/tests/test_gossip.py b/tests/test_gossip.py
@@ -1700,7 +1700,7 @@ def test_gossip_store_compact_while_extending(node_factory, bitcoind, executor):
         f.write(b'')
 
     fut.result(TIMEOUT)
-    # Exact gossip size varies with EXPERIMENTAL_SPLICING.
+    # Exact gossip size varies with SPLICING.
     l1.daemon.wait_for_logs(['gossipd: compaction done',
                              'connectd: Reopened gossip_store, reduced to offset 224[59]'])
 
diff --git a/tests/test_restart.py b/tests/test_restart.py
@@ -10,7 +10,7 @@
 @pytest.mark.openchannel('v2')
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
 def test_agressive_restart(node_factory, bitcoind):
-    l1, l2 = node_factory.line_graph(2, fundamount=1000000, wait_for_announce=True, opts={'experimental-splicing': None})
+    l1, l2 = node_factory.line_graph(2, fundamount=1000000, wait_for_announce=True)
 
     chan_id = l1.get_channel_id(l2)
 
diff --git a/tests/test_splice.py b/tests/test_splice.py
diff --git a/tests/test_splicing.py b/tests/test_splicing.py
diff --git a/tests/test_splicing_disconnect.py b/tests/test_splicing_disconnect.py
diff --git a/tests/test_splicing_insane.py b/tests/test_splicing_insane.py
diff --git a/tests/utils.py b/tests/utils.py
