Merge remote-tracking branch 'origin/main' into detail_cb

Author: mmsqe

CHANGELOG.md

@@ -15,6 +15,10 @@
 - [#1232](https://github.com/crypto-org-chain/cronos/pull/1232) Adjust require gas in relayer precompile to be closed with actual consumed.
 - [#1235](https://github.com/crypto-org-chain/cronos/pull/1235) Add channel detail in ica packet callback.
 
+### Improvements
+
+- [#1239](https://github.com/crypto-org-chain/cronos/pull/1239) Refactor websocket/subscription system to improve performance and stability.
+
 
 *October 17, 2023*
 

go.mod

@@ -234,7 +234,7 @@ replace (
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc1
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231101080732-b9078abfe0fd
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

go.sum

@@ -484,8 +484,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1
 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467 h1:m0/aHPIJAzi2MSP3TXzzbLTFf+koRFQiaYmerRZUtK4=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467/go.mod h1:G384omH7cXgm90xXR7xpHvsKG7vdBaDuz4To6GpTHUU=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20231101080732-b9078abfe0fd h1:8AWwJrxYtQxoZ1rrM9+w6MLScVe6LzskRo8UF9ep7Qs=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20231101080732-b9078abfe0fd/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac h1:b2Zd0b52V+AyCNRGLRiMtxzNGSzG9aLJmrBhmV2wzvc=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e/go.mod h1:HBaDqlFjlaXJwVQtA7jHejyaA7xwjXI2o6pU/ccP3tE=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

gomod2nix.toml

@@ -216,8 +216,8 @@ schema = 3
     hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE="
     replaced = "github.com/evmos/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20231101080732-b9078abfe0fd"
-    hash = "sha256-FlKoOdJbNqQfloOxV5AGd5TIm3VLjoZW8YOLnuJY7FY="
+    version = "v0.6.1-0.20231114052006-8b1ec2327fac"
+    hash = "sha256-+Rgexd0GX8/afOw2lMULQfOn8tW5dk5RkxpCFrco3og="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.2"

integration_tests/test_basic.py

@@ -785,7 +785,7 @@ def test_contract(cronos):
 origin_cmd = None
 
 
-@pytest.mark.parametrize("max_gas_wanted", [80000000, 40000000, 25000000, 500000])
+@pytest.mark.parametrize("max_gas_wanted", [80000000, 40000000, 25000000, 500000, None])
 def test_tx_inclusion(cronos, max_gas_wanted):
     """
     - send multiple heavy transactions at the same time.
@@ -798,6 +798,8 @@ def fn(cmd):
         global origin_cmd
         if origin_cmd is None:
             origin_cmd = cmd
+        if max_gas_wanted is None:
+            return origin_cmd
         return f"{origin_cmd} --evm.max-tx-gas-wanted {max_gas_wanted}"
 
     modify_command_in_supervisor_config(
@@ -807,6 +809,10 @@ def fn(cmd):
     cronos.supervisorctl("update")
     wait_for_port(ports.evmrpc_port(cronos.base_port(0)))
 
+    # reset to origin_cmd only
+    if max_gas_wanted is None:
+        return
+
     w3 = cronos.w3
     cli = cronos.cosmos_cli()
     block_gas_limit = 81500000

integration_tests/test_subscribe.py

@@ -3,7 +3,6 @@
 import time
 from collections import defaultdict
 
-import pytest
 import websockets
 from eth_utils import abi
 from hexbytes import HexBytes
@@ -16,7 +15,6 @@
     CONTRACTS,
     KEYS,
     deploy_contract,
-    modify_command_in_supervisor_config,
     send_raw_transactions,
     send_transaction,
     sign_transaction,
@@ -82,16 +80,10 @@ async def unsubscribe(self, sub_id):
 TEST_EVENT_TOPIC = Web3.keccak(text="TestEvent(uint256)")
 
 
-@pytest.mark.flaky(max_runs=2)
 def test_subscribe_basic(cronos: Cronos):
     """
     test basic subscribe and unsubscribe
     """
-    modify_command_in_supervisor_config(
-        cronos.base_dir / "tasks.ini",
-        lambda cmd: f"{cmd} --evm.max-tx-gas-wanted {0}",
-    )
-    cronos.supervisorctl("update")
     wait_for_port(ports.evmrpc_ws_port(cronos.base_port(0)))
     cli = cronos.cosmos_cli()
     loop = asyncio.get_event_loop()
@@ -161,11 +153,11 @@ async def async_test():
             await asyncio.gather(*[subscriber_test(c) for i in range(3)])
             contract = deploy_contract(cronos.w3, CONTRACTS["TestERC20A"])
             address = contract.address
-            await asyncio.gather(*[transfer_test(c, cronos.w3, contract, address)])
+            await transfer_test(c, cronos.w3, contract, address)
             contract = deploy_contract(cronos.w3, CONTRACTS["TestMessageCall"])
             inner = contract.caller.inner()
             begin = time.time()
-            await asyncio.gather(*[logs_test(c, cronos.w3, contract, inner)])
+            await logs_test(c, cronos.w3, contract, inner)
             print("msg call time", time.time() - begin)
             t.cancel()
             try:

x/cronos/rpc/api.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/cometbft/cometbft/libs/log"
 	coretypes "github.com/cometbft/cometbft/rpc/core/types"
-	rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
@@ -19,6 +18,7 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	evmrpc "github.com/evmos/ethermint/rpc"
 	"github.com/evmos/ethermint/rpc/backend"
+	"github.com/evmos/ethermint/rpc/stream"
 	rpctypes "github.com/evmos/ethermint/rpc/types"
 	ethermint "github.com/evmos/ethermint/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
@@ -40,7 +40,7 @@ func init() {
 }
 
 // CreateCronosRPCAPIs creates extension json-rpc apis
-func CreateCronosRPCAPIs(ctx *server.Context, clientCtx client.Context, tmWSClient *rpcclient.WSClient, allowUnprotectedTxs bool, indexer ethermint.EVMTxIndexer) []rpc.API {
+func CreateCronosRPCAPIs(ctx *server.Context, clientCtx client.Context, _ *stream.RPCStream, allowUnprotectedTxs bool, indexer ethermint.EVMTxIndexer) []rpc.API {
 	evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx, allowUnprotectedTxs, indexer)
 	return []rpc.API{
 		{