fasten test

integration_tests/configs/upgrade-test-package.nix

@@ -13,5 +13,6 @@ let
 in
 pkgs.linkFarm "upgrade-test-package" [
   { name = "genesis"; path = released; }
-  { name = "v1.1.0"; path = current; }
+  # { name = "v1.1.0"; path = current; }
+  { name = "v1.1.0"; path = "/opt/homebrew/Cellar/go/1.21.1/libexec/"; }
 ]

integration_tests/configs/upgrade-testnet-test-package.nix

@@ -13,5 +13,6 @@ let
 in
 pkgs.linkFarm "upgrade-test-package" [
   { name = "genesis"; path = released; }
-  { name = "v1.1.0-testnet"; path = current; }
+  # { name = "v1.1.0-testnet"; path = current; }
+  { name = "v1.1.0-testnet"; path = "/opt/homebrew/Cellar/go/1.21.1/libexec/"; }
 ]

integration_tests/test_upgrade.py

@@ -1,32 +1,237 @@
+import json
 import subprocess
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from contextlib import contextmanager
+from datetime import datetime, timedelta
 from pathlib import Path
 
 import pytest
+from pystarport import ports
+from pystarport.cluster import SUPERVISOR_CONFIG_FILE
 
 from .network import Cronos, setup_custom_cronos
-from .upgrade_utils import exec, post_init
+from .utils import (
+    ADDRS,
+    CONTRACTS,
+    approve_proposal,
+    deploy_contract,
+    edit_ini_sections,
+    get_consensus_params,
+    get_send_enable,
+    send_transaction,
+    wait_for_block,
+    wait_for_new_blocks,
+    wait_for_port,
+)
 
 
 @pytest.fixture(scope="module")
-def custom_cronos(tmp_path_factory):
+def testnet(tmp_path_factory):
+    yield from setup_cronos_test(tmp_path_factory)
+
+
+@pytest.fixture(scope="module")
+def mainnet(tmp_path_factory):
+    yield from setup_cronos_test(tmp_path_factory, False)
+
+
+def init_cosmovisor(home):
+    """
+    build and setup cosmovisor directory structure in each node's home directory
+    """
+    cosmovisor = home / "cosmovisor"
+    cosmovisor.mkdir()
+    (cosmovisor / "upgrades").symlink_to("../../../upgrades")
+    (cosmovisor / "genesis").symlink_to("./upgrades/genesis")
+
+
+def post_init(path, base_port, config):
+    """
+    prepare cosmovisor for each node
+    """
+    chain_id = "cronos_777-1"
+    data = path / chain_id
+    cfg = json.loads((data / "config.json").read_text())
+    for i, _ in enumerate(cfg["validators"]):
+        home = data / f"node{i}"
+        init_cosmovisor(home)
+
+    edit_ini_sections(
+        chain_id,
+        data / SUPERVISOR_CONFIG_FILE,
+        lambda i, _: {
+            "command": f"cosmovisor start --home %(here)s/node{i}",
+            "environment": f"DAEMON_NAME=cronosd,DAEMON_HOME=%(here)s/node{i}",
+        },
+    )
+
+
+def setup_cronos_test(tmp_path_factory, testnet=True):
     path = tmp_path_factory.mktemp("upgrade")
+    port = 26100 if testnet else 26200
+    nix_name = "upgrade-testnet-test-package" if testnet else "upgrade-test-package"
+    cfg_name = "cosmovisor_testnet" if testnet else "cosmovisor"
     cmd = [
         "nix-build",
-        Path(__file__).parent / "configs/upgrade-test-package.nix",
+        Path(__file__).parent / f"configs/{nix_name}.nix",
         "-o",
         path / "upgrades",
     ]
     print(*cmd)
     subprocess.run(cmd, check=True)
     # init with genesis binary
-    yield from setup_custom_cronos(
+    with contextmanager(setup_custom_cronos)(
         path,
-        26100,
-        Path(__file__).parent / "configs/cosmovisor.jsonnet",
+        port,
+        Path(__file__).parent / f"configs/{cfg_name}.jsonnet",
         post_init=post_init,
         chain_binary=str(path / "upgrades/genesis/bin/cronosd"),
+    ) as cronos:
+        yield cronos
+
+
+def exec(c, tmp_path_factory, testnet=True):
+    """
+    - propose an upgrade and pass it
+    - wait for it to happen
+    - it should work transparently
+    """
+    cli = c.cosmos_cli()
+    port = ports.api_port(c.base_port(0))
+    send_enable = [
+        {"denom": "basetcro", "enabled": False},
+        {"denom": "stake", "enabled": True},
+    ]
+    p = cli.query_bank_send() if testnet else get_send_enable(port)
+    assert sorted(p, key=lambda x: x["denom"]) == send_enable
+
+    # export genesis from old version
+    c.supervisorctl("stop", "all")
+    migrate = tmp_path_factory.mktemp("migrate")
+    file_path0 = Path(migrate / "old.json")
+    with open(file_path0, "w") as fp:
+        json.dump(json.loads(cli.export()), fp)
+        fp.flush()
+
+    c.supervisorctl("start", "cronos_777-1-node0", "cronos_777-1-node1")
+    wait_for_port(ports.evmrpc_port(c.base_port(0)))
+    wait_for_new_blocks(cli, 1)
+
+    height = cli.block_height()
+    target_height = height + 15
+    print("upgrade height", target_height)
+
+    w3 = c.w3
+    contract = deploy_contract(w3, CONTRACTS["TestERC20A"])
+    old_height = w3.eth.block_number
+    old_balance = w3.eth.get_balance(ADDRS["validator"], block_identifier=old_height)
+    old_base_fee = w3.eth.get_block(old_height).baseFeePerGas
+    old_erc20_balance = contract.caller(block_identifier=old_height).balanceOf(
+        ADDRS["validator"]
+    )
+    print("old values", old_height, old_balance, old_base_fee)
+
+    plan_name = "v1.1.0-testnet" if testnet else "v1.1.0"
+    rsp = cli.gov_propose_legacy(
+        "community",
+        "software-upgrade",
+        {
+            "name": plan_name,
+            "title": "upgrade test",
+            "description": "ditto",
+            "upgrade-height": target_height,
+            "deposit": "10000basetcro",
+        },
+        mode=None if testnet else "block",
+    )
+    assert rsp["code"] == 0, rsp["raw_log"]
+    event_query_tx = not testnet
+    approve_proposal(c, rsp, event_query_tx)
+
+    # update cli chain binary
+    c.chain_binary = (
+        Path(c.chain_binary).parent.parent.parent / f"{plan_name}/bin/cronosd"
+    )
+    cli = c.cosmos_cli()
+
+    # block should pass the target height
+    wait_for_block(cli, target_height + 2, timeout=480)
+    wait_for_port(ports.rpc_port(c.base_port(0)))
+
+    # test migrate keystore
+    cli.migrate_keystore()
+
+    # check basic tx works
+    wait_for_port(ports.evmrpc_port(c.base_port(0)))
+    receipt = send_transaction(
+        c.w3,
+        {
+            "to": ADDRS["community"],
+            "value": 1000,
+            "maxFeePerGas": 1000000000000,
+            "maxPriorityFeePerGas": 10000,
+        },
+    )
+    assert receipt.status == 1
+
+    # query json-rpc on older blocks should success
+    assert old_balance == w3.eth.get_balance(
+        ADDRS["validator"], block_identifier=old_height
+    )
+    assert old_base_fee == w3.eth.get_block(old_height).baseFeePerGas
+
+    # check eth_call works on older blocks
+    assert old_erc20_balance == contract.caller(block_identifier=old_height).balanceOf(
+        ADDRS["validator"]
     )
+    # check consensus params
+    port = ports.rpc_port(c.base_port(0))
+    res = get_consensus_params(port, w3.eth.get_block_number())
+    assert res["block"]["max_gas"] == "60000000"
+
+    # check bank send enable
+    p = cli.query_bank_send()
+    assert sorted(p, key=lambda x: x["denom"]) == send_enable
+
+    rsp = cli.query_params("icaauth")
+    assert rsp["params"]["min_timeout_duration"] == "3600s", rsp
+    max_callback_gas = cli.query_params()["max_callback_gas"]
+    assert max_callback_gas == "50000", max_callback_gas
+    if not testnet:
+        # migrate to sdk v0.47
+        c.supervisorctl("stop", "all")
+        sdk_version = "v0.47"
+        file_path1 = Path(migrate / f"{sdk_version}.json")
+        with open(file_path1, "w") as fp:
+            json.dump(cli.migrate_sdk_genesis(sdk_version, str(file_path0)), fp)
+            fp.flush()
+        # migrate to cronos v1.0.x
+        cronos_version = "v1.0"
+        file_path0 = Path(migrate / f"{cronos_version}.json")
+        with open(file_path0, "w") as fp:
+            json.dump(cli.migrate_cronos_genesis(cronos_version, str(file_path1)), fp)
+            fp.flush()
+        print(cli.validate_genesis(str(file_path0)))
+
+    # update the genesis time = current time + 5 secs
+    newtime = datetime.utcnow() + timedelta(seconds=5)
+    newtime = newtime.replace(tzinfo=None).isoformat("T") + "Z"
+    config = c.config
+    config["genesis-time"] = newtime
+    for i, _ in enumerate(config["validators"]):
+        genesis = json.load(open(file_path0))
+        genesis["genesis_time"] = config.get("genesis-time")
+        file = c.cosmos_cli(i).data_dir / "config/genesis.json"
+        file.write_text(json.dumps(genesis))
+    c.supervisorctl("start", "cronos_777-1-node0", "cronos_777-1-node1")
+    wait_for_new_blocks(c.cosmos_cli(), 1)
+    c.supervisorctl("stop", "all")
 
 
-def test_cosmovisor_upgrade(custom_cronos: Cronos, tmp_path_factory):
-    exec(custom_cronos, tmp_path_factory, False)
+def test_cosmovisor_upgrade(testnet: Cronos, mainnet: Cronos, tmp_path_factory):
+    providers = [testnet, mainnet]
+    path = tmp_path_factory
+    with ThreadPoolExecutor(len(providers)) as executor:
+        as_completed(
+            [executor.submit(exec, net, path, net == testnet) for net in providers]
+        )