Test exceeds

integration_tests/test_basic.py

@@ -12,7 +12,7 @@
 from pystarport import cluster, ports
 
 from .cosmoscli import CosmosCLI
 from .utils import (
     ADDRS,
     CONTRACTS,
     KEYS,
@@ -27,6 +27,7 @@
     modify_command_in_supervisor_config,
     send_transaction,
     send_txs,
+    send_txs2,
     submit_any_proposal,
     wait_for_block,
     wait_for_new_blocks,
@@ -168,7 +169,7 @@
     )
     txhash_1 = greeter.deploy(w3)["transactionHash"].hex()
 
     assert w3.eth.get_balance(ADDRS["community"]) == initial_balance + tx_value
 
     # Wait 5 more block (sometimes not enough blocks can not work)
     wait_for_block(
@@ -785,8 +786,9 @@
 origin_cmd = None
 
 
-@pytest.mark.parametrize("max_gas_wanted", [80000000, 40000000, 25000000, 500000])
+@pytest.mark.parametrize("max_gas_wanted", [0])
 def test_tx_inclusion(cronos, max_gas_wanted):
+# def test_tx_inclusion(cronos):
     """
     - send multiple heavy transactions at the same time.
     - check they are included in consecutively blocks without failure.
@@ -809,27 +811,21 @@
 
     w3 = cronos.w3
     cli = cronos.cosmos_cli()
-    block_gas_limit = 81500000
-    tx_gas_limit = 80000000
-    max_tx_in_block = block_gas_limit // min(max_gas_wanted, tx_gas_limit)
-    print("max_tx_in_block", max_tx_in_block)
-    to = ADDRS["validator"]
-    params = {"gas": tx_gas_limit}
-    _, sended_hash_set = send_txs(w3, cli, to, list(KEYS.values())[0:4], params)
-    block_nums = [
-        w3.eth.wait_for_transaction_receipt(h).blockNumber for h in sended_hash_set
-    ]
-    block_nums.sort()
-    print(f"all block numbers: {block_nums}")
-    # the transactions should be included according to max_gas_wanted
-    if max_tx_in_block == 1:
-        for block_num, next_block_num in zip(block_nums, block_nums[1:]):
-            assert next_block_num == block_num + 1
-    else:
-        for num in block_nums[1:max_tx_in_block]:
-            assert num == block_nums[0]
-        for num in block_nums[max_tx_in_block:]:
-            assert num == block_nums[0] + 1
+    tx_gas_limit = 289275000
+    contract = deploy_contract(
+        w3,
+        CONTRACTS["TestMessageCall"],
+        key=KEYS["community"],
+    )
+    iterations = 13000
+    tx = contract.functions.test(iterations).build_transaction()
+    print("estimate_gas", w3.eth.estimate_gas(tx))
+    tx["gas"] = tx_gas_limit
+    _, sended_hash_set = send_txs2(w3, cli, list(KEYS.values())[0:4], tx)
+    for h in sended_hash_set:
+        res = w3.eth.wait_for_transaction_receipt(h)
+        print("res:", h.hex(), res["blockNumber"], res["cumulativeGasUsed"], res["gasUsed"], res["status"])
+    time.sleep(30)
 
 
 def test_replay_protection(cronos):

integration_tests/utils.py

@@ -34,10 +34,10 @@
 Account.enable_unaudited_hdwallet_features()
 ACCOUNTS = {
     "validator": Account.from_mnemonic(os.getenv("VALIDATOR1_MNEMONIC")),
-    "validator2": Account.from_mnemonic(os.getenv("VALIDATOR2_MNEMONIC")),
+    # "validator2": Account.from_mnemonic(os.getenv("VALIDATOR2_MNEMONIC")),
     "community": Account.from_mnemonic(os.getenv("COMMUNITY_MNEMONIC")),
-    "signer1": Account.from_mnemonic(os.getenv("SIGNER1_MNEMONIC")),
-    "signer2": Account.from_mnemonic(os.getenv("SIGNER2_MNEMONIC")),
+    # "signer1": Account.from_mnemonic(os.getenv("SIGNER1_MNEMONIC")),
+    # "signer2": Account.from_mnemonic(os.getenv("SIGNER2_MNEMONIC")),
 }
 KEYS = {name: account.key for name, account in ACCOUNTS.items()}
 ADDRS = {name: account.address for name, account in ACCOUNTS.items()}
@@ -590,8 +590,23 @@
 
     return block_num_0, sended_hash_set
 
+def send_txs2(w3, cli, keys, tx):
+    # use different sender accounts to be able be send concurrently
+    raw_transactions = []
+    for key_from in keys:
+        signed = sign_transaction(w3, tx, key_from)
+        raw_transactions.append(signed.rawTransaction)
+
+    # wait block update
+    block_num_0 = wait_for_new_blocks(cli, 1, sleep=0.1)
+    print(f"block number start: {block_num_0}")
+
+    # send transactions
+    sended_hash_set = send_raw_transactions(w3, raw_transactions)
+
+    return block_num_0, sended_hash_set
 
 def multiple_send_to_cosmos(gcontract, tcontract, w3, recipient, amount, keys):
     # use different sender accounts to be able be send concurrently
     raw_transactions = []
     for key_from in keys:

scripts/run-integration-tests

@@ -10,4 +10,4 @@ cd ../integration_tests/contracts
 HUSKY_SKIP_INSTALL=1 npm install
 npm run typechain
 cd ..
-nix-shell --run "pytest -vv -s"
+nix-shell --run "pytest -v -s test_basic.py::test_tx_inclusion"