update 203

.github/workflows/ci_integration_tests_docker.yml

@@ -0,0 +1,59 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: ci_integration_tests_docker
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04]
+
+       # os: [ubuntu-22.04, macos-latest]
+
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+
+    - name: Install dependencies
+      run: make prepare
+
+    - name: Run tests
+      run: make test
+      env:
+        DOCKER: true
+        DOCKER_CKB_VERSION: "nervos/ckb:v0.202.0-rc1"
+
+#
+#DOCKER = os.getenv('DOCKER',False)
+#DOCKER_CKB_VERSION = os.getenv('DOCKER_CKB_VERSION',"nervos/ckb:v0.202.0-rc1")
+#    - name: Setup upterm session
+#      if: always()
+#      uses: lhotari/action-upterm@v1
+
+    - name: Publish reports
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: jfoa-build-reports-${{ runner.os }}
+        path: ./report

.gitignore

@@ -4,3 +4,7 @@ tmp
 download
 pytest.ini
 reprot
+__pycache__
+pid.txt
+.idea
+venv

Makefile

@@ -11,6 +11,7 @@ prepare:
 	python3 -m download_ckb_light_client
 	echo "install ckb cli"
 	sh prepare.sh
+
 develop_prepare:
 	python3 -m venv venv
 	. venv/bin/activate
@@ -22,11 +23,10 @@ develop_prepare:
 	python3 -m download_ckb_light_client
 	echo "install ckb cli"
 	bash develop_prepare.sh
+#    test_cases/ckb2023 \
 
 test_cases := \
-    test_cases/replace_rpc \
     test_cases/ckb_cli \
-    test_cases/ckb2023 \
     test_cases/contracts \
     test_cases/example \
     test_cases/framework \

download.py

@@ -12,22 +12,10 @@
 from tqdm import tqdm
 
 versions = [
-    "0.109.0",
-    "0.110.2",
-    "0.111.0",
-    "0.112.1",
-    "0.113.1",
-    "0.114.0",
-    "0.115.0",
-    "0.116.1",
-    "0.117.0",
-    "0.118.0",
-    "0.119.0",
-    "0.120.0",
-    "0.121.0",
     "0.200.0",
     "0.201.0",
     "0.202.0",
+    "0.203.0-rc1",
 ]  # Replace with your versions
 
 DOWNLOAD_DIR = "download"

download_ckb_light_client.py

@@ -13,16 +13,8 @@
 
 
 versions = [
-    "0.2.4",
-    "0.3.0",
-    "0.3.1",
-    "0.3.2",
-    "0.3.3",
-    "0.3.4",
-    "0.3.5",
-    "0.3.6",
-    "0.4.1",
     "0.5.0",
+    "0.5.3",
 ]  # Replace with your versions
 
 DOWNLOAD_DIR = "download"

framework/basic.py

@@ -12,6 +12,8 @@
 import framework.test_cluster
 import framework.config
 import shutil
+
+from framework.test_node import DOCKER
 from framework.util import get_project_root
 
 
@@ -56,3 +58,7 @@ def teardown_method(self, method):
                 f"{get_project_root()}/tmp",
                 f"{get_project_root()}/report/{method.__name__}",
             )
+
+    @staticmethod
+    def skip_docker():
+        return DOCKER

framework/helper/ckb_cli.py

@@ -13,33 +13,6 @@
 cli_path = f"cd {get_project_root()}/source && ./ckb-cli"
 
 
-def exception_use_old_ckb():
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            try:
-                return func(*args, **kwargs)
-            except Exception as e:
-                if "SoftFork" in str(e):
-                    global cli_path
-                    cli_path = f"cd {get_project_root()}/source && ./ckb-cli-old"
-                    print("------ change use old ckb-cli -------")
-                    try:
-                        ret = func(*args, **kwargs)
-                        cli_path = f"cd {get_project_root()}/source && ./ckb-cli"
-                        return ret
-                    except Exception as e:
-                        cli_path = f"cd {get_project_root()}/source && ./ckb-cli"
-                        raise e
-                else:
-                    raise e
-
-        return wrapper
-
-    return decorator
-
-
-@exception_use_old_ckb()
 def wallet_get_capacity(ckb_address, api_url="http://127.0.0.1:8114"):
     """
     MacBook-Pro-4 0.111.0 % ./ckb-cli  wallet get-capacity
@@ -67,7 +40,6 @@ def wallet_get_capacity(ckb_address, api_url="http://127.0.0.1:8114"):
         Exception(f"Number not found :{capacity_response}")
 
 
-@exception_use_old_ckb()
 def wallet_get_live_cells(ckb_address, api_url="http://127.0.0.1:8114"):
     """
     ./ckb-cli wallet get-live-cells --address
@@ -132,7 +104,6 @@ def wallet_get_live_cells(ckb_address, api_url="http://127.0.0.1:8114"):
     return json.loads(run_command(cmd))
 
 
-@exception_use_old_ckb()
 def wallet_transfer_by_private_key(
     private_key,
     to_ckb_address,
@@ -642,6 +613,7 @@ def get_deploy_toml_config(account_private, contract_bin_path, enable_type_id):
 
 [[dep_groups]]
 name = "my_dep_group"
+enable_type_id = {str(enable_type_id).lower()}
 cells = []
 
 [lock]

framework/helper/contract.py

@@ -21,7 +21,6 @@ def get_arg_and_data(self, key) -> (str, str):
         pass
 
 
-@exception_use_old_ckb()
 def deploy_ckb_contract(
     private_key,
     contract_path,
@@ -79,7 +78,6 @@ def deploy_ckb_contract(
     return run_command(cmd).replace("\n", "")
 
 
-@exception_use_old_ckb()
 def get_ckb_contract_codehash(
     tx_hash, tx_index, enable_type_id=True, api_url="http://127.0.0.1:8114"
 ):
@@ -110,7 +108,6 @@ def get_ckb_contract_codehash(
     return f"0x{hex_digest}"
 
 
-@exception_use_old_ckb()
 def invoke_ckb_contract(
     account_private,
     contract_out_point_tx_hash,
@@ -260,7 +257,6 @@ def invoke_ckb_contract(
     return tx_send(tmp_tx_file, api_url).strip()
 
 
-@exception_use_old_ckb()
 def build_invoke_ckb_contract(
     account_private,
     contract_out_point_tx_hash,

framework/test_light_client.py

@@ -6,52 +6,14 @@
 
 
 class CkbLightClientConfigPath(Enum):
-    V0_2_4 = (
-        "source/template/ckb_light_client/0.2.4/testnet.toml.j2",
-        "download/0.2.4/ckb-light-client",
-    )
-    V0_3_0 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.0/ckb-light-client",
-    )
-    V0_3_1 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.1/ckb-light-client",
-    )
-    V0_3_2 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.2/ckb-light-client",
-    )
-    V0_3_3 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.3/ckb-light-client",
-    )
-    V0_3_4 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.4/ckb-light-client",
-    )
-    V0_3_5 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.5/ckb-light-client",
-    )
-    V0_3_6 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.3.6/ckb-light-client",
-    )
-
-    V0_4_1 = (
-        "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.4.2/ckb-light-client",
-    )
-
     V0_5_0 = (
         "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
         "download/0.5.0/ckb-light-client",
     )
 
     CURRENT_TEST = (
         "source/template/ckb_light_client/0.3.0/testnet.toml.j2",
-        "download/0.5.0/ckb-light-client",
+        "download/0.5.3/ckb-light-client",
     )
 
     def __init__(self, ckb_light_client_config_path, ckb_light_bin_path):