fix upgrade

Author: mmsqe

tests/integration_tests/configs/cosmovisor.jsonnet

@@ -6,17 +6,21 @@ config {
       'minimum-gas-prices': '100000000000aphoton',
     },
     genesis+: {
+      consensus_params: {
+        block: {
+          max_bytes: '1048576',
+          max_gas: '81500000',
+        },
+      },
       app_state+: {
         feemarket+: {
           params+: {
             base_fee:: super.base_fee,
           },
         },
         gov: {
-          voting_params: {
+          params: {
             voting_period: '10s',
-          },
-          deposit_params: {
             max_deposit_period: '10s',
             min_deposit: [
               {

tests/integration_tests/cosmoscli.py

@@ -640,10 +640,10 @@ def edit_validator(
             )
         )
 
-    def gov_propose(self, proposer, kind, proposal, **kwargs):
-        method = "submit-proposal"
+    def gov_propose_legacy(self, proposer, kind, proposal, **kwargs):
+        method = "submit-legacy-proposal"
         kwargs.setdefault("gas_prices", DEFAULT_GAS_PRICE)
-        kwargs.setdefault("broadcast_mode", "block")
+        kwargs.setdefault("gas", DEFAULT_GAS)
         if kind == "software-upgrade":
             return json.loads(
                 self.raw(
@@ -653,6 +653,7 @@ def gov_propose(self, proposer, kind, proposal, **kwargs):
                     kind,
                     proposal["name"],
                     "-y",
+                    "--no-validate",
                     from_=proposer,
                     # content
                     title=proposal.get("title"),
@@ -706,7 +707,7 @@ def gov_propose(self, proposer, kind, proposal, **kwargs):
     def gov_vote(self, voter, proposal_id, option, **kwargs):
         kwargs.setdefault("gas_prices", DEFAULT_GAS_PRICE)
         kwargs.setdefault("broadcast_mode", "sync")
-        return json.loads(
+        rsp = json.loads(
             self.raw(
                 "tx",
                 "gov",
@@ -719,6 +720,9 @@ def gov_vote(self, voter, proposal_id, option, **kwargs):
                 **kwargs,
             )
         )
+        if rsp["code"] == 0:
+            rsp = self.event_query_tx_for(rsp["txhash"])
+        return rsp
 
     def gov_deposit(self, depositor, proposal_id, amount):
         return json.loads(

tests/integration_tests/test_fee_history.py

@@ -187,7 +187,7 @@ def update_feemarket_param(node, tmp_path, new_multiplier=2, new_denominator=200
     proposal.write_text(json.dumps(proposal_src))
     rsp = cli.submit_gov_proposal(proposal, from_="community")
     assert rsp["code"] == 0, rsp["raw_log"]
-    approve_proposal(node, rsp)
+    approve_proposal(node, rsp, status=3)
     print("check params have been updated now")
     p = cli.get_params("feemarket")["params"]
     assert p["base_fee"] == new_base_fee

tests/integration_tests/test_upgrade.py

@@ -2,23 +2,20 @@
 import json
 import re
 import subprocess
-import time
 from pathlib import Path
 
 import pytest
-from dateutil.parser import isoparse
 from pystarport import ports
 from pystarport.cluster import SUPERVISOR_CONFIG_FILE
 
 from .network import Ethermint, setup_custom_ethermint
 from .utils import (
     ADDRS,
     CONTRACTS,
+    approve_proposal,
     deploy_contract,
-    parse_events,
     send_transaction,
     wait_for_block,
-    wait_for_block_time,
     wait_for_port,
 )
 
@@ -94,7 +91,6 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     - it should work transparently
     - check that queries on legacy blocks still works after upgrade.
     """
-    time.sleep(6)
     cli = custom_ethermint.cosmos_cli()
     w3 = custom_ethermint.w3
     contract, _ = deploy_contract(w3, CONTRACTS["TestERC20A"])
@@ -108,7 +104,7 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     print("upgrade height", target_height)
 
     plan_name = "integration-test-upgrade"
-    rsp = cli.gov_propose(
+    rsp = cli.gov_propose_legacy(
         "community",
         "software-upgrade",
         {
@@ -120,20 +116,7 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
         },
     )
     assert rsp["code"] == 0, rsp["raw_log"]
-
-    # get proposal_id
-    ev = parse_events(rsp["logs"])["submit_proposal"]
-    proposal_id = ev["proposal_id"]
-
-    rsp = cli.gov_vote("validator", proposal_id, "yes")
-    assert rsp["code"] == 0, rsp["raw_log"]
-    # rsp = custom_ethermint.cosmos_cli(1).gov_vote("validator", proposal_id, "yes")
-    # assert rsp["code"] == 0, rsp["raw_log"]
-
-    proposal = cli.query_proposal(proposal_id)
-    wait_for_block_time(cli, isoparse(proposal["voting_end_time"]))
-    proposal = cli.query_proposal(proposal_id)
-    assert proposal["status"] == "PROPOSAL_STATUS_PASSED", proposal
+    approve_proposal(custom_ethermint, rsp)
 
     # update cli chain binary
     custom_ethermint.chain_binary = (

tests/integration_tests/utils.py

@@ -327,10 +327,9 @@ def find_log_event_attrs(events, ev_type, cond=None):
     return None
 
 
-def approve_proposal(n, rsp, event_query_tx=True):
+def approve_proposal(n, rsp, status="PROPOSAL_STATUS_PASSED"):
     cli = n.cosmos_cli()
-    if event_query_tx:
-        rsp = cli.event_query_tx_for(rsp["txhash"])
+    rsp = cli.event_query_tx_for(rsp["txhash"])
     # get proposal_id
 
     def cb(attrs):
@@ -342,11 +341,13 @@ def cb(attrs):
         rsp = n.cosmos_cli(i).gov_vote("validator", proposal_id, "yes", gas=100000)
         assert rsp["code"] == 0, rsp["raw_log"]
     wait_for_new_blocks(cli, 1)
+    res = cli.query_tally(proposal_id)
+    res = res.get("tally") if res.get("tally") else res
     assert (
-        int(cli.query_tally(proposal_id)["tally"]["yes_count"]) == cli.staking_pool()
+        int(res["yes_count"]) == cli.staking_pool()
     ), "all validators should have voted yes"
     print("wait for proposal to be activated")
     proposal = cli.query_proposal(proposal_id)
     wait_for_block_time(cli, isoparse(proposal["voting_end_time"]))
     proposal = cli.query_proposal(proposal_id)
-    assert proposal["status"] == 3, proposal
+    assert proposal["status"] == status, proposal