test fixdata

Author: mmsqe

integration_tests/configs/cosmovisor_recent.jsonnet

@@ -0,0 +1,34 @@
+local config = import 'default.jsonnet';
+
+config {
+  'cronos_777-1'+: {
+    'app-config'+: {
+      'app-db-backend': 'rocksdb',
+      'iavl-lazy-loading':: super['iavl-lazy-loading'],
+    },
+    validators: [super.validators[0] {
+      'app-config'+: {
+        store: {
+          streamers: ['versiondb'],
+        },
+        memiavl:: super.memiavl,
+        versiondb:: super.versiondb,
+      },
+    }] + super.validators[1:],
+    genesis+: {
+      consensus_params: {
+        block: {
+          max_bytes: '1048576',
+          max_gas: '81500000',
+        },
+      },
+      app_state+: {
+        gov+: {
+          params+: {
+            expedited_voting_period:: super['expedited_voting_period'],
+          },
+        },
+      },
+    },
+  },
+}

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

@@ -0,0 +1,33 @@
+let
+  pkgs = import ../../nix { };
+  fetchFlake =
+    repo: rev:
+    (pkgs.flake-compat {
+      src = {
+        outPath = builtins.fetchTarball "https://github.com/${repo}/archive/${rev}.tar.gz";
+        inherit rev;
+        shortRev = builtins.substring 0 7 rev;
+      };
+    }).defaultNix;
+  # release/v1.1.0
+  releasedGenesis =
+    (fetchFlake "crypto-org-chain/cronos" "526bc803c2f43fd4aadc05a4e16936c3c8e81f29").default;
+  # v1.2.2 with skip flush
+  released_1 =
+    (fetchFlake "mmsqe/cronos" "bd9eaa1cbb535b407061e94488d325263edf0bfa").default;
+  current = pkgs.callPackage ../../. { };
+in
+pkgs.linkFarm "upgrade-test-package" [
+  {
+    name = "genesis";
+    path = releasedGenesis;
+  }
+  {
+    name = "v1.2";
+    path = released_1;
+  }
+  {
+    name = "v1.3";
+    path = current;
+  }
+]

integration_tests/cosmoscli.py

@@ -1794,6 +1794,11 @@ def changeset_ingest_versiondb_sst(self, versiondb_dir, sst_dir, **kwargs):
             **kwargs,
         ).decode()
 
+    def changeset_fixdata(self, versiondb_dir, dry_run=False):
+        return self.raw(
+            "changeset", "fixdata", versiondb_dir, "--dry-run" if dry_run else None
+        )
+
     def restore_versiondb(self, height, format=3, **kwargs):
         return self.raw(
             "changeset",

integration_tests/network.py

@@ -1,7 +1,10 @@
 import json
 import os
+import shutil
 import signal
+import stat
 import subprocess
+from contextlib import contextmanager
 from pathlib import Path
 
 import tomlkit
@@ -10,7 +13,7 @@
 from web3.middleware import geth_poa_middleware
 
 from .cosmoscli import CosmosCLI
-from .utils import supervisorctl, wait_for_port
+from .utils import post_init, supervisorctl, wait_for_port
 
 
 class Cronos:
@@ -191,3 +194,32 @@ def setup_custom_cronos(
         os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
         # proc.terminate()
         proc.wait()
+
+
+def setup_upgrade_cronos(tmp_path_factory, port, nix_name, cfg_name):
+    path = tmp_path_factory.mktemp("upgrade")
+    configdir = Path(__file__).parent
+    cmd = [
+        "nix-build",
+        configdir / f"configs/{nix_name}.nix",
+    ]
+    print(*cmd)
+    subprocess.run(cmd, check=True)
+
+    # copy the content so the new directory is writable.
+    upgrades = path / "upgrades"
+    shutil.copytree("./result", upgrades)
+    mod = stat.S_IRWXU
+    upgrades.chmod(mod)
+    for d in upgrades.iterdir():
+        d.chmod(mod)
+
+    # init with genesis binary
+    with contextmanager(setup_custom_cronos)(
+        path,
+        port,
+        configdir / f"configs/{cfg_name}.jsonnet",
+        post_init=post_init,
+        chain_binary=str(upgrades / "genesis/bin/cronosd"),
+    ) as cronos:
+        yield cronos

integration_tests/test_upgrade.py

@@ -1,24 +1,18 @@
 import json
-import shutil
-import stat
-import subprocess
-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 .cosmoscli import DEFAULT_GAS_PRICE
-from .network import Cronos, setup_custom_cronos
+from .network import Cronos, setup_upgrade_cronos
 from .utils import (
     ADDRS,
     CONTRACTS,
     KEYS,
     approve_proposal,
     deploy_contract,
-    edit_ini_sections,
     get_consensus_params,
     get_send_enable,
     send_transaction,
@@ -33,75 +27,10 @@
 
 @pytest.fixture(scope="module")
 def custom_cronos(tmp_path_factory):
-    yield from setup_cronos_test(tmp_path_factory)
-
-
-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 run start --home %(here)s/node{i}",
-            "environment": (
-                "DAEMON_NAME=cronosd,"
-                "DAEMON_SHUTDOWN_GRACE=1m,"
-                "UNSAFE_SKIP_BACKUP=true,"
-                f"DAEMON_HOME=%(here)s/node{i}"
-            ),
-        },
-    )
-
-
-def setup_cronos_test(tmp_path_factory):
-    path = tmp_path_factory.mktemp("upgrade")
     port = 26200
     nix_name = "upgrade-test-package"
     cfg_name = "cosmovisor"
-    configdir = Path(__file__).parent
-    cmd = [
-        "nix-build",
-        configdir / f"configs/{nix_name}.nix",
-    ]
-    print(*cmd)
-    subprocess.run(cmd, check=True)
-
-    # copy the content so the new directory is writable.
-    upgrades = path / "upgrades"
-    shutil.copytree("./result", upgrades)
-    mod = stat.S_IRWXU
-    upgrades.chmod(mod)
-    for d in upgrades.iterdir():
-        d.chmod(mod)
-
-    # init with genesis binary
-    with contextmanager(setup_custom_cronos)(
-        path,
-        port,
-        configdir / f"configs/{cfg_name}.jsonnet",
-        post_init=post_init,
-        chain_binary=str(upgrades / "genesis/bin/cronosd"),
-    ) as cronos:
-        yield cronos
+    yield from setup_upgrade_cronos(tmp_path_factory, port, nix_name, cfg_name)
 
 
 def exec(c, tmp_path_factory):

integration_tests/test_upgrade_recent.py

@@ -0,0 +1,85 @@
+import time
+
+import pytest
+import requests
+from pystarport import ports
+
+from .network import setup_upgrade_cronos
+from .utils import (
+    ADDRS,
+    CONTRACTS,
+    KEYS,
+    deploy_contract,
+    do_upgrade,
+    sign_transaction,
+    wait_for_new_blocks,
+    wait_for_port,
+)
+
+pytestmark = pytest.mark.upgrade
+
+
+@pytest.fixture(scope="module")
+def custom_cronos(tmp_path_factory):
+    port = 27100
+    nix_name = "upgrade-test-package-recent"
+    cfg_name = "cosmovisor_recent"
+    yield from setup_upgrade_cronos(tmp_path_factory, port, nix_name, cfg_name)
+
+
+def test_cosmovisor_upgrade(custom_cronos):
+    c = custom_cronos
+    do_upgrade(c, "v1.2", c.cosmos_cli().block_height() + 15)
+    wait_for_port(ports.evmrpc_port(c.base_port(1)))
+    w3 = c.node_w3(1)
+    gas_price = w3.eth.gas_price
+    erc20 = deploy_contract(
+        w3,
+        CONTRACTS["TestERC20A"],
+        key=KEYS["validator"],
+        gas_price=gas_price,
+    )
+
+    def transfer():
+        tx = erc20.functions.transfer(ADDRS["community"], 10).build_transaction(
+            {
+                "from": ADDRS["validator"],
+                "gasPrice": gas_price,
+            }
+        )
+        signed = sign_transaction(w3, tx, KEYS["validator"])
+        txhash = w3.eth.send_raw_transaction(signed.rawTransaction)
+        receipt = w3.eth.wait_for_transaction_receipt(txhash)
+        return receipt
+
+    transfer()
+    cli = do_upgrade(c, "v1.3", c.cosmos_cli().block_height() + 15)
+    wait_for_port(ports.evmrpc_port(c.base_port(1)))
+    receipt = transfer()
+    print("mm-receipt", receipt)
+    blk = receipt["blockNumber"]
+
+    def trace_blk(i):
+        url = f"http://127.0.0.1:{ports.evmrpc_port(c.base_port(i))}"
+        params = {
+            "method": "debug_traceBlockByNumber",
+            "params": [hex(blk)],
+            "id": 1,
+            "jsonrpc": "2.0",
+        }
+        rsp = requests.post(url, json=params)
+        assert rsp.status_code == 200
+        return rsp.json()["result"]
+
+    wait_for_new_blocks(cli, 1)
+    b0 = trace_blk(0)
+    b1 = trace_blk(1)
+    assert b0 != b1, b0
+
+    c.supervisorctl("stop", "cronos_777-1-node0")
+    time.sleep(3)
+    cli.changeset_fixdata(f"{c.base_dir}/node0/data/versiondb")
+    c.supervisorctl("start", "cronos_777-1-node0")
+    wait_for_port(ports.evmrpc_port(c.base_port(0)))
+    b0 = trace_blk(0)
+    assert b0 == b1, b0