Problem: push0 opcode is not tested

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## UNRELEASED
 
 - [#1258](https://github.com/crypto-org-chain/cronos/pull/1258) Support hard-fork style upgrades.
+- [#1273](https://github.com/crypto-org-chain/cronos/pull/1273) Enable push0 opcode in integration test
 
 *December 11, 2023*
 

integration_tests/conftest.py

@@ -11,6 +11,7 @@
 
 
 def pytest_configure(config):
+    config.addinivalue_line("markers", "unmarked: fallback mark for unmarked tests")
     config.addinivalue_line("markers", "slow: marks tests as slow")
     config.addinivalue_line("markers", "gravity: gravity bridge test cases")
     config.addinivalue_line("markers", "ica: marks ica tests")

integration_tests/contracts/contracts/CosmosToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "./ICosmosToken.sol";
 

integration_tests/contracts/contracts/Gravity.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 
 import "@openzeppelin/contracts/access/AccessControl.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";

integration_tests/contracts/contracts/ICosmosToken.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 
 /**
  * @dev Interface of the CosmosToken deployed by the gravity contract

integration_tests/contracts/contracts/TestBlackListERC20.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestBlackListERC20 is ERC20 {

integration_tests/contracts/contracts/TestCRC20.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // An utility erc20 contract that has a fancy method

integration_tests/contracts/contracts/TestERC20A.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestERC20A is ERC20 {

integration_tests/contracts/contracts/TestERC20Utility.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // An utility erc20 contract that has a fancy method

integration_tests/contracts/contracts/TestERC21Source.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestERC21Source is ERC20 {

integration_tests/contracts/contracts/TestMaliciousSupply.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.8.10;
+pragma solidity 0.8.21;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // This contract is for testing a case on the gravity bridge when attacker try to send an amount

integration_tests/contracts/hardhat.config.ts

@@ -4,11 +4,12 @@ module.exports = {
   solidity: {
     compilers: [
       {
-        version: "0.8.10",
+        version: "0.8.21",
         settings: {
           optimizer: {
             enabled: true
-          }
+          },
+          evmVersion: "shanghai"
         }
       },
       {

integration_tests/test_basic.py

@@ -51,6 +51,7 @@ def test_send_transaction(cluster):
     )
     receipt = w3.eth.wait_for_transaction_receipt(txhash)
     assert receipt.status == 1
+    assert receipt.gasUsed == 21000
 
 
 def test_events(cluster, suspend_capture):
@@ -59,6 +60,7 @@ def test_events(cluster, suspend_capture):
         w3,
         CONTRACTS["TestERC20A"],
         key=KEYS["validator"],
+        exp_gas_used=633810,
     )
     tx = erc20.functions.transfer(ADDRS["community"], 10).build_transaction(
         {"from": ADDRS["validator"]}

integration_tests/test_ibc_rly_gas.py

@@ -23,7 +23,7 @@ def test_ibc(ibc):
     cli = ibc.cronos.cosmos_cli()
     wait_for_new_blocks(cli, 1)
     rly_transfer(ibc)
-    diff = 0.005
+    diff = 0.01
     record = log_gas_records(cli)
     if record:
         records.append(record)

integration_tests/test_pruned_node.py

@@ -46,7 +46,7 @@ def test_pruned_node(cronos):
     )
     signed = sign_transaction(w3, tx, KEYS["validator"])
     txhash = w3.eth.send_raw_transaction(signed.rawTransaction)
-    exp_gas_used = 51384
+    exp_gas_used = 51383
 
     print("wait for prunning happens")
     wait_for_new_blocks(cronos.cosmos_cli(0), 10)

integration_tests/utils.py

@@ -345,7 +345,7 @@
     ).decode()
 
 
-def deploy_contract(w3, jsonfile, args=(), key=KEYS["validator"]):
+def deploy_contract(w3, jsonfile, args=(), key=KEYS["validator"], exp_gas_used=None):
     """
     deploy contract and return the deployed contract instance
     """
@@ -360,6 +360,9 @@
     tx = contract.constructor(*args).build_transaction({"from": acct.address})
     txreceipt = send_transaction(w3, tx, key)
     assert txreceipt.status == 1
+    if exp_gas_used is not None:
+        assert exp_gas_used == txreceipt.gasUsed, \
+            f'exp {exp_gas_used}, got {txreceipt.gasUsed}'
     address = txreceipt.contractAddress
     return w3.eth.contract(address=address, abi=info["abi"])