Merge branch 'master' into ddustin/splice_script

Author: rustyrussell

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 > [!IMPORTANT]
-> Open for merging new PRs until the next PR freeze date is confirmed!
+> 24.11 FREEZE NOVEMBER 7TH: Non-bugfix PRs not ready by this date will wait for 25.02.
 
 ## Checklist
 Before submitting the PR, ensure the following tasks are completed. If an item is not applicable to your PR, please mark it as checked:
 
 - [ ] The changelog has been updated in the relevant commit(s) according to the [guidelines](https://docs.corelightning.org/docs/coding-style-guidelines#changelog-entries-in-commit-messages).
 - [ ] Tests have been added or modified to reflect the changes.
 - [ ] Documentation has been reviewed and updated as needed.
-- [ ] Related issues have been listed and linked, including any that this PR closes.
+- [ ] Related issues have been listed and linked, including any that this PR closes.

.github/workflows/ci.yaml

@@ -43,13 +43,29 @@ jobs:
           git rebase origin/${{ github.base_ref }}
 
       - name: Check changelog
+        env:
+          PR_DESCRIPTION: "${{ github.event.pull_request.body || '' }}"
+          EVENT_NAME: "${{ github.event_name }}"
+          BASE_REF: "${{ github.base_ref || 'master' }}"
         run: |
-          base_ref="${{ github.base_ref }}"
-          if [ -z "$base_ref" ]; then
-            base_ref="master"
-          fi
-          if [[ -z "$(git log origin/$base_ref..HEAD --oneline --grep='Changelog-')" && "$(git rev-parse --abbrev-ref HEAD)" != "$base_ref" ]]; then
-            echo "::error::'Changelog' entry is missing in all commits" && exit 1
+          echo "Event Name: $EVENT_NAME"
+          echo "Base Ref: $BASE_REF"
+          echo "PR DESCRIPTION: $PR_DESCRIPTION"
+          if [ "$EVENT_NAME" = "pull_request" ]; then
+            if [[ "$PR_DESCRIPTION" != *"Changelog-None"* && \
+                  -z "$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')" && \
+                  "$(git rev-parse --abbrev-ref HEAD)" != "$BASE_REF" ]]; then
+              echo "::error::'Changelog' entry is missing in all commits, and 'Changelog-None' not specified in the PR description"
+              exit 1
+            else
+              if [[ "$PR_DESCRIPTION" == *"Changelog-None"* ]]; then
+                echo "Changelog found in PR description"
+              else
+                echo "Changelog found in Commit \"$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')\""
+              fi
+            fi
+          else
+            echo "Not a PR event."
           fi
 
       - name: Set up Python 3.8

Makefile

@@ -694,6 +694,7 @@ update-ccan:
 
 # Now ALL_PROGRAMS is fully populated, we can expand it.
 all-programs: $(ALL_PROGRAMS)
+all-fuzz-programs: $(ALL_FUZZ_TARGETS)
 all-test-programs: $(ALL_TEST_PROGRAMS) $(ALL_FUZZ_TARGETS)
 default-targets: $(DEFAULT_TARGETS)
 
@@ -840,6 +841,7 @@ install: install-program install-data
 TESTBINS = \
 	$(CLN_PLUGIN_EXAMPLES) \
 	tests/plugins/test_libplugin \
+	tests/plugins/channeld_fakenet \
 	tests/plugins/test_selfdisable_after_getmanifest \
 	tools/hsmtool
 

channeld/channeld.c

@@ -5930,6 +5930,7 @@ static void req_in(struct peer *peer, const u8 *msg)
 	case WIRE_CHANNELD_SPLICE_STATE_ERROR:
 	case WIRE_CHANNELD_LOCAL_ANCHOR_INFO:
 	case WIRE_CHANNELD_REESTABLISHED:
+	case WIRE_CHANNELD_DEV_PEER_SHACHAIN:
 		break;
 	}
 	master_badmsg(-1, msg);

channeld/channeld_wire.csv

@@ -359,3 +359,7 @@ msgdata,channeld_upgraded,new_type,channel_type,
 # Tell peer about our latest and greatest blockheight.
 msgtype,channeld_blockheight,1012
 msgdata,channeld_blockheight,blockheight,u32,
+
+# Tell channeld about peer's shachain seed.
+msgtype,channeld_dev_peer_shachain,1013
+msgdata,channeld_dev_peer_shachain,seed,sha256,

contrib/giantnode.py

@@ -41,13 +41,9 @@
 
 args = parser.parse_args()
 
-nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))
-
-nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))
+nodes = (LightningRpc('/tmp/l1/regtest/lightning-rpc'),
+         LightningRpc('/tmp/l2/regtest/lightning-rpc'),
+         LightningRpc('/tmp/l3/regtest/lightning-rpc'))
 
 # Convenient aliases
 l1 = nodes[0]
@@ -59,9 +55,9 @@
         print("""
 Bookkeeper is running on l1, will slow things down!  Run this:
 
-echo 'disable-plugin=bookkeeper' >> /tmp/l1-regtest/regtest/config
-echo 'disable-plugin=bookkeeper' >> /tmp/l2-regtest/regtest/config
-echo 'disable-plugin=bookkeeper' >> /tmp/l3-regtest/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l1/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l2/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l3/regtest/config
 stop_ln
 start_ln 3
 """)