From 2c396656e4472e5e88950a5031ecbbec45f5efae Mon Sep 17 00:00:00 2001
From: Jesse de Wit <witdejesse@hotmail.com>
Date: Mon, 28 Aug 2023 12:12:06 +0200
Subject: [PATCH] update core lightning to v23.08

---
 .github/actions/setup-clightning/action.yaml | 4 ++--
 .github/workflows/integration_tests.yaml     | 7 ++-----
 README.md                                    | 3 ++-
 itest/cln_breez_client.go                    | 1 +
 itest/cln_lspd_node.go                       | 1 +
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/setup-clightning/action.yaml b/.github/actions/setup-clightning/action.yaml
index fe4f5f1..37b3934 100644
--- a/.github/actions/setup-clightning/action.yaml
+++ b/.github/actions/setup-clightning/action.yaml
@@ -3,9 +3,9 @@ description: 'Set up Core Lightning on the runner'
 
 inputs:
   checkout-version:
-    description: 'v23.05.1'
+    description: Core lightning version
     required: true
-    default: 'v23.05.1'
+    default: 'v23.08'
 
 runs:
   using: 'composite'
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
index 66677eb..01e9c85 100644
--- a/.github/workflows/integration_tests.yaml
+++ b/.github/workflows/integration_tests.yaml
@@ -6,9 +6,9 @@ on:
 env:
   BITCOIN_VERSION: '25.0'
   LSP_REF: 'breez-node-v0.16.4-beta'
-  CLIENT_REF: 'v0.16.4-breez-2'
+  CLIENT_REF: 'v0.16.4-breez-3'
   GO_VERSION: '^1.19'
-  CLN_VERSION: 'v23.05.1'
+  CLN_VERSION: 'v23.08'
 jobs:
 
   setup-bitcoin-core:
@@ -18,7 +18,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Bitcoin Core
-        if: steps.cache-bitcoin.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-bitcoin
         with:
           bitcoin-version: ${{ env.BITCOIN_VERSION }}
@@ -30,7 +29,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up LND LSP
-        if: steps.cache-lnd-lsp.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-lnd-lsp
         with:
           lsp-ref: ${{ env.LSP_REF }}
@@ -43,7 +41,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up LND client
-        if: steps.cache-lnd-client.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-lnd-client
         with:
           client-ref: ${{ env.CLIENT_REF }}
diff --git a/README.md b/README.md
index bd6a14c..1439b51 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ export LISTEN_ADDRESS=<listen address>
     - `--plugin=/path/to/shell/script.sh`: to use lspd as plugin
     - `--max-concurrent-htlcs=30`: In order to use zero reserve channels on the client side, (local max_accepted_htlcs + remote max_accepted_htlcs + 2) * dust limit must be lower than the channel capacity. Reduce max-concurrent-htlcs or increase channel capacity accordingly.
     - `--dev-allowdustreserve=true`: In order to allow zero reserve on the client side, you'll need to enable developer mode on cln (`./configure --enable-developer`)
+    - `--experimental-anchors`: In order to allow opening anchor channels.
 1. Run lspd
 
 ### Final step
@@ -56,7 +57,7 @@ The lsp supports probing non-mpp payments if the payment hash for probing is sha
 In order to run the integration tests, you need:
 - Docker running
 - python3 installed
-- A development build of lightningd v23.05.1
+- A development build of lightningd v23.08
 - lnd v0.16.4 lsp version https://github.com/breez/lnd/commit/cebcdf1b17fdedf7d69207d98c31cf8c3b257531
 - lnd v0.16.4 breez client version https://github.com/breez/lnd/commit/3c0854adcfc924a6d759a6ee4640c41266b9f8b4
 - bitcoind (tested with v23.0)
diff --git a/itest/cln_breez_client.go b/itest/cln_breez_client.go
index ee2ad66..357e051 100644
--- a/itest/cln_breez_client.go
+++ b/itest/cln_breez_client.go
@@ -86,6 +86,7 @@ func newClnBreezClient(h *lntest.TestHarness, m *lntest.Miner, name string) Bree
 		// reserve channel. Relevant code:
 		// https://github.com/ElementsProject/lightning/blob/774d16a72e125e4ae4e312b9e3307261983bec0e/openingd/openingd.c#L481-L520
 		"--max-concurrent-htlcs=30",
+		"--experimental-anchors",
 	)
 
 	return &clnBreezClient{
diff --git a/itest/cln_lspd_node.go b/itest/cln_lspd_node.go
index fcfa646..d1e7807 100644
--- a/itest/cln_lspd_node.go
+++ b/itest/cln_lspd_node.go
@@ -62,6 +62,7 @@ func NewClnLspdNode(h *lntest.TestHarness, m *lntest.Miner, mem *mempoolApi, nam
 		"--max-concurrent-htlcs=30",
 		"--dev-allowdustreserve=true",
 		"--allow-deprecated-apis=true",
+		"--experimental-anchors",
 	}
 	lightningNode := lntest.NewClnNode(h, m, name, args...)
 	cln := &config.ClnConfig{