From b08f6d668bcaf2862acc4a527c3763d40e2ed13a Mon Sep 17 00:00:00 2001 From: yihuang Date: Fri, 18 Oct 2024 13:06:23 +0800 Subject: [PATCH] Problem: node can't shutdown by signal (#1647) * Problem: node can't shutdown by signal * Update CHANGELOG.md Signed-off-by: yihuang * update deps * fix * Update integration_tests/test_basic.py Signed-off-by: mmsqe --------- Signed-off-by: yihuang Signed-off-by: mmsqe Co-authored-by: mmsqe --- CHANGELOG.md | 4 ++++ app/app.go | 7 ++++++- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- integration_tests/test_basic.py | 4 ++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b30a2bbb2..93e382cde3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## UNRELEASED +### Bug Fixes + +* (cli)[#1647](https://github.com/crypto-org-chain/cronos/pull/1647) Fix node can't shutdown by signal. + ### Improvements * [#1645](https://github.com/crypto-org-chain/cronos/pull/1645) Gen test tx in parallel even in single node. diff --git a/app/app.go b/app/app.go index b1264420b8..b8905c4170 100644 --- a/app/app.go +++ b/app/app.go @@ -1454,7 +1454,12 @@ func (app *App) Close() error { } err := stderrors.Join(errs...) - app.Logger().Info("Application gracefully shutdown", "error", err) + msg := "Application gracefully shutdown" + if err == nil { + app.Logger().Info(msg) + } else { + app.Logger().Error(msg, "error", err) + } return err } diff --git a/go.mod b/go.mod index 17d5560730..df2bb91564 100644 --- a/go.mod +++ b/go.mod @@ -273,7 +273,7 @@ replace ( github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a // develop - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac // 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 diff --git a/go.sum b/go.sum index 0f671882fe..0da36aff13 100644 --- a/go.sum +++ b/go.sum @@ -428,8 +428,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712 h1:vvN3FqhFTakKy4jgVC1GoEtHW52zQg49uNE/e16Scu8= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc h1:EzwyKF5qc7UvOVMbUR+rE34b24tWbQc/Fp/Eer9s33A= -github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= +github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac h1:tSgcMmugbp5h5Xi2rRZBCwP37EfqxM6jmNv9qO/aNrI= +github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= diff --git a/gomod2nix.toml b/gomod2nix.toml index 69f18eb165..f1be8f6123 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -262,8 +262,8 @@ schema = 3 hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20241009020150-a2ad87c8a1cc" - hash = "sha256-He4f1fVYCqTfRqjJ2v3v+00aRX3RQcYzYrqy3VlDxt4=" + version = "v0.6.1-0.20241017130935-816389c76eac" + hash = "sha256-DD2uiTxQKEwKP5tCETMZNX8it7G7e+MBFFMG3YpW6RA=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py index 581b0fe7bd..7089b6c9d1 100644 --- a/integration_tests/test_basic.py +++ b/integration_tests/test_basic.py @@ -377,6 +377,10 @@ def test_local_statesync(cronos, tmp_path_factory): Path(home) / "config/app.toml", base_port, { + "json-rpc": { + "address": f"127.0.0.1:{ports.evmrpc_port(base_port)}", + "ws-address": f"127.0.0.1:{ports.evmrpc_ws_port(base_port)}", + }, "versiondb": { "enable": True, },