splice: Remove experiemental splicing feature

Author: ddustin

.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

.msggen.json

@@ -2423,7 +2423,6 @@
             "ListConfigs.configs.experimental-onion-messages": 23,
             "ListConfigs.configs.experimental-peer-storage": 26,
             "ListConfigs.configs.experimental-shutdown-wrong-funding": 25,
-            "ListConfigs.configs.experimental-splicing": 22,
             "ListConfigs.configs.fee-base": 39,
             "ListConfigs.configs.fee-per-satoshi": 41,
             "ListConfigs.configs.fetchinvoice-noconnect": 64,
@@ -2612,10 +2611,6 @@
             "ListConfigs.configs.experimental-shutdown-wrong-funding.set": 1,
             "ListConfigs.configs.experimental-shutdown-wrong-funding.source": 2
         },
-        "ListconfigsConfigsExperimental-splicing": {
-            "ListConfigs.configs.experimental-splicing.set": 1,
-            "ListConfigs.configs.experimental-splicing.source": 2
-        },
         "ListconfigsConfigsFee-base": {
             "ListConfigs.configs.fee-base.source": 2,
             "ListConfigs.configs.fee-base.value_int": 1
@@ -2819,7 +2814,6 @@
             "ListConfigs.experimental-peer-storage": 22,
             "ListConfigs.experimental-quiesce": 23,
             "ListConfigs.experimental-shutdown-wrong-funding": 21,
-            "ListConfigs.experimental-splicing": 18,
             "ListConfigs.experimental-upgrade-protocol": 24,
             "ListConfigs.fee-base": 37,
             "ListConfigs.fee-per-satoshi": 39,
@@ -9783,18 +9777,6 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
-        "ListConfigs.configs.experimental-splicing": {
-            "added": "v23.08",
-            "deprecated": null
-        },
-        "ListConfigs.configs.experimental-splicing.set": {
-            "added": "pre-v0.10.1",
-            "deprecated": null
-        },
-        "ListConfigs.configs.experimental-splicing.source": {
-            "added": "pre-v0.10.1",
-            "deprecated": null
-        },
         "ListConfigs.configs.fee-base": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -10311,10 +10293,6 @@
             "added": "pre-v0.10.1",
             "deprecated": "v23.08"
         },
-        "ListConfigs.experimental-splicing": {
-            "added": "pre-v0.10.1",
-            "deprecated": "v23.08"
-        },
         "ListConfigs.experimental-upgrade-protocol": {
             "added": "v23.08",
             "deprecated": "v23.08"

cln-grpc/proto/node.proto

@@ -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 {

cln-grpc/src/convert.rs

@@ -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 */

cln-rpc/src/model.rs

@@ -11409,7 +11409,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."
       ],
@@ -19298,29 +19297,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",
@@ -20795,10 +20771,6 @@
                 "set": false,
                 "source": "default"
               },
-              "experimental-splicing": {
-                "set": false,
-                "source": "default"
-              },
               "exposesecret-passphrase": {
                 "value_str": "...",
                 "source": "default",
@@ -33954,7 +33926,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`."
       ],
@@ -34097,7 +34068,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`.",
         "",
@@ -34265,7 +34235,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`.",
         "",
@@ -34432,7 +34401,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."
       ],
@@ -34499,7 +34467,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."
       ],

common/features.c

@@ -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