Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove --enable-experimental-features, use all runtime flags. #6209

Merged
merged 11 commits into from
May 23, 2023
Merged

Remove --enable-experimental-features, use all runtime flags. #6209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
488087e
lnprototest: update to avoid compulsory option_anchors init.
rustyrussell May 11, 2023
3edfc70
tools: remove optional csv field handling.
rustyrussell May 22, 2023
d042220
tools/generate-wire.py: intuit tlvs field if a tlv type is mentioned.
rustyrussell May 22, 2023
24e98ca
wire: remove our own blinded payments patch since it's in spec.
rustyrussell May 22, 2023
fd65758
channeld: allow stfu based on peer features, not EXPERIMENTAL_FEATURES.
rustyrussell May 22, 2023
c89d505
channeld: use explicit --experimental-upgrade flag, not #ifdef EXPERI…
rustyrussell May 22, 2023
f9c412f
plugins/fetchinvoice: remove obsolete check for feature 102.
rustyrussell May 22, 2023
b34a597
build: don't generate experimental variants of wire files.
rustyrussell May 22, 2023
bca6812
listtransactions: remove annotations, which were only in EXPERIMENTAL…
rustyrussell May 22, 2023
4d9e332
pytest: remove EXPERIMENTAL_FEATURES as a consideration.
rustyrussell May 22, 2023
6efc1c5
build: remove --enable-experimental-features / EXPERIMENTAL_FEATURES
rustyrussell May 22, 2023
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
32 changes: 0 additions & 32 deletions cln-grpc/proto/node.proto
View file
Open in desktop

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

4 changes: 0 additions & 4 deletions cln-grpc/src/convert.rs
View file
Open in desktop

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

100 changes: 0 additions & 100 deletions cln-rpc/src/model.rs
View file
Open in desktop

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

4 changes: 0 additions & 4 deletions contrib/pyln-testing/pyln/testing/grpc2py.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,6 @@ def listtransactions_transactions_inputs2py(m):
"txid": hexlify(m.txid), # PrimitiveField in generate_composite
"index": m.index, # PrimitiveField in generate_composite
"sequence": m.sequence, # PrimitiveField in generate_composite
"type": str(m.item_type), # EnumField in generate_composite
"channel": m.channel, # PrimitiveField in generate_composite
})


Expand All @@ -499,8 +497,6 @@ def listtransactions_transactions_outputs2py(m):
"index": m.index, # PrimitiveField in generate_composite
"amount_msat": amount2msat(m.amount_msat), # PrimitiveField in generate_composite
"script_pub_key": hexlify(m.script_pub_key), # PrimitiveField in generate_composite
"type": str(m.item_type), # EnumField in generate_composite
"channel": m.channel, # PrimitiveField in generate_composite
})


Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ schema-added-check:
fi
schema-removed-check:
@if ! test -z $$CI; then git fetch origin master; fi; \
if git diff origin/master -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master -- doc/schemas | grep -q '^-.*"deprecated"'; then \
if git diff origin/master -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master -- doc/schemas | grep -q '^-.*"deprecated"' && ! git diff origin/master -- doc/schemas | grep -q '^-.*EXPERIMENTAL_FEATURES'; then \
git diff origin/master -- doc/schemas ; \
echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; \
fi
Expand Down
6 changes: 1 addition & 5 deletions doc/lightning-listtransactions.7.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,10 @@ On success, an object containing **transactions** is returned. It is an array o
- **txid** (txid): the transaction id spent
- **index** (u32): the output spent
- **sequence** (u32): the nSequence value
- **type** (string, optional): the purpose of this input (*EXPERIMENTAL\_FEATURES* only) (one of "theirs", "deposit", "withdraw", "channel\_funding", "channel\_mutual\_close", "channel\_unilateral\_close", "channel\_sweep", "channel\_htlc\_success", "channel\_htlc\_timeout", "channel\_penalty", "channel\_unilateral\_cheat")
- **channel** (short\_channel\_id, optional): the channel this input is associated with (*EXPERIMENTAL\_FEATURES* only)
- **outputs** (array of objects): Each output, in order:
- **index** (u32): the 0-based output number
- **amount\_msat** (msat): the amount of the output
- **scriptPubKey** (hex): the scriptPubKey
- **type** (string, optional): the purpose of this output (*EXPERIMENTAL\_FEATURES* only) (one of "theirs", "deposit", "withdraw", "channel\_funding", "channel\_mutual\_close", "channel\_unilateral\_close", "channel\_sweep", "channel\_htlc\_success", "channel\_htlc\_timeout", "channel\_penalty", "channel\_unilateral\_cheat")
- **channel** (short\_channel\_id, optional): the channel this output is associated with (*EXPERIMENTAL\_FEATURES* only)
Comment on lines -40 to -47
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be a breaking change for cln-grpc?

Also if people are not using it, the grpc could complain about different model, but for now it is also easy to upgrade

So I just put my though here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because it was experimental only, the fields didn't exist for most people anyway.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think that the code generation is smart enough to catch the experimental field or these changes in the rust model are unrelated? https://github.com/ElementsProject/lightning/pull/6209/files#diff-af0e7f481b7fd8fc471ab4d5a808c9b4512e0d347bfceff633effc80acdcf5fe

But maybe the proto-buff do not complain when there is the optional fields


[comment]: # (GENERATE-FROM-SCHEMA-END)

Expand Down Expand Up @@ -103,4 +99,4 @@ RESOURCES

Main web site: <https://github.com/ElementsProject/lightning>

[comment]: # ( SHA256STAMP:525f24511eb9687dc16d5b2156d4d8df28b371e287512a749d2d9dfd5701e093)
[comment]: # ( SHA256STAMP:6431aec91a48a5f9d4632baa6f3aae23dee8607a200b3c359d679028e521b588)
6 changes: 1 addition & 5 deletions doc/lightning-sql.7.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,16 +379,12 @@ The following tables are currently supported:
- `txid` (type `txid`, sqltype `BLOB`)
- `idx` (type `u32`, sqltype `INTEGER`, from JSON field `index`)
- `sequence` (type `u32`, sqltype `INTEGER`)
- `type` (type `string`, sqltype `TEXT`)
- `channel` (type `short_channel_id`, sqltype `TEXT`)
- related table `transactions_outputs`
- `row` (reference to `transactions.rowid`, sqltype `INTEGER`)
- `arrindex` (index within array, sqltype `INTEGER`)
- `idx` (type `u32`, sqltype `INTEGER`, from JSON field `index`)
- `amount_msat` (type `msat`, sqltype `INTEGER`)
- `scriptPubKey` (type `hex`, sqltype `BLOB`)
- `type` (type `string`, sqltype `TEXT`)
- `channel` (type `short_channel_id`, sqltype `TEXT`)

[comment]: # (GENERATE-DOC-END)

Expand Down Expand Up @@ -514,4 +510,4 @@ RESOURCES
---------

Main web site: <https://github.com/ElementsProject/lightning>
[comment]: # ( SHA256STAMP:3eb4e024a1e1a4b40460b48b835354514456558797b8f8ce3c76dcbb9ca79dab)
[comment]: # ( SHA256STAMP:68c72c66bdc8b0515c6d5dddd5ffd14aa0342bd00f17a44929177c48c36a213f)
42 changes: 0 additions & 42 deletions doc/schemas/listtransactions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,6 @@
"sequence": {
"type": "u32",
"description": "the nSequence value"
},
"type": {
"type": "string",
"enum": [
"theirs",
"deposit",
"withdraw",
"channel_funding",
"channel_mutual_close",
"channel_unilateral_close",
"channel_sweep",
"channel_htlc_success",
"channel_htlc_timeout",
"channel_penalty",
"channel_unilateral_cheat"
],
"description": "the purpose of this input (*EXPERIMENTAL_FEATURES* only)"
},
"channel": {
"type": "short_channel_id",
"description": "the channel this input is associated with (*EXPERIMENTAL_FEATURES* only)"
}
}
}
Expand Down Expand Up @@ -117,27 +96,6 @@
"scriptPubKey": {
"type": "hex",
"description": "the scriptPubKey"
},
"type": {
"type": "string",
"enum": [
"theirs",
"deposit",
"withdraw",
"channel_funding",
"channel_mutual_close",
"channel_unilateral_close",
"channel_sweep",
"channel_htlc_success",
"channel_htlc_timeout",
"channel_penalty",
"channel_unilateral_cheat"
],
"description": "the purpose of this output (*EXPERIMENTAL_FEATURES* only)"
},
"channel": {
"type": "short_channel_id",
"description": "the channel this output is associated with (*EXPERIMENTAL_FEATURES* only)"
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions tests/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3914,11 +3914,7 @@ def test_sql(node_factory, bitcoind):
{'name': 'idx',
'type': 'u32'},
{'name': 'sequence',
'type': 'u32'},
{'name': 'type',
'type': 'string'},
{'name': 'channel',
'type': 'short_channel_id'}]},
'type': 'u32'}]},
'transactions_outputs': {
'columns': [{'name': 'row',
'type': 'u64'},
Expand All @@ -3929,11 +3925,7 @@ def test_sql(node_factory, bitcoind):
{'name': 'amount_msat',
'type': 'msat'},
{'name': 'scriptPubKey',
'type': 'hex'},
{'name': 'type',
'type': 'string'},
{'name': 'channel',
'type': 'short_channel_id'}]},
'type': 'hex'}]},
'bkpr_accountevents': {
'columns': [{'name': 'account',
'type': 'string'},
Expand Down
Loading