Merge remote-tracking branch 'origin/release/v1.3.x' into release/v1.3.x

crypto-org-chain · Jun 28, 2024 · b04f51c · b04f51c
2 parents 5a0f1bf + af0bd9c
commit b04f51c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 ## UNRELEASED
 
+### Improvements
+
+* (versiondb) [#1491](https://github.com/crypto-org-chain/cronos/pull/1491) Free slice data in HasAtVersion.
+* [#1489](https://github.com/crypto-org-chain/cronos/pull/1489) Update cometbft to v0.37.7.
+
+*Jun 18, 2024*
+
+## v1.3.0-rc2
+
+### Improvements
+
+* (rpc) [#1467](https://github.com/crypto-org-chain/cronos/pull/1467) Avoid unnecessary tx decode in tx listener.
+
+### Bug Fixes
+
+* [#1466](https://github.com/crypto-org-chain/cronos/pull/1466) Fix handling of pending transactions related APIs.
+
+*May 21, 2024*
+
+## v1.3.0-rc1
+
 ### State Machine Breaking
 
 * [#1407](https://github.com/crypto-org-chain/cronos/pull/1407) Add end-to-end encryption module.
@@ -13,13 +34,11 @@
 * (e2ee)[#1421](https://github.com/crypto-org-chain/cronos/pull/1421) Validate e2ee key when register.
 * [#1437](https://github.com/crypto-org-chain/cronos/pull/1437) Update cometbft and cosmos-sdk dependencies.
 * (rpc) [#1467](https://github.com/crypto-org-chain/cronos/pull/1467) Avoid unnecessary tx decode in tx listener.
-* [#1489](https://github.com/crypto-org-chain/cronos/pull/1489) Update cometbft to v0.37.7.
 
 ### Bug Fixes
 
 * (rpc) [#1444](https://github.com/crypto-org-chain/cronos/pull/1444) Avoid nil pointer error when query blocks before feemarket module gets enabled.
 * [#1439](https://github.com/crypto-org-chain/cronos/pull/1439) Add back default prepare proposal logic.
-* [#1466](https://github.com/crypto-org-chain/cronos/pull/1466) Fix handling of pending transactions related APIs.
 
 *May 3, 2024*
 

diff --git a/integration_tests/configs/upgrade-test-package.nix b/integration_tests/configs/upgrade-test-package.nix
@@ -7,8 +7,6 @@ let
       shortRev = builtins.substring 0 7 rev;
     };
   }).defaultNix;
-  # v0.6.10
-  releasedGenesis = import (builtins.fetchTarball "https://github.com/crypto-org-chain/cronos/archive/v0.6.10.tar.gz") { };
   # v0.7.0
   released_0 = (fetchFlake "crypto-org-chain/cronos" "799ac47e293403bd57580d2ff96bb8d9851c3cde").default;
   # v0.8.0
@@ -20,8 +18,7 @@ let
   current = pkgs.callPackage ../../. { };
 in
 pkgs.linkFarm "upgrade-test-package" [
-  { name = "genesis"; path = releasedGenesis; }
-  { name = "v0.7.0"; path = released_0; }
+  { name = "genesis"; path = released_0; }
   { name = "v0.7.0-hotfix"; path = released_1; }
   { name = "v1.0.0"; path = released_2; }
   { name = "v1.1.0"; path = released_3; }

diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py
@@ -868,6 +868,7 @@ def test_contract(cronos):
 origin_cmd = None
 
 
+@pytest.mark.unmarked
 @pytest.mark.parametrize("max_gas_wanted", [80000000, 40000000, 25000000, 500000, None])
 def test_tx_inclusion(cronos, max_gas_wanted):
     """

diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py
@@ -195,11 +195,6 @@ def do_upgrade(
         wait_for_block(c.cosmos_cli(), target + 2, timeout=480)
         wait_for_port(ports.rpc_port(c.base_port(0)))
 
-    target0 = cli.block_height() + 15
-    print("upgrade v0.7.0 height", target0)
-    do_upgrade("v0.7.0", target0, "block", method="submit-proposal")
-    cli = c.cosmos_cli()
-
     target1 = cli.block_height() + 15
     print("upgrade v0.8.0 height", target1)
     gas_prices = "5000000000000basetcro"

diff --git a/versiondb/tsrocksdb/store.go b/versiondb/tsrocksdb/store.go
@@ -108,6 +108,7 @@ func (s Store) HasAtVersion(storeKey string, key []byte, version *int64) (bool,
 	if err != nil {
 		return false, err
 	}
+	defer slice.Free()
 	return slice.Exists(), nil
 }