plugins/spender: fix multifundchannel all on more than 1 channel.

We tried to put *everything* into the "all" output, which didn't work if there were other outputs! Fixes: #6664 Signed-off-by: Rusty Russell <[email protected]> Changelog-Fixed: JSON-RPC: `multifundchannel` with `all` as an amount works as expected.
ElementsProject · Mar 20, 2024 · d4abea3 · d4abea3
1 parent b752b4a
commit d4abea3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/plugins/spender/multifundchannel.c b/plugins/spender/multifundchannel.c
@@ -1267,6 +1267,19 @@ after_fundpsbt(struct command *cmd,
 		    || !amount_msat_to_sat(&all->amount, msat))
 			goto fail;
 
+		/* Subtract amounts we're using for the other outputs */
+		for (size_t i = 0; i < tal_count(mfc->destinations); i++) {
+			if (mfc->destinations[i].all)
+				continue;
+			if (!amount_sat_sub(&all->amount,
+					    all->amount,
+					    mfc->destinations[i].amount)) {
+				return mfc_fail(mfc, JSONRPC2_INVALID_PARAMS,
+						"Insufficient funds for `all`"
+						" output");
+			}
+		}
+
 		/* Remove the 'all' flag.  */
 		all->all = false;
 

diff --git a/tests/test_opening.py b/tests/test_opening.py
@@ -2682,7 +2682,6 @@ def test_opening_explicit_channel_type(node_factory, bitcoind):
     assert only_one(l3.rpc.listpeerchannels()['channels'])['channel_type']['bits'] == [STATIC_REMOTEKEY]
 
 
-@pytest.mark.xfail(strict=True)
 def test_multifunding_all_amount(node_factory, bitcoind):
     l1, l2, l3 = node_factory.get_nodes(3)