tests: update upfront close to use the dual-funded pathway

Not sure what the best way to gate/split tests is.

Author: niftynei

tests/plugins/accepter_close_to.py

@@ -14,22 +14,38 @@
 plugin = Plugin()
 
 
+def extract_opening_amount(openchannel):
+    key = 'opener_satoshis' if 'version' in openchannel and openchannel['version'] == 2 else 'funding_satoshis'
+    return Millisatoshi(openchannel[key])
+
+
 @plugin.hook('openchannel')
 def on_openchannel(openchannel, plugin, **kwargs):
+    ret = {'result': 'continue'}
+    amt_msat = extract_opening_amount(openchannel)
+    amt = amt_msat.to_satoshi()
+
+    if openchannel['version'] == 2:
+        # We match their funds. Always.
+        ret['funding_sats'] = amt_msat.to_satoshi_str()
+
     # - a multiple of 11: we send back a valid address (regtest)
-    if Millisatoshi(openchannel['funding_satoshis']).to_satoshi() % 11 == 0:
-        return {'result': 'continue', 'close_to': 'bcrt1q7gtnxmlaly9vklvmfj06amfdef3rtnrdazdsvw'}
+    if amt % 11 == 0:
+        ret['close_to'] = 'bcrt1q7gtnxmlaly9vklvmfj06amfdef3rtnrdazdsvw'
+        return ret
 
     # - a multiple of 7: we send back an empty address
-    if Millisatoshi(openchannel['funding_satoshis']).to_satoshi() % 7 == 0:
-        return {'result': 'continue', 'close_to': ''}
+    if amt % 7 == 0:
+        ret['close_to'] = ''
+        return ret
 
     # - a multiple of 5: we send back an address for the wrong chain (mainnet)
-    if Millisatoshi(openchannel['funding_satoshis']).to_satoshi() % 5 == 0:
-        return {'result': 'continue', 'close_to': 'bc1qlq8srqnz64wgklmqvurv7qnr4rvtq2u96hhfg2'}
+    if amt % 5 == 0:
+        ret['close_to'] = 'bc1qlq8srqnz64wgklmqvurv7qnr4rvtq2u96hhfg2'
+        return ret
 
     # - otherwise: we don't include the close_to
-    return {'result': 'continue'}
+    return ret
 
 
 plugin.run()

tests/plugins/funder.py

@@ -15,16 +15,16 @@
 
 @plugin.hook("openchannel")
 def on_openchannel(openchannel, plugin, **kwargs):
-    if openchannel['version'] == "1":
+    if openchannel['version'] == 1:
         raise ValueError("Not to be used with v1")
 
     their_funds = Millisatoshi(openchannel['opener_satoshis'])
     # We send back our maximum available funds
     if their_funds.to_satoshi() % 2 == 1:
         our_funds = Millisatoshi(openchannel['available_funds'])
-        return {'result': 'continue', 'funding_sats': our_funds}
+        return {'result': 'continue', 'funding_sats': our_funds.to_satoshi_str()}
     else:
-        return {'result': 'continue', 'funding_sats': their_funds}
+        return {'result': 'continue', 'funding_sats': their_funds.to_satoshi_str()}
 
 
 plugin.run()

tests/test_connection.py

@@ -4,7 +4,7 @@
 from fixtures import TEST_NETWORK
 from flaky import flaky  # noqa: F401
 from lightning import RpcError
-from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND, TIMEOUT, SLOW_MACHINE, COMPAT, expected_features
+from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND, TIMEOUT, SLOW_MACHINE, COMPAT, expected_features, EXPERIMENTAL_FEATURES
 from bitcoin.core import CMutableTransaction, CMutableTxOut
 
 import binascii
@@ -1110,12 +1110,16 @@ def test_funding_cancel_race(node_factory, bitcoind, executor):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
+@unittest.skipIf(not EXPERIMENTAL_FEATURES, "Dual funding needs experimental")
 def test_funding_close_upfront(node_factory, bitcoind):
     l1 = node_factory.get_node()
 
     opts = {'plugin': os.path.join(os.getcwd(), 'tests/plugins/accepter_close_to.py')}
     l2 = node_factory.get_node(options=opts)
 
+    l1.fundwallet(100000000)
+    l2.fundwallet(100000000)
+
     # The 'accepter_close_to' plugin uses the channel funding amount to determine
     # whether or not to include a 'close_to' address
     amt_normal = 100007     # continues without returning a close_to
@@ -1128,44 +1132,31 @@ def _fundchannel(l1, l2, amount, close_to):
         assert(l1.rpc.listpeers()['peers'][0]['id'] == l2.info['id'])
 
         resp = l1.rpc.fundchannel_start(l2.info['id'], amount, close_to=close_to)
-        address = resp['funding_address']
+        funding_addr = resp['funding_address']
 
         if close_to:
             assert resp['close_to']
         else:
             assert 'close_to' not in resp
 
-        peer = l1.rpc.listpeers()['peers'][0]
-        # Peer should still be connected and in state waiting for funding_txid
-        assert peer['id'] == l2.info['id']
-        r = re.compile('Funding channel start: awaiting funding_txid with output to .*')
-        assert any(r.match(line) for line in peer['channels'][0]['status'])
-        assert 'OPENINGD' in peer['channels'][0]['state']
-
-        # 'Externally' fund the address from fundchannel_start
-        addr_scriptpubkey = bitcoind.rpc.getaddressinfo(address)['scriptPubKey']
-        txout = CMutableTxOut(amount, bytearray.fromhex(addr_scriptpubkey))
-        unfunded_tx = CMutableTransaction([], [txout])
-        hextx = binascii.hexlify(unfunded_tx.serialize()).decode('utf8')
-
-        funded_tx_obj = bitcoind.rpc.fundrawtransaction(hextx)
-        raw_funded_tx = funded_tx_obj['hex']
-        txid = bitcoind.rpc.decoderawtransaction(raw_funded_tx)['txid']
-        txout = 1 if funded_tx_obj['changepos'] == 0 else 0
+        prep = l1.rpc.txprepare([{funding_addr: amount}], zero_out_change=True)
+        decode = bitcoind.rpc.decoderawtransaction(prep['unsigned_tx'])
+        assert decode['txid'] == prep['txid']
 
-        assert l1.rpc.fundchannel_complete(l2.info['id'], txid, txout)['commitments_secured']
-
-        # Broadcast the transaction manually and confirm that channel locks in
-        signed_tx = bitcoind.rpc.signrawtransactionwithwallet(raw_funded_tx)['hex']
-        assert txid == bitcoind.rpc.decoderawtransaction(signed_tx)['txid']
+        # One output will be correct.
+        if decode['vout'][0]['value'] == Decimal(str(amount / 10 ** 8)):
+            txout = 0
+        elif decode['vout'][1]['value'] == Decimal(str(amount / 10 ** 8)):
+            txout = 1
+        else:
+            assert False
 
-        bitcoind.rpc.sendrawtransaction(signed_tx)
+        txid = l1.rpc.fundchannel_complete(l2.info['id'], prep['txid'], txout)['txid']
+        l1.rpc.txsend(txid)
         bitcoind.generate_block(1)
 
         for node in [l1, l2]:
             node.daemon.wait_for_log(r'State changed from CHANNELD_AWAITING_LOCKIN to CHANNELD_NORMAL')
-            channel = node.rpc.listpeers()['peers'][0]['channels'][-1]
-            assert amount * 1000 == channel['msatoshi_total']
 
     # check that normal peer close works
     _fundchannel(l1, l2, amt_normal, None)
@@ -1184,9 +1175,11 @@ def _fundchannel(l1, l2, amount, close_to):
     addr = bitcoind.rpc.getnewaddress()
     _fundchannel(l1, l2, amt_normal, addr)
     assert addr == only_one(l1.rpc.listpeers()['peers'])['channels'][2]['close_to_addr']
+    l2_close_to_addr = l2.rpc.listpeers()['peers'][0]['channels'][-1]['close_to_addr']
     resp = l1.rpc.close(l2.info['id'], destination=addr)
     assert resp['type'] == 'mutual'
-    assert only_one(only_one(bitcoind.rpc.decoderawtransaction(resp['tx'])['vout'])['scriptPubKey']['addresses']) == addr
+    for vout in bitcoind.rpc.decoderawtransaction(resp['tx'])['vout']:
+        assert only_one(vout['scriptPubKey']['addresses']) in [addr, l2_close_to_addr]
 
     # check that remote peer closing works as expected (and that remote's close_to works)
     _fundchannel(l1, l2, amt_addr, addr)