Gp/fiber (#79)

* fix ci

* add new test

* update fiber test (#81)

* update fiber test

* update fiber

* Update Makefile

Author: gpBlockchain

Makefile

@@ -56,9 +56,7 @@ fiber_test_cases := \
 	test_cases/fiber/devnet/new_invoice \
 	test_cases/fiber/devnet/send_payment \
 	test_cases/fiber/devnet/shutdown_channel \
-	test_cases/fiber/devnet/update_channel \
-	test_cases/fiber/devnet/watch_tower
-
+	test_cases/fiber/devnet/update_channel 
 
 
 test:

framework/basic_fiber.py

@@ -143,6 +143,9 @@ def setup_method(cls, method):
         cls.fiber1.connect_peer(cls.fiber2)
         time.sleep(1)
         cls.logger.debug(f"\nSetting up method:{method.__name__}")
+        cls.node.getClient().clear_tx_pool()
+        for i in range(5):
+            cls.Miner.miner_with_version(cls.node, "0x0")
 
     def teardown_method(self, method):
         if self.debug:
@@ -295,6 +298,34 @@ def open_channel(
         fiber1_fee=1000,
         fiber2_fee=1000,
     ):
+        fiber1.connect_peer(fiber2)
+        time.sleep(1)
+        if fiber1_balance <= int(
+            fiber2.get_client().node_info()[
+                "open_channel_auto_accept_min_ckb_funding_amount"
+            ],
+            16,
+        ):
+            temporary_channel = fiber1.get_client().open_channel(
+                {
+                    "peer_id": fiber2.get_peer_id(),
+                    "funding_amount": hex(fiber1_balance + 62 * 100000000),
+                    "tlc_fee_proportional_millionths": hex(fiber1_fee),
+                    "public": True,
+                }
+            )
+            fiber2.get_client().accept_channel(
+                {
+                    "temporary_channel_id": temporary_channel["temporary_channel_id"],
+                    "funding_amount": hex(fiber2_balance + 62 * 100000000),
+                    "tlc_fee_proportional_millionths": hex(fiber2_fee),
+                }
+            )
+            time.sleep(1)
+            self.wait_for_channel_state(
+                fiber1.get_client(), fiber2.get_peer_id(), "CHANNEL_READY"
+            )
+            return
         fiber1.get_client().open_channel(
             {
                 "peer_id": fiber2.get_peer_id(),
@@ -309,7 +340,7 @@ def open_channel(
         channels = fiber1.get_client().list_channels({"peer_id": fiber2.get_peer_id()})
         payment = fiber1.get_client().send_payment(
             {
-                "target_pubkey": fiber2.get_client().node_info()["public_key"],
+                "target_pubkey": fiber2.get_client().node_info()["node_id"],
                 "amount": hex(fiber2_balance),
                 "keysend": True,
             }
@@ -500,8 +531,7 @@ def get_fiber_env(self, new_fiber_count=0):
             self.logger.debug(
                 f"commit_hash:{node_info['commit_hash']}",
             )
-            self.logger.debug(f"public_key:{node_info['public_key']}")
-            self.logger.debug(f"peer_id:{node_info['peer_id']}")
+            self.logger.debug(f"public_key:{node_info['node_id']}")
             self.logger.debug(f"channel_count:{int(node_info['channel_count'], 16)}")
             self.logger.debug(f"peers_count:{int(node_info['peers_count'], 16)}")
             self.logger.debug(
@@ -510,7 +540,6 @@ def get_fiber_env(self, new_fiber_count=0):
             channels = fibers_data[i]["channels"]
             for channel in channels:
                 channel_id = channel["channel_id"]
-                peer_id = channel["peer_id"]
                 state_name = channel["state"]["state_name"]
                 local_balance = int(channel["local_balance"], 16) / 100000000
                 offered_tlc_balance = (
@@ -527,7 +556,6 @@ def get_fiber_env(self, new_fiber_count=0):
 
                 # 打印结果
                 self.logger.debug(f"-----Channel ID: {channel_id}-------")
-                self.logger.debug(f"Peer ID: {peer_id}")
                 self.logger.debug(f"State: {state_name}")
                 self.logger.debug(f"Local Balance: {local_balance}")
                 self.logger.debug(f"Offered TLC Balance: {offered_tlc_balance}")

framework/fiber_rpc.py

@@ -193,6 +193,9 @@ def graph_channels(self, param={}):
         """
         return self.call("graph_channels", [param])
 
+    def get_peer_id(self):
+        return self.node_info()["addresses"][0].split("/")[-1]
+
     def call(self, method, params):
         headers = {"content-type": "application/json"}
         data = {"id": 42, "jsonrpc": "2.0", "method": method, "params": params}

framework/test_fiber.py

@@ -170,7 +170,7 @@ def get_log_file(self):
         pass
 
     def get_peer_id(self):
-        return self.get_client().node_info()["peer_id"]
+        return self.get_client().node_info()["addresses"][0].split("/")[-1]
 
     def get_account(self):
         return framework.helper.ckb_cli.util_key_info_by_private_key(

source/template/fiber/config.yml

@@ -37,9 +37,18 @@ fiber:
 
 rpc:
   listening_addr: "127.0.0.1:8227"
+  enabled_modules:
+    - cch
+    - channel
+    - payment
+    - graph
+    - info
+    - invoice
+    - peer
+    - dev
 
 ckb:
-  rpc_url: "https://testnet.ckbapp.dev/"
+  rpc_url: "https://testnet.ckb.dev/"
   udt_whitelist:
     - name: RUSD
       script:

source/template/fiber/config.yml.j2

@@ -37,9 +37,19 @@ fiber:
 
 rpc:
   listening_addr: {{ rpc_listening_addr | default("127.0.0.1:8227") }}
+  enabled_modules:
+    - cch
+    - channel
+    - payment
+    - graph
+    - info
+    - invoice
+    - peer
+    - dev
 
 ckb:
   rpc_url: "https://testnet.ckbapp.dev/"
+  open_channel_auto_accept_min_ckb_funding_amount: {{ fiber_open_channel_auto_accept_min_ckb_funding_amount | default(10000000000)}}
   udt_whitelist:
     - name: RUSD
       script:

source/template/fiber/dev_config.yml.j2

@@ -5,10 +5,19 @@ fiber:
   announce_private_addr: true
   gossip_store_maintenance_interval_ms: 1000
   gossip_network_maintenance_interval_ms: 1000
+  open_channel_auto_accept_min_ckb_funding_amount: {{ fiber_open_channel_auto_accept_min_ckb_funding_amount | default(10000000000)}}
 
 rpc:
   listening_addr: {{ rpc_listening_addr | default("127.0.0.1:8227") }}
-
+  enabled_modules:
+    - cch
+    - channel
+    - payment
+    - graph
+    - info
+    - invoice
+    - peer
+    - dev
 ckb:
   rpc_url: {{ ckb_rpc_url | default("http://127.0.0.1:8114") }}
   {% if ckb_udt_whitelist is defined %}

test_cases/fiber/devnet/accept_channel/test_funding_amount.py

@@ -6,6 +6,7 @@
 
 
 class TestFundingAmount(FiberTest):
+
     def test_ckb_funding_amount_zero(self):
         node_info = self.fiber1.get_client().node_info()
         open_channel_auto_accept_min_ckb_funding_amount = node_info[

test_cases/fiber/devnet/disconnect_peer/test_disconnect_peer.py

@@ -8,9 +8,7 @@ def test_disconnect_peer(self):
         before_node_info = self.fiber1.get_client().node_info()
         assert before_node_info["peers_count"] == "0x1"
 
-        self.fiber1.get_client().disconnect_peer(
-            {"peer_id": self.fiber2.get_client().node_info()["peer_id"]}
-        )
+        self.fiber1.get_client().disconnect_peer({"peer_id": self.fiber2.get_peer_id()})
         time.sleep(1)
         after_node_info = self.fiber1.get_client().node_info()
         assert after_node_info["peers_count"] == "0x0"

test_cases/fiber/devnet/get_invoice/test_get_invoice.py

@@ -1,5 +1,4 @@
 import datetime
-import time
 
 import pytest
 
@@ -41,7 +40,7 @@ def test_get_exist_new_invoice(self):
         node_info = self.fiber1.get_client().node_info()
 
         assert (
-            node_info["public_key"]
+            node_info["node_id"]
             == result["invoice"]["data"]["attrs"][3]["PayeePublicKey"]
         )
         parse_invoice = self.fiber1.get_client().parse_invoice(