Merge branch 'master' into fix-fee-calculations

Author: rustyrussell

README.md

@@ -106,9 +106,6 @@ the lightning network.
 There are also numerous plugins available for Core Lightning which add
 capabilities: in particular there's a collection at: https://github.com/lightningd/plugins
 
-Including [helpme][helpme-github] which guides you through setting up
-your first channels and customizing your node.
-
 For a less reckless experience, you can encrypt the HD wallet seed:
  see [HD wallet encryption](#hd-wallet-encryption).
 

contrib/pyln-testing/pyln/testing/fixtures.py

@@ -403,7 +403,7 @@ def is_sat_or_all(checker, instance):
     def is_currency(checker, instance):
         """currency including currency code"""
         pattern = re.compile(r'^\d+(\.\d+)?[A-Z][A-Z][A-Z]$')
-        if pattern.match(instance):
+        if checker.is_type(instance, "string") and pattern.match(instance):
             return True
         return False
 

doc/beginners-guide/beginners-guide.md

@@ -57,6 +57,6 @@ Useful commands:
 
 Once you've started for the first time, there's a script called `contrib/bootstrap-node.sh` which will connect you to other nodes on the lightning network.
 
-There are also numerous plugins available for Core Lightning which add capabilities: see the [Plugins](doc:plugins) guide, and check out the plugin collection at: <https://github.com/lightningd/plugins>, including [helpme](https://github.com/lightningd/plugins/tree/master/helpme) which guides you through setting up your first channels and customising your node.
+There are also numerous plugins available for Core Lightning which add capabilities: see the [Plugins](doc:plugins) guide, and check out the plugin collection at: <https://github.com/lightningd/plugins>.
 
 For a less reckless experience, you can encrypt the HD wallet seed: see [HD wallet encryption](doc:backup-and-recovery#hsm-secret-backup).

doc/node-operators-guide/faq.md

@@ -8,34 +8,6 @@ updatedAt: "2023-07-05T09:42:38.017Z"
 ---
 # General questions
 
-### I don't know where to start, help me !
-
-There is a Core Lightning plugin specifically for this purpose, it's called [`helpme`](https://github.com/lightningd/plugins/tree/master/helpme).
-
-Assuming you have followed the [installation steps](doc:installation), have `lightningd` up and running, and `lightning-cli` in your `$PATH` you can start the plugin like so:
-
-```shell
-# Clone the plugins repository
-git clone https://github.com/lightningd/plugins
-# Make sure the helpme plugin is executable (git should have already handled this)
-chmod +x plugins/helpme/helpme.py
-# Install its dependencies (there is only one actually)
-pip3 install --user -r plugins/helpme/requirements.txt
-# Then just start it :)
-lightning-cli plugin start $PWD/plugins/helpme/helpme.py
-```
-
-
-
-The plugin registers a new command `helpme` which will guide you through the main  
-components of C-lightning:
-
-```shell
-lightning-cli helpme
-```
-
-
-
 ### How to get the balance of each channel ?
 
 You can use the `listfunds` command and take a ratio of `our_amount_msat` over  

plugins/examples/cln-plugin-startup.rs

@@ -76,6 +76,7 @@ async fn main() -> Result<(), anyhow::Error> {
             "send a test_custom_notification event",
             test_send_custom_notification,
         )
+        .rpcmethod("test-log-levels", "send on all log levels", test_log_levels)
         .subscribe("connect", connect_handler)
         .subscribe("test_custom_notification", test_receive_custom_notification)
         .hook("peer_connected", peer_connected_handler)
@@ -161,3 +162,15 @@ async fn peer_connected_handler(
     log::info!("Got a connect hook call: {}", v);
     Ok(json!({"result": "continue"}))
 }
+
+async fn test_log_levels(
+    _p: Plugin<()>,
+    _v: serde_json::Value,
+) -> Result<serde_json::Value, Error> {
+    log::trace!("log::trace! working");
+    log::debug!("log::debug! working");
+    log::info!("log::info! working");
+    log::warn!("log::warn! working");
+    log::error!("log::error! working");
+    Ok(json!({}))
+}

plugins/src/logging.rs

@@ -22,6 +22,7 @@ enum LogLevel {
     Info,
     Warn,
     Error,
+    Trace,
 }
 
 impl From<log::Level> for LogLevel {
@@ -30,7 +31,8 @@ impl From<log::Level> for LogLevel {
             log::Level::Error => LogLevel::Error,
             log::Level::Warn => LogLevel::Warn,
             log::Level::Info => LogLevel::Info,
-            log::Level::Debug | log::Level::Trace => LogLevel::Debug,
+            log::Level::Debug => LogLevel::Debug,
+            log::Level::Trace => LogLevel::Trace,
         }
     }
 }
@@ -130,7 +132,7 @@ mod trace {
                 &Level::ERROR => LogLevel::Error,
                 &Level::INFO => LogLevel::Info,
                 &Level::WARN => LogLevel::Warn,
-                &Level::TRACE => LogLevel::Debug,
+                &Level::TRACE => LogLevel::Trace,
             }
         }
     }

tests/test_cln_rs.py

@@ -105,6 +105,20 @@ def test_plugin_options_handle_defaults(node_factory):
     assert opts["multi-i64-option-default"] == [-42]
 
 
+def test_plugin_log_levels(node_factory):
+    """Start a minimal plugin and ensure it logs all levels"""
+    bin_path = Path.cwd() / "target" / RUST_PROFILE / "examples" / "cln-plugin-startup"
+    l1 = node_factory.get_node(
+        options={"plugin": str(bin_path)}, broken_log=r"log::error! working"
+    )
+    l1.rpc.test_log_levels()
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::trace! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::debug! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::info! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::warn! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::error! working"))
+
+
 def test_grpc_connect(node_factory):
     """Attempts to connect to the grpc interface and call getinfo"""
     # These only exist if we have rust!

tests/test_opening.py

@@ -2736,15 +2736,19 @@ def censoring_sendrawtx(tx):
         l1.rpc.pay(inv["bolt11"])
         wait_for(lambda: only_one(l2.rpc.listpeerchannels()['channels'])['to_us_msat'] == 1)
 
-    # We need *another* channel to make it forget the first though!
+    # We need *another* channel to make it forget the first though!  (One block later, otherwise
+    # *this* might be forgotten).
+    bitcoind.generate_block(1)
+    sync_blockheight(bitcoind, [l2])
+
     l3.connect(l2)
     l3.rpc.fundchannel(l2.info["id"], 10**6, mindepth=0)
     bitcoind.generate_block(1)
 
     # Now stop, in order to cause catchup and re-evaluate whether to forget the channel
     l2.stop()
 
-    # Now we generate enough blocks to cause l2 to forget the channel.
+    # Now we generate enough blocks to cause l2 consider both channels forgettable.
     bitcoind.generate_block(blocks - 1)  # > blocks
     l2.start()
 
@@ -2755,16 +2759,14 @@ def censoring_sendrawtx(tx):
     bitcoind.generate_block(1)
     sync_blockheight(bitcoind, [l1, l2])
 
-    # This may take a moment!
-    time.sleep(5)
-
-    have_forgotten = l2.daemon.is_in_log(
-        r"UNUSUAL {}-chan#1: Forgetting channel: It has been 51 blocks without the funding transaction ".format(l1.info['id'])
-    )
-
+    # If we made a payment it will *not* consider there to tbe two forgettable channels.
     if dopay:
-        assert not have_forgotten
+        # This may take a moment!
+        time.sleep(5)
+
+        assert not l2.daemon.is_in_log('Forgetting channel')
         assert set([c['peer_id'] for c in l2.rpc.listpeerchannels()["channels"]]) == set([l1.info['id'], l3.info['id']])
     else:
-        assert have_forgotten
+        # It will forget the older one.
+        l2.daemon.wait_for_log(r"UNUSUAL {}-chan#1: Forgetting channel: It has been {} blocks without the funding transaction ".format(l1.info['id'], blocks + 1))
         assert [c['peer_id'] for c in l2.rpc.listpeerchannels()["channels"]] == [l3.info['id']]

tests/test_pay.py

@@ -4737,7 +4737,7 @@ def test_fetchinvoice_disconnected_reply(node_factory, bitcoind):
 
     # l2 is already connected to l3, so it can fetch.  It specifies a reply
     # path of l1->l2.  l3 knows it can simply route reply to l1 via l2.
-    l2.rpc.fetchinvoice(offer=offer['bolt12'], dev_reply_path=[l1.info['id'], l2.info['id']])
+    l2.rpc.call('fetchinvoice', {'offer': offer['bolt12'], 'dev_reply_path': [l1.info['id'], l2.info['id']]})
     assert l3.rpc.listpeers(l1.info['id']) == {'peers': []}
 
 
@@ -5709,7 +5709,7 @@ def test_blinded_reply_path_scid(node_factory):
 
     chan = only_one(l1.rpc.listpeerchannels()['channels'])
     scidd = "{}/{}".format(chan['short_channel_id'], chan['direction'])
-    inv = l1.rpc.fetchinvoice(offer=offer['bolt12'], dev_path_use_scidd=scidd)['invoice']
+    inv = l1.rpc.call('fetchinvoice', {'offer': offer['bolt12'], 'dev_path_use_scidd': scidd})['invoice']
 
     l1.rpc.pay(inv)
 
@@ -5740,9 +5740,10 @@ def test_offer_paths(node_factory, bitcoind):
 
     chan = only_one(l1.rpc.listpeerchannels()['channels'])
     scidd = "{}/{}".format(chan['short_channel_id'], chan['direction'])
-    offer = l2.rpc.offer(amount='100sat', description='test_offer_paths',
-                         dev_paths=[[scidd, l2.info['id']],
-                                    [l3.info['id'], l2.info['id']]])
+    offer = l2.rpc.call('offer', {'amount': '100sat',
+                                  'description': 'test_offer_paths',
+                                  'dev_paths': [[scidd, l2.info['id']],
+                                                [l3.info['id'], l2.info['id']]]})
 
     paths = l1.rpc.decode(offer['bolt12'])['offer_paths']
     assert len(paths) == 2