splice: Add funding outnum

Fixes #7005 Changelog-Changed: Added outnum of new funding output to splice_signed RPC command
ElementsProject · Jul 15, 2024 · 21bc89f · 21bc89f
1 parent d77301c
commit 21bc89f
Show file tree

Hide file tree

Showing 9 changed files with 337 additions and 312 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -3113,6 +3113,7 @@
             "Splice_Signed.sign_first": 3
         },
         "Splice_signedResponse": {
+            "Splice_Signed.outnum": 3,
             "Splice_Signed.tx": 1,
             "Splice_Signed.txid": 2
         },
@@ -10788,6 +10789,10 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "Splice_Signed.outnum": {
+            "added": "v24.08",
+            "deprecated": false
+        },
         "Splice_Signed.psbt": {
             "added": "pre-v0.10.1",
             "deprecated": false

diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json
@@ -28150,6 +28150,13 @@
             "description": [
               "The txid is of the final transaction."
             ]
+          },
+          "outnum": {
+            "added": "v24.08",
+            "type": "u32",
+            "description": [
+              "The index of the new funding output."
+            ]
           }
         }
       },

diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -1947,6 +1947,7 @@ def splice_init2py(m):
 
 def splice_signed2py(m):
     return remove_default({
+        "outnum": m.outnum,  # PrimitiveField in generate_composite
         "tx": hexlify(m.tx),  # PrimitiveField in generate_composite
         "txid": hexlify(m.txid),  # PrimitiveField in generate_composite
     })

diff --git a/doc/schemas/lightning-splice_signed.json b/doc/schemas/lightning-splice_signed.json
@@ -54,6 +54,13 @@
         "description": [
           "The txid is of the final transaction."
         ]
+      },
+      "outnum": {
+        "added": "v24.08",
+        "type": "u32",
+        "description": [
+          "The index of the new funding output."
+        ]
       }
     }
   },

diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c
@@ -501,6 +501,7 @@ static void handle_tx_broadcast(struct send_splice_info *info)
 
 		json_add_hex(response, "tx", tx_bytes, tal_bytelen(tx_bytes));
 		json_add_txid(response, "txid", &txid);
+		json_add_u32(response, "outnum", info->output_index);
 
 		was_pending(command_success(info->cc->cmd, response));
 	}