ld: Enable anchor outputs on liquid and liquid-regtest

Author: cdecker

lightningd/options.c

@@ -1787,13 +1787,6 @@ void handle_early_opts(struct lightningd *ld, int argc, char *argv[])
 	else
 		ld->config = mainnet_config;
 
-	/* No anchors if we're elements */
-	if (chainparams->is_elements) {
-		feature_set_sub(ld->our_features,
-				feature_set_for_feature(tmpctx,
-							OPTIONAL_FEATURE(OPT_ANCHORS_ZERO_FEE_HTLC_TX)));
-	}
-
 	/* Set the ln_port given from chainparams */
 	ld->config.ip_discovery_port = chainparams->ln_port;
 

tests/test_connection.py

@@ -3570,17 +3570,11 @@ def test_wumbo_channels(node_factory, bitcoind):
 @pytest.mark.openchannel('v2')
 @pytest.mark.parametrize("anchors", [False, True])
 def test_channel_features(node_factory, bitcoind, anchors):
-    if TEST_NETWORK == 'regtest':
-        if anchors is False:
-            opts = {'dev-force-features': "-23"}
-        else:
-            opts = {}
+    if anchors is False:
+        opts = {'dev-force-features': "-23"}
     else:
-        # We have to force this ON for elements!
-        if anchors is False:
-            opts = {}
-        else:
-            opts = {'dev-force-features': "+23"}
+        opts = {}
+
     l1, l2 = node_factory.line_graph(2, fundchannel=False, opts=opts)
 
     bitcoind.rpc.sendtoaddress(l1.rpc.newaddr()['bech32'], 0.1)

tests/test_opening.py

@@ -1641,10 +1641,10 @@ def test_zeroconf_open(bitcoind, node_factory):
     # and use their own mindepth=6, while l3 uses mindepth=2 from the
     # plugin
     ret = l2.rpc.fundchannel(l3.info['id'], 'all', mindepth=0)
-    if TEST_NETWORK == 'regtest':
-        channel_type = {'bits': [12, 22, 50], 'names': ['static_remotekey/even', 'anchors/even', 'zeroconf/even']}
-    else:
-        channel_type = {'bits': [12, 50], 'names': ['static_remotekey/even', 'zeroconf/even']}
+    channel_type = {
+        'bits': [12, 22, 50],
+        'names': ['static_remotekey/even', 'anchors/even', 'zeroconf/even']
+    }
     assert ret['channel_type'] == channel_type
     assert only_one(l2.rpc.listpeerchannels(l3.info['id'])['channels'])['channel_type'] == channel_type
 
@@ -1723,7 +1723,7 @@ def test_zeroconf_public(bitcoind, node_factory, chainparams):
     assert('short_channel_id' not in l2chan)
 
     # Channel is "proposed"
-    chan_val = 993888000 if chainparams['elements'] else 970073000
+    chan_val = 966908000 if chainparams['elements'] else 970073000
     l1_mvts = [
         {'type': 'chain_mvt', 'credit_msat': chan_val, 'debit_msat': 0, 'tags': ['channel_proposed', 'opener']},
         {'type': 'channel_mvt', 'credit_msat': 0, 'debit_msat': 20000000, 'tags': ['pushed'], 'fees_msat': '0msat'},

tests/utils.py

@@ -41,31 +41,25 @@ def hex_bits(features):
 
 def expected_peer_features(extra=[]):
     """Return the expected peer features hexstring for this configuration"""
-    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 25, 27, 35, 39, 45, 47, 51]
+    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 23, 25, 27, 35, 39, 45, 47, 51]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]
     if EXPERIMENTAL_SPLICING:
         features += [63]  # option_splice
-    if TEST_NETWORK != 'liquid-regtest':
-        # Anchors, except for elements
-        features += [23]
     return hex_bits(features + extra)
 
 
 # With the addition of the keysend plugin, we now send a different set of
 # features for the 'node' and the 'peer' feature sets
 def expected_node_features(extra=[]):
     """Return the expected node features hexstring for this configuration"""
-    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 25, 27, 35, 39, 45, 47, 51, 55]
+    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 23, 25, 27, 35, 39, 45, 47, 51, 55]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]
     if EXPERIMENTAL_SPLICING:
         features += [63]  # option_splice
-    if TEST_NETWORK != 'liquid-regtest':
-        # Anchors, except for elements
-        features += [23]
     return hex_bits(features + extra)