Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions .msggen.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ gen: $(CHECK_GEN_ALL)

check-gen-updated: $(CHECK_GEN_ALL)
@echo "Checking for generated files being changed by make"
git diff --exit-code HEAD
git diff --text --exit-code HEAD

coverage/coverage.info: check pytest
mkdir coverage || true
Expand Down
6 changes: 0 additions & 6 deletions cln-grpc/proto/node.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions cln-grpc/src/convert.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions cln-rpc/src/model.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions common/features.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 3 additions & 6 deletions common/features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */
33 changes: 0 additions & 33 deletions contrib/msggen/msggen/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -20795,10 +20771,6 @@
"set": false,
"source": "default"
},
"experimental-splicing": {
"set": false,
"source": "default"
},
"exposesecret-passphrase": {
"value_str": "...",
"source": "default",
Expand Down Expand Up @@ -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`."
],
Expand Down Expand Up @@ -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`.",
"",
Expand Down Expand Up @@ -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`.",
"",
Expand Down Expand Up @@ -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."
],
Expand Down Expand Up @@ -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."
],
Expand Down
1,110 changes: 554 additions & 556 deletions contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions contrib/pyln-testing/pyln/testing/grpc2py.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions contrib/pyln-testing/pyln/testing/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion contrib/startup_regtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion doc/contribute-to-core-lightning/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 0 additions & 10 deletions doc/lightningd-config.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -852,16 +852,6 @@ about whether to add funds or not to a proposed channel is handled
automatically by a plugin that implements the appropriate logic for
your needs. The default behavior is to not contribute funds.

* **experimental-splicing**

Specifying this enables support for the splicing protocol ([bolt][bolt] #863),
allowing both parties to dynamically adjust the size a channel. These changes
can be built interactively using PSBT and combined with other channel actions
including dual fund, additional channel splices, or generic transaction activity.
The operations will be bundled into a single transaction. The channel will remain
active while awaiting splice confirmation, however you can only spend the smaller
of the prior channel balance and the new one.

* **experimental-lsps-client**

Specifying this enables client side support for the lsps protocol
Expand Down
1 change: 0 additions & 1 deletion doc/schemas/dev-splice.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
],
Expand Down
Loading
Loading