Merge 12ff9e2 into 0e7615b

Author: rustyrussell

lightningd/peer_control.c

@@ -2332,7 +2332,7 @@ static void json_add_peer(struct lightningd *ld,
 		/* If peer reports our IP remote_addr, add that here */
 		if (p->remote_addr)
 			json_add_string(response, "remote_addr",
-					fmt_wireaddr(response, p->remote_addr));
+					fmt_wireaddr(tmpctx, p->remote_addr));
 	}
 
 	/* Note: If !PEER_CONNECTED, peer may use different features on reconnect */

tests/test_pay.py

@@ -4437,7 +4437,7 @@ def test_fetchinvoice(node_factory, bitcoind):
     # We remove the conversion plugin on l3, causing it to get upset.
     l1, l2, l3 = node_factory.line_graph(3, wait_for_announce=True,
                                          opts=[{},
-                                               {},
+                                               {'dev-allow-localhost': None},
                                                {'broken_log': "plugin-offers: Failed invreq.*Unknown command 'currencyconvert'",
                                                 'dev-allow-localhost': None}])
 
@@ -4535,7 +4535,6 @@ def test_fetchinvoice(node_factory, bitcoind):
                                    'description': 'offer3'})
     l4 = node_factory.get_node()
     l4.rpc.connect(l2.info['id'], 'localhost', l2.port)
-    time.sleep(0.25)
     # ... even if we can't find ourselves.
     l4.rpc.call('fetchinvoice', {'offer': offer3['bolt12']})
     # ... even if we know it from gossmap

tests/test_splicing.py

@@ -96,13 +96,15 @@ def test_splice_gossip(node_factory, bitcoind):
     wait_for(lambda: only_one(l2.rpc.listpeerchannels(l1.info['id'])['channels'])['state'] == 'CHANNELD_AWAITING_SPLICE')
     wait_for(lambda: only_one(l1.rpc.listpeerchannels(l2.info['id'])['channels'])['state'] == 'CHANNELD_AWAITING_SPLICE')
 
-    bitcoind.generate_block(6, wait_for_mempool=result['txid'])
+    bitcoind.generate_block(5, wait_for_mempool=result['txid'])
 
     # l3 will see channel dying, but still consider it OK for 12 blocks.
     l3.daemon.wait_for_log(f'gossipd: channel {pre_splice_scid} closing soon due to the funding outpoint being spent')
     assert len(l3.rpc.listchannels(short_channel_id=pre_splice_scid)['channels']) == 2
     assert len(l3.rpc.listchannels(source=l1.info['id'])['channels']) == 1
 
+    # Final one will allow splice announcement to proceed.
+    bitcoind.generate_block(1)
     wait_for(lambda: only_one(l2.rpc.listpeerchannels(l1.info['id'])['channels'])['state'] == 'CHANNELD_NORMAL')
     wait_for(lambda: only_one(l1.rpc.listpeerchannels(l2.info['id'])['channels'])['state'] == 'CHANNELD_NORMAL')