Merge pull request #87 from sunchengzhu/main

add cases for ckb-cli 1.13.0

Author: sunchengzhu

framework/helper/ckb_cli.py

@@ -174,7 +174,11 @@ def version():
     :return:
     """
     cmd = "{ckb_cli} --version".format(ckb_cli=cli_path)
-    return run_command(cmd)
+    output = run_command(cmd)
+    print("\n=============== CKB-CLI Version ===============")
+    print(output.strip())
+    print("===============================================\n")
+    return output
 
 
 def deploy_gen_txs(
@@ -1082,3 +1086,29 @@ def clear_tx_verify_queue(
 
     cmd = f"export API_URL={api_url} && {cli_path} {cmd}"
     return json.loads(run_command(cmd))
+
+
+def get_transaction(
+    hash_value,
+    raw_data=False,
+    no_color=False,
+    debug=False,
+    local_only=False,
+    api_url="http://127.0.0.1:8114",
+):
+    cmd = "rpc get_transaction"
+    if raw_data:
+        cmd += " --raw-data"
+    if no_color:
+        cmd += " --no-color"
+    if debug:
+        cmd += " --debug"
+    if local_only:
+        cmd += " --local-only"
+    cmd += f" --hash {hash_value}"
+    cmd += f" --output-format yaml"
+
+    cmd = f"export API_URL={api_url} && {cli_path} {cmd}"
+    yaml_data = yaml.safe_dump(yaml.safe_load(run_command(cmd)))
+    parsed_data = yaml.safe_load(yaml_data)
+    return parsed_data

framework/test_node.py

@@ -268,6 +268,13 @@ def restart(self, config={}, clean_data=False):
         self.start()
 
     def start(self):
+        version = run_command(
+            "cd {ckb_dir} && ./ckb --version".format(ckb_dir=self.ckb_dir)
+        )
+        print("\n================= CKB Version =================")
+        print(version.strip())
+        print("===============================================\n")
+
         self.ckb_pid = run_command(
             "cd {ckb_dir} && ./ckb run --indexer  --skip-spec-check > node.log 2>&1 &".format(
                 ckb_dir=self.ckb_dir

test_cases/ckb_cli/test_ckbcli_bugfix_200.py

@@ -0,0 +1,131 @@
+import json
+
+from framework.basic import CkbTest
+from framework.rpc import RPCClient
+
+
+class TestCkbCliRpc200(CkbTest):
+    @classmethod
+    def setup_class(cls):
+        """
+        1. start 1 ckb node in tmp/ckb_cli/node dir
+        2. miner 2 block
+        Returns:
+
+        """
+        # 1. start 1 ckb node in tmp/ckb_cli/node dir
+        cls.node = cls.CkbNode.init_dev_by_port(
+            cls.CkbNodeConfigPath.CURRENT_TEST, "ckb_cli/node", 8314, 8315
+        )
+        cls.node.prepare()
+        cls.node.start()
+        # 2. miner 2 block
+        cls.Miner.make_tip_height_number(cls.node, 2)
+
+    @classmethod
+    def teardown_class(cls):
+        """
+        1. stop ckb node
+        2. clean ckb node tmp dir
+        Returns:
+
+        """
+        print("stop node and clean")
+        cls.node.stop()
+        cls.node.clean()
+
+    def test_01_get_transaction(self):
+        """
+        1.use ckb-cli to get transaction by its hash
+        2.use rpc to get transaction by its hash
+        3.compare ckb-cli fee == rpc fee
+        Returns:
+
+        """
+        self.Ckb_cli.version()
+
+        # 1. generate account and build normal tx
+        account = self.Ckb_cli.util_key_info_by_private_key(
+            self.Config.ACCOUNT_PRIVATE_1
+        )
+        father_tx_hash = self.Ckb_cli.wallet_transfer_by_private_key(
+            self.Config.ACCOUNT_PRIVATE_1,
+            account["address"]["testnet"],
+            100000,
+            self.node.getClient().url,
+            "1500000",
+        )
+
+        tx = self.Tx.build_send_transfer_self_tx_with_input(
+            [father_tx_hash],
+            ["0x0"],
+            self.Config.ACCOUNT_PRIVATE_1,
+            output_count=15,
+            fee=15000,
+            api_url=self.node.getClient().url,
+        )
+        # 2. send the normal tx
+        tx_hash = self.node.getClient().send_transaction(tx)
+
+        tx_info = self.Ckb_cli.get_transaction(
+            tx_hash, api_url=self.node.getClient().url
+        )
+
+        print("\n=========== Transaction Information ===========")
+        print("Fee:                ", tx_info.get("fee"))
+        print("Min Replace Fee:    ", tx_info.get("min_replace_fee"))
+        print("Time Added to Pool: ", tx_info.get("time_added_to_pool"))
+        print("===============================================\n")
+
+        rpc_tx_info = self.node.getClient().get_transaction(tx_hash)
+        fee_int = int(rpc_tx_info.get("fee", "0x0"), 16)
+        min_replace_fee_int = int(rpc_tx_info.get("min_replace_fee", "0x0"), 16)
+
+        fee = f"{fee_int / 100_000_000:.8f}".rstrip("0").rstrip(".")
+        min_replace_fee = f"{min_replace_fee_int / 100_000_000:.8f}".rstrip("0").rstrip(
+            "."
+        )
+        time_added_to_pool = int(rpc_tx_info.get("time_added_to_pool", "0x0"), 16)
+
+        assert tx_info.get("fee") == fee
+        assert tx_info.get("min_replace_fee") == min_replace_fee
+        assert tx_info.get("time_added_to_pool") == time_added_to_pool
+
+        self.Miner.miner_until_tx_committed(self.node, tx_hash, 1000)
+
+    def test_02_tx_add_input_skip_check(self):
+        tmp_tx_file = "/tmp/skip_check.json"
+        # joyid lock script
+        address = "ckt1qrfrwcdnvssswdwpn3s9v8fp87emat306ctjwsm3nmlkjg8qyza2cqgqq9cd7mgucy3fgs6et4j7cc2w6lsuulajhy3k08sj"
+        # 1. generate account and build normal tx
+        tx_hash = self.Ckb_cli.wallet_transfer_by_private_key(
+            self.Config.ACCOUNT_PRIVATE_1,
+            address,
+            100000,
+            self.node.getClient().url,
+            "1500000",
+        )
+
+        tx = self.Ckb_cli.get_transaction(tx_hash, api_url=self.node.getClient().url)
+        code_hash_int = tx["transaction"]["outputs"][0]["lock"]["code_hash"]
+        code_hash = hex(code_hash_int)
+        assert (
+            code_hash
+            == "0xd23761b364210735c19c60561d213fb3beae2fd6172743719eff6920e020baac"
+        )
+
+        self.Ckb_cli.tx_init(tmp_tx_file, self.node.getClient().url)
+        self.Ckb_cli.tx_add_input(tx_hash, 0, tmp_tx_file, self.node.getClient().url)
+
+        with open(tmp_tx_file, "r") as f:
+            data = json.load(f)
+
+        inputs = data.get("transaction", {}).get("inputs", [])
+        if inputs:
+            previous_output = inputs[0].get("previous_output", {})
+            print("previous_output.tx_hash:", previous_output.get("tx_hash"))
+            print("previous_output.index:", previous_output.get("index"))
+            assert previous_output.get("tx_hash") == tx_hash
+            assert previous_output.get("index") == "0x0"
+        else:
+            assert False, "No inputs found in the tx_file."