Merge pull request #56 from cryptape/x/tx_index

X/tx index

framework/config.py

@@ -47,9 +47,7 @@
 
 # contract
 ALWAYS_SUCCESS_CONTRACT_PATH = f"{get_project_root()}/source/contract/always_success"
-SPAWN_CONTRACT_PATH = (
-    f"{get_project_root()}/source/contract/spawn_peak_memory_2m_to_32m"
-)
+SPAWN_CONTRACT_PATH = f"{get_project_root()}/source/contract/test_cases/spawn_demo"
 
 
 def get_tmp_path():

prepare.sh

@@ -1,4 +1,10 @@
 set -e
+# git clone https://github.com/nervosnetwork/ckb-cli.git
+# cd ckb-cli
+# git checkout pkg/v1.7.0
+# make prod
+# cp target/release/ckb-cli ../source/ckb-cli
+# cd ../
 cp download/0.110.2/ckb-cli ./source/ckb-cli-old
 cp download/0.117.0/ckb-cli ./source/ckb-cli
 #git clone https://github.com/quake/ckb-light-client.git

test_cases/ckb2023/test_01_before_hardfork.py

@@ -178,7 +178,7 @@ def test_06_0050_invoke_spawn_use_type(self):
         """
         Before the fork, send a transaction contains spawn , use  script:type invoke it. will return error
         1. invoke spawn contrat
-        - return error: InvalidEcall(2101)
+        - return error: InvalidEcall(2603)
         :return:
         """
 
@@ -200,7 +200,7 @@ def test_06_0050_invoke_spawn_use_type(self):
                 api_url=self.cluster.ckb_nodes[0].getClient().url,
             )
             print("tx hash :", tx_hash)
-        expected_error_message = "InvalidEcall(2101)"
+        expected_error_message = "InvalidEcall(2603)"
         assert expected_error_message in exc_info.value.args[0], (
             f"Expected substring '{expected_error_message}' "
             f"not found in actual string '{exc_info.value.args[0]}'"

test_cases/ckb2023/test_02_after_hardfork.py

@@ -240,10 +240,10 @@ def test_07_0050_spawn_use_data2(self):
     def test_08_0050_spawn_use_data1(self):
         """
         After a period of hard fork,send spawn tx by data1 .
-            - return Error: InvalidEcall(2101)
+            - return Error: InvalidEcall(2603)
 
         1. send tx contains spawn opcode use data1
-            - return Error: InvalidEcall(2101)
+            - return Error: InvalidEcall(2603)
         :return:
         """
 
@@ -260,7 +260,7 @@ def test_08_0050_spawn_use_data1(self):
                 invoke_data,
                 api_url=self.cluster.ckb_nodes[0].getClient().url,
             )
-        expected_error_message = "InvalidEcall(2101)"
+        expected_error_message = "InvalidEcall(2603)"
         assert (
             expected_error_message in exc_info.value.args[0]
         ), f"Expected substring '{expected_error_message}' not found in actual string '{exc_info.value.args[0]}'"
@@ -271,7 +271,7 @@ def test_09_0050_spawn_use_data(self):
             - return Error: InvalidInstruction
 
         1. send tx contains spawn opcode use data
-            - return Error: InvalidEcall(2101)
+            - return Error: MemWriteOnExecutablePage
         :return:
         """
 
@@ -288,7 +288,7 @@ def test_09_0050_spawn_use_data(self):
                 invoke_data,
                 api_url=self.cluster.ckb_nodes[0].getClient().url,
             )
-        expected_error_message = "InvalidInstruction"
+        expected_error_message = "MemWriteOnExecutablePage"
         assert (
             expected_error_message in exc_info.value.args[0]
         ), f"Expected substring '{expected_error_message}' not found in actual string '{exc_info.value.args[0]}'"

test_cases/ckb2023/test_03_ckb_light_client_after_hardfork.py

@@ -261,6 +261,7 @@ def test_04_ckb_light_client_current_transfer_data2_tx(self):
         )
         assert tx_hash == light_tx_hash
 
+    @pytest.mark.skip
     def test_05_ckb_light_client_current_spawn_contract_use_data2(self):
         """
         send spawn tx ( hash type : data2), on the ckb light client
@@ -317,6 +318,7 @@ def test_05_ckb_light_client_current_spawn_contract_use_data2(self):
 
         assert tx_hash == light_tx_hash
 
+    @pytest.mark.skip
     def test_05_ckb_light_client_current_spawn_contract_use_type(self):
         """
         1. send spawn tx ( hash type : type), on the ckb light client

test_cases/ckb_cli/test_sync_state_by_ckbcli.py

@@ -1,3 +1,5 @@
+import pytest
+
 from framework.basic import CkbTest
 
 
@@ -32,6 +34,7 @@ def teardown_class(cls):
         cls.node.stop()
         cls.node.clean()
 
+    @pytest.mark.skip
     def test_01_sync_state(self):
         """
         #1.The assume_valid_target specified by ckb, if no assume_valid_target, this will be all zero.

test_cases/contracts/test_01_contract.py

@@ -1,8 +1,6 @@
-import json
 import os
 import time
 
-import pytest
 from parameterized import parameterized
 
 from framework.basic import CkbTest
@@ -21,12 +19,16 @@ def get_all_files(directory):
 def get_successful_files():
     files = get_all_files(f"{get_project_root()}/source/contract/test_cases")
     files_list = [
-        "spawn_exceeded_max_content_length",
+        "spawn_cycle_inc_when_contains_recursion_and_loop_spawn",
+        "spawn_source_is_input_cell",
+        "spawn_loop_times",
+        "spawn_source_is_output_cell",
+        "spawn_recursion_times",
+        "ckb_pipe",
+        "spawn_argc_is_large",
+        "spawn_place_is_witness",
         "loop_contract",
-        "spawn_exec_memory_limit_le_7",
-        "spawn_argc_not_eq",
-        "spawn_argc_is_u64_max",
-        "spawn_out_of_memory",
+        "exec_with_block_opcode",
     ]
     return [s for s in files if not any(s.endswith(suffix) for suffix in files_list)]
 
@@ -36,12 +38,16 @@ def get_failed_files():
     files = get_all_files(f"{get_project_root()}/source/contract/test_cases")
 
     files_list = [
-        "spawn_exceeded_max_content_length",
+        "spawn_cycle_inc_when_contains_recursion_and_loop_spawn",
+        "spawn_source_is_input_cell",
+        "spawn_loop_times",
+        "spawn_source_is_output_cell",
+        "spawn_recursion_times",
+        "ckb_pipe",
+        "spawn_argc_is_large",
+        "spawn_place_is_witness",
         "loop_contract",
-        "spawn_exec_memory_limit_le_7",
-        "spawn_argc_not_eq",
-        "spawn_argc_is_u64_max",
-        "spawn_out_of_memory",
+        "exec_with_block_opcode",
     ]
     # return [s for s in files if not any(s.endswith(suffix) for suffix in files_list)]
     return [f"{project_root}/source/contract/test_cases/{x}" for x in files_list]
@@ -87,69 +93,6 @@ def test_02_deploy_and_invoke_demo_failed(self, path):
         except Exception as e:
             print(e)
 
-    def test_03_stack_overflow(self):
-        """
-        contract link:
-        https://github.com/gpBlockchain/ckb-test-contracts/blob/main/rust/acceptance-contracts/contracts/spawn_demo/src/spawn_recursive.rs
-        :return:
-        """
-        self.deploy_and_invoke(
-            self.Config.MINER_PRIVATE_1,
-            f"{get_project_root()}/source/contract/test_cases/spawn_recursive",
-            self.node,
-        )
-
-    # @pytest.mark.skip
-    def test_04_estimate_cycles_bug(self):
-        """
-        https://github.com/gpBlockchain/ckb-test-contracts/blob/main/rust/acceptance-contracts/contracts/spawn_demo/src/spawn_times.rs
-        send_transaction( big cycle tx )
-            return tx;
-        query tx status
-            return tx_status == rejected
-        if status == pending ,is  bug
-        query estimate_cycles
-            return : ExceededMaximumCycles
-            if return cycles > 1045122714,is bug
-        :return:
-        """
-        deploy_hash = self.Contract.deploy_ckb_contract(
-            self.Config.MINER_PRIVATE_1,
-            f"{get_project_root()}/source/contract/test_cases/spawn_times",
-            enable_type_id=True,
-            api_url=self.node.getClient().url,
-        )
-        self.Miner.miner_until_tx_committed(self.node, deploy_hash)
-        for i in range(1, 10):
-            invoke_hash = self.Contract.invoke_ckb_contract(
-                account_private=self.Config.MINER_PRIVATE_1,
-                contract_out_point_tx_hash=deploy_hash,
-                contract_out_point_tx_index=0,
-                type_script_arg="0x02",
-                data=f"0x{i:02x}",
-                hash_type="type",
-                api_url=self.node.getClient().url,
-            )
-            time.sleep(5)
-            transaction = self.node.getClient().get_transaction(invoke_hash)
-            # if transaction["tx_status"]['status'] == ""
-            if transaction["tx_status"]["status"] == "rejected":
-                continue
-            if transaction["tx_status"]["status"] == "pending":
-                # bug
-                # es cycle
-                del transaction["transaction"]["hash"]
-                with open("./tmp.json", "w") as tmp_file:
-                    tmp_file.write(json.dumps(transaction["transaction"]))
-                for i in range(5):
-                    try:
-                        result = self.Ckb_cli.estimate_cycles(
-                            "./tmp.json", api_url=self.node.getClient().url
-                        )
-                        print(f"estimate_cycles:{result}")
-                    except Exception:
-                        pass
-
     def deploy_and_invoke(self, account, path, node, try_count=5):
         if try_count < 0:
             raise Exception("try out of times")

test_cases/feature/test_get_transaction.py

@@ -0,0 +1,62 @@
+from framework.basic import CkbTest
+import pytest
+
+
+class TestGetTransaction(CkbTest):
+
+    @classmethod
+    def setup_class(cls):
+        """
+        1. start 1 ckb node in tmp/get_transaction/node1 node dir
+        2. miner 100block
+        Returns:
+
+        """
+        # 1. start 1 ckb node in tmp/get_transaction/node1 node dir
+        cls.node = cls.CkbNode.init_dev_by_port(
+            cls.CkbNodeConfigPath.develop, "get_transaction/node1", 8120, 8225
+        )
+        cls.node.prepare(other_ckb_config={"ckb_tx_pool_max_tx_pool_size": "180_000"})
+        cls.node.start()
+        # 2. miner 100 block
+        cls.Miner.make_tip_height_number(cls.node, 100)
+
+    @classmethod
+    def teardown_class(cls):
+        """
+        1. stop ckb node
+        2. clean ckb node  tmp dir
+        Returns:
+
+        """
+        cls.node.stop()
+        cls.node.clean()
+
+    # @pytest.mark.skip("util v118 rc")
+    def test_get_transaction_by_tx_index(self):
+        """
+        1. new tx in block
+        2. query tx index is null
+        3. miner block until tx committed， query tx index is 0x1
+        Returns:
+
+        """
+        # 1. new tx in block
+        account = self.Ckb_cli.util_key_info_by_private_key(self.Config.MINER_PRIVATE_1)
+        tx_hash = self.Ckb_cli.wallet_transfer_by_private_key(
+            self.Config.MINER_PRIVATE_1,
+            account["address"]["testnet"],
+            100,
+            self.node.getClient().url,
+            "1500",
+        )
+        print(f"txHash:{tx_hash}")
+        # 2. query tx index is null
+        transaction1 = self.node.getClient().get_transaction(tx_hash)
+        print(f"tx_index:{transaction1['tx_status']['tx_index']}")
+        assert transaction1["tx_status"]["tx_index"] is None
+        # 3. miner block until tx committed， query tx index is 0x1
+        self.Miner.miner_until_tx_committed(self.node, tx_hash)
+        transaction2 = self.node.getClient().get_transaction(tx_hash)
+        print(f"after miner tx_hash, tx_index:{transaction2['tx_status']['tx_index']}")
+        assert transaction2["tx_status"]["tx_index"] == "0x1"

test_cases/node_compatible/test_before_ckb2023_hardfork.py

@@ -119,9 +119,9 @@ def test_03_transfer(self, version, node):
     def test_04_spawn_tx(self, version, node):
         """
         1. send spawn tx by data1 .
-        - return Error: InvalidEcall(2101)
+        - return Error: InvalidEcall(2603)
         2.  send spawn tx by type .
-        - return Error: InvalidEcall(2101)
+        - return Error: InvalidEcall(2603)
         :param version:
         :param node:
         :return:
@@ -140,7 +140,7 @@ def test_04_spawn_tx(self, version, node):
                 invoke_data,
                 api_url=node.getClient().url,
             )
-        expected_error_message = "InvalidEcall(2101)"
+        expected_error_message = "InvalidEcall(2603)"
         assert (
             expected_error_message in exc_info.value.args[0]
         ), f"Expected substring '{expected_error_message}' not found in actual string '{exc_info.value.args[0]}'"
@@ -156,7 +156,7 @@ def test_04_spawn_tx(self, version, node):
                 invoke_data,
                 api_url=node.getClient().url,
             )
-        expected_error_message = "InvalidEcall(2101)"
+        expected_error_message = "InvalidEcall(2603)"
         assert (
             expected_error_message in exc_info.value.args[0]
         ), f"Expected substring '{expected_error_message}' not found in actual string '{exc_info.value.args[0]}'"