Merge branch 'ElementsProject:master' into bolt12_offer_issuer_id

Author: 21M4TW

.github/scripts/setup.sh

@@ -54,6 +54,7 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
      valgrind \
      wget \
      xsltproc \
+     systemtap-sdt-dev \
      zlib1g-dev
 
 echo "tester ALL=(root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/tester

.github/workflows/bsd.yml

@@ -23,11 +23,13 @@ jobs:
       uses: vmactions/freebsd-vm@v1
       with:
         usesh: true
+        sync: rsync
+        copyback: false
         prepare: |
           pkg install -y \
             bash \
             wget \
-            python38 \
+            python310 \
             gmake \
             git \
             python \
@@ -39,38 +41,26 @@ jobs:
             gettext \
             sqlite3 \
             lowdown \
+            pkgconf \
+            jq \
+            protobuf \
             curl
 
-            python3.8 -m ensurepip
-            python3.8 -m pip install --upgrade pip
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-11-28
+            python3.10 -m ensurepip
+            python3.10 -m pip install --upgrade pip
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
 
-            cd /tmp/ || exit 1
-            wget https://bitcoincore.org/bin/bitcoin-core-${{ matrix.bitcoind-version }}/bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.gz
-            tar -xf bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.bz2
-            sudo mv bitcoin-${{ matrix.bitcoind-version }}/bin/* /usr/local/bin
-            rm -rf bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.gz bitcoin-${{ matrix.bitcoind-version }}
 
         run: |
-          PATH=/root/.local/bin:$PATH
+          PATH=/root/.local/bin:$PATH:/root/.cargo/bin; export PATH
           pip install --user -U wheel pip
-          pip install --user -U -r requirements.txt
-
-          # Install utilities that aren't dependencies, but make
-          # running tests easier/feasible on CI (and pytest which
-          # keeps breaking the rerunfailures plugin).
-          pip install --user -U \
-            blinker \
-            flake8 \
-            mako \
-            pytest-sentry \
-            pytest-test-groups==1.0.3 \
-            pytest-custom-exit-code==0.3.0 \
-            pytest-json-report
+          pip3 install --user poetry
+          poetry install
 
           git clone https://github.com/lightning/bolts.git ../bolts
           # fatal: unsafe repository ('/Users/runner/work/lightning/lightning' is owned by someone else)
           git config --global --add safe.directory `pwd`
+          for d in libsodium libwally-core gheap jsmn libbacktrace lowdown; do git config --global --add safe.directory `pwd`/external/$d; done
           git submodule update --init --recursive
 
           ./configure CC="$CC" --disable-valgrind
@@ -85,7 +75,5 @@ jobs:
           EOF
 
           # Just run a "quick" test without memory checking
-          gmake
+          poetry run gmake
 
-          # Clean up to maximize rsync's chances of succeeding
-          gmake clean

Cargo.lock

@@ -371,6 +371,7 @@ include devtools/Makefile
 include tools/Makefile
 ifneq ($(RUST),0)
 include cln-rpc/Makefile
+include cln-grpc/Makefile
 endif
 include plugins/Makefile
 include tests/plugins/Makefile

Makefile

@@ -1,6 +1,6 @@
 [package]
 name = "cln-grpc"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 license = "MIT"
 description = "The Core Lightning API as grpc primitives. Provides the bindings used to expose the API over the network."
@@ -15,20 +15,21 @@ server = ["cln-rpc"]
 [dependencies]
 anyhow = "1.0"
 log = "0.4"
-cln-rpc = { path="../cln-rpc/", version = "0.4", optional = true }
+cln-rpc = { path = "../cln-rpc/", version = "0.4", optional = true }
+cfg-if = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tonic = { version = "0.11", features = ["tls", "transport"] }
 prost = "0.12"
 hex = "0.4.3"
-bitcoin = { version = "0.31", features = [ "serde" ] }
+bitcoin = { version = "0.31", features = ["serde"] }
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tokio = { version = "1.36.0", features = ["sync"] }
 futures-core = "0.3.30"
 tokio-util = "0.7.10"
 
 [dev-dependencies]
 serde_json = "1.0.72"
-cln-rpc = { path="../cln-rpc/", version = "0.4" }
+cln-rpc = { path = "../cln-rpc/", version = "0.4" }
 
 [build-dependencies]
 tonic-build = "0.11"

cln-grpc/Cargo.toml

@@ -1,15 +1,16 @@
 // Huge json!() macros require lots of recursion
 #![recursion_limit = "1024"]
 
-#[cfg(feature = "server")]
-mod convert;
 pub mod pb;
 
-#[cfg(feature = "server")]
-mod server;
-
-#[cfg(feature = "server")]
-pub use crate::server::Server;
+cfg_if::cfg_if! {
+    if #[cfg(feature = "server")] {
+        mod convert;
+        mod server;
+        pub use server::Server;
+        pub use server::NotificationStream;
+    }
+}
 
 #[cfg(test)]
 mod test;

cln-grpc/src/lib.rs

@@ -18,4 +18,4 @@ target/${RUST_PROFILE}/examples/cln-plugin-reentrant: ${CLN_RPC_SOURCES} plugins
 	cargo build ${CARGO_OPTS} --example cln-plugin-reentrant
 
 
-cln-rpc-all: ${CLN_RPC_GEN_ALL} ${CLN_RPC_EXAMPLES}
+cln-rpc-all: ${CLN_RPC_GENALL} ${CLN_RPC_EXAMPLES}

cln-rpc/Makefile

@@ -118,6 +118,7 @@ common/test/run-splice_script:				\
 common/test/run-trace:					\
 	common/amount.o                                 \
 	common/memleak.o				\
+	common/pseudorand.o				\
 	common/trace.o					\
 	wire/fromwire.o					\
 	wire/towire.o

common/test/Makefile

@@ -13,16 +13,20 @@ int main(int argx, char *argv[])
 	common_setup(argv[0]);
 
 	/* Create a bunch of nested spans to emit. */
-	for(int i=0; i<25000; i++) {
+	for(int i=0; i<2500000; i++) {
 		trace_span_start("a", &a);
+		trace_span_tag(&a, "method", "getrawblockbyheight");
 		trace_span_start("b", &b);
+		trace_span_tag(&b, "method", "getrawblockbyheight");
 
 		trace_span_start("c", &c);
+		trace_span_tag(&c, "method", "getrawblockbyheight");
 		trace_span_end(&c);
 
 		trace_span_end(&b);
 
 		trace_span_start("d", &d);
+		trace_span_tag(&d, "method", "getrawblockbyheight");
 		trace_span_end(&d);
 
 		trace_span_end(&a);