Added splicing plumbing

libs/gl-cli/Cargo.toml

@@ -12,6 +12,9 @@ categories = ["command-line-utilities", "cryptography::cryptocurrencies"]
 license = "MIT"
 readme = "README.md"
 
+[features]
+experimental-splicing = ["gl-client/experimental-splicing"]
+
 [[bin]]
 name = "glcli"
 test = true

libs/gl-client-py/Cargo.toml

@@ -36,3 +36,4 @@ thiserror = "1"
 [features]
 default = ["permissive"]
 permissive = ["gl-client/permissive"]
+experimental-splicing = ["gl-client/experimental-splicing"]

libs/gl-client-py/glclient/__init__.py

@@ -141,6 +141,9 @@ def __init__(self, node_id: bytes, grpc_uri: str, creds: Credentials) -> None:
         self.inner = native.Node(node_id=node_id, grpc_uri=grpc_uri, creds=creds)
         self.logger = logging.getLogger("glclient.Node")
 
+    def call(self, path: str, request: bytes) -> bytes:
+        return bytes(self.inner.call(path, bytes(request)))
+
     def get_info(self) -> clnpb.GetinfoResponse:
         uri = "/cln.Node/Getinfo"
         req = clnpb.GetinfoRequest().SerializeToString()
@@ -279,16 +282,11 @@ def decode(self, string: str) -> clnpb.DecodeResponse:
         return res.FromString(bytes(self.inner.call(uri, bytes(req))))
 
     def decodepay(
-        self, bolt11: str, description: Optional[str]
-    ) -> clnpb.DecodepayResponse:
-        uri = "/cln.Node/DecodePay"
-        res = clnpb.DecodepayResponse
-        req = clnpb.DecodepayRequest(
-            bolt11=bolt11,
-            description=description,
-        ).SerializeToString()
-
-        return res.FromString(bytes(self.inner.call(uri, bytes(req))))
+        self, bolt11: str, description: Optional[str] = None
+    ) -> clnpb.DecodeResponse:
+        if description is not None:
+            raise ValueError("CLN's Decode RPC does not accept a description")
+        return self.decode(bolt11)
 
     def disconnect_peer(self, peer_id: str, force=False) -> clnpb.DisconnectResponse:
         uri = "/cln.Node/Disconnect"

libs/gl-client/Cargo.toml

@@ -15,6 +15,7 @@ default = ["permissive", "export"]
 permissive = []
 export = ["chacha20poly1305", "secp256k1"]
 backup = []
+experimental-splicing = []
 
 [dependencies]
 aes = "0.8"
@@ -35,6 +36,7 @@ picky-asn1-der = "0.4"
 pin-project = "1.1.5"
 prost = "0.12"
 prost-derive = "0.12"
+psbt-v2 = { version = "0.3.0", default-features = false, features = ["std"] }
 # `rustls-tls-webpki-roots` compiles Mozilla's CA bundle into the
 # binary. Identical TLS behaviour on every platform — Android, iOS,
 # desktop — with no runtime OS root-store discovery. We previously

libs/gl-client/src/lib.rs

@@ -28,8 +28,9 @@ pub mod scheduler;
 /// move your funds.
 pub mod signer;
 
-pub mod persist;
 pub mod metrics;
+pub mod persist;
+pub mod psbt;
 
 pub mod lnurl;
 

libs/gl-client/src/persist.rs

@@ -1,4 +1,15 @@
 mod canonical;
+mod splice;
+
+pub use splice::{
+    candidate_funding_facts_from_psbt, parse_base64_psbt, wallet_inputs_from_psbt, FeePolicy,
+    FundPsbtResponseFacts, FundingOutpoint, LocalSpliceIntent, OldSpliceState, PsbtCaptureFacts,
+    SignPsbtIntentFacts, SpliceSignedResponseFacts, SpliceUpdateResponseFacts,
+    WalletInputReservation,
+};
+#[cfg(test)]
+pub(crate) use splice::{CandidateFundingFacts, WalletInput};
+pub(crate) use splice::{SpliceOrigin, SplicePhase, SpliceSessionV1};
 
 use anyhow::anyhow;
 use lightning_signer::bitcoin::secp256k1::PublicKey;
@@ -1092,10 +1103,13 @@ mod tests {
 
     #[test]
     fn state_entry_canonical_value_bytes_sorts_nested_object_keys() {
-        let entry = StateEntry::new(0, json!({
+        let entry = StateEntry::new(
+            0,
+            json!({
             "z": {"b": 1, "a": 2},
             "a": [{"d": 4, "c": 3}]
-        }));
+            }),
+        );
 
         let bytes = entry.canonical_value_bytes().unwrap();