Problem: ethermint is not updated (#1215)

mmsqe · web-flow · commit 44d0284e04a0 · 2023-10-23T13:14:27.000Z
* Problem: ethermint is not updated

* Update CHANGELOG.md

Signed-off-by: mmsqe &lt;mavis@crypto.com&gt;

* fix lint

---------

Signed-off-by: mmsqe &lt;mavis@crypto.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Bug Fixes
+
+- [#1215](https://github.com/crypto-org-chain/cronos/pull/1215) Update ethermint to fix of concurrent write in fee history.
+
 *October 17, 2023*
 
 ## v1.1.0-rc1
diff --git a/go.mod b/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.20230925072753-4062d0cc2a32
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231019015135-65c0efeabb62
 	// 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
@@ -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.20230925072753-4062d0cc2a32 h1:A++epzNCr3EY57dnU6UTSDwbCiPD6MjvUKHKSd/PoI8=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20230925072753-4062d0cc2a32/go.mod h1:wnJQyK4n0vShhL+YIAUd7XCzUhgZ9fgG6yJ14n7qefo=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20231019015135-65c0efeabb62 h1:vkDT9v2ozR3Y0AJsrs+r+bTtgs2Kll0sq3Q/ZwXDDoc=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20231019015135-65c0efeabb62/go.mod h1:wnJQyK4n0vShhL+YIAUd7XCzUhgZ9fgG6yJ14n7qefo=
 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=
diff --git a/gomod2nix.toml b/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.20230925072753-4062d0cc2a32"
-    hash = "sha256-8zwdHROHnAVfly2PIaNAfiXfb2fWsTqePaZ58EJtjH4="
+    version = "v0.6.1-0.20231019015135-65c0efeabb62"
+    hash = "sha256-0fyozPeRfig2Nalb031GFSpM50jF4qx1qPDDStTubRs="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.2"
diff --git a/memiavl/db.go b/memiavl/db.go
@@ -20,6 +20,7 @@ const (
 	DefaultSnapshotInterval    = 1000
 	LockFileName               = "LOCK"
 	DefaultSnapshotWriterLimit = 4
+	TmpSuffix                  = "-tmp"
 )
 
 var errReadOnly = errors.New("db is read-only")
@@ -265,7 +266,7 @@ func removeTmpDirs(rootDir string) error {
 	}
 
 	for _, entry := range entries {
-		if !entry.IsDir() || !strings.HasSuffix(entry.Name(), "-tmp") {
+		if !entry.IsDir() || !strings.HasSuffix(entry.Name(), TmpSuffix) {
 			continue
 		}
 
@@ -636,7 +637,7 @@ func (db *DB) RewriteSnapshot() error {
 	}
 
 	snapshotDir := snapshotName(db.lastCommitInfo.Version)
-	tmpDir := snapshotDir + "-tmp"
+	tmpDir := snapshotDir + TmpSuffix
 	path := filepath.Join(db.dir, tmpDir)
 	if err := db.MultiTree.WriteSnapshot(path, db.snapshotWriterPool); err != nil {
 		return errors.Join(err, os.RemoveAll(path))
@@ -978,7 +979,7 @@ func traverseSnapshots(dir string, ascending bool, callback func(int64) (bool, e
 
 // atomicRemoveDir is equavalent to `mv snapshot snapshot-tmp && rm -r snapshot-tmp`
 func atomicRemoveDir(path string) error {
-	tmpPath := path + "-tmp"
+	tmpPath := path + TmpSuffix
 	if err := os.Rename(path, tmpPath); err != nil {
 		return err
 	}
diff --git a/memiavl/db_test.go b/memiavl/db_test.go
@@ -45,7 +45,7 @@ func TestRemoveSnapshotDir(t *testing.T) {
 	defer os.RemoveAll(dbDir)
 
 	snapshotDir := filepath.Join(dbDir, snapshotName(0))
-	tmpDir := snapshotDir + "-tmp"
+	tmpDir := snapshotDir + TmpSuffix
 	if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {
 		t.Fatalf("Failed to create dummy snapshot directory: %v", err)
 	}
diff --git a/memiavl/import.go b/memiavl/import.go
@@ -36,7 +36,7 @@ func NewMultiTreeImporter(dir string, height uint64) (*MultiTreeImporter, error)
 }
 
 func (mti *MultiTreeImporter) tmpDir() string {
-	return filepath.Join(mti.dir, mti.snapshotDir+"-tmp")
+	return filepath.Join(mti.dir, mti.snapshotDir+TmpSuffix)
 }
 
 func (mti *MultiTreeImporter) Add(item interface{}) error {
diff --git a/x/cronos/keeper/mock/ibckeeper_mock.go b/x/cronos/keeper/mock/ibckeeper_mock.go
@@ -15,7 +15,7 @@ func (i IbcKeeperMock) Transfer(goCtx context.Context, msg *types.MsgTransfer) (
 }
 
 func (i IbcKeeperMock) GetDenomTrace(ctx sdk.Context, denomTraceHash tmbytes.HexBytes) (types.DenomTrace, bool) {
-	if denomTraceHash.String() == "6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865" { //nolint:gosec // test only
+	if denomTraceHash.String() == "6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865" {
 		return types.DenomTrace{
 			Path:      "transfer/channel-0",
 			BaseDenom: "basetcro",

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ const (`
`20`	`20`	`DefaultSnapshotInterval = 1000`
`21`	`21`	`LockFileName = "LOCK"`
`22`	`22`	`DefaultSnapshotWriterLimit = 4`
	`23`	`+ TmpSuffix = "-tmp"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`var errReadOnly = errors.New("db is read-only")`
`@@ -265,7 +266,7 @@ func removeTmpDirs(rootDir string) error {`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`for _, entry := range entries {`
`268`		`- if !entry.IsDir() \|\| !strings.HasSuffix(entry.Name(), "-tmp") {`
	`269`	`+ if !entry.IsDir() \|\| !strings.HasSuffix(entry.Name(), TmpSuffix) {`
`269`	`270`	`continue`
`270`	`271`	`}`
`271`	`272`
`@@ -636,7 +637,7 @@ func (db *DB) RewriteSnapshot() error {`
`636`	`637`	`}`
`637`	`638`
`638`	`639`	`snapshotDir := snapshotName(db.lastCommitInfo.Version)`
`639`		`- tmpDir := snapshotDir + "-tmp"`
	`640`	`+ tmpDir := snapshotDir + TmpSuffix`
`640`	`641`	`path := filepath.Join(db.dir, tmpDir)`
`641`	`642`	`if err := db.MultiTree.WriteSnapshot(path, db.snapshotWriterPool); err != nil {`
`642`	`643`	`return errors.Join(err, os.RemoveAll(path))`
`@@ -978,7 +979,7 @@ func traverseSnapshots(dir string, ascending bool, callback func(int64) (bool, e`
`978`	`979`
`979`	`980`	// atomicRemoveDir is equavalent to `mv snapshot snapshot-tmp && rm -r snapshot-tmp`
`980`	`981`	`func atomicRemoveDir(path string) error {`
`981`		`- tmpPath := path + "-tmp"`
	`982`	`+ tmpPath := path + TmpSuffix`
`982`	`983`	`if err := os.Rename(path, tmpPath); err != nil {`
`983`	`984`	`return err`
`984`	`985`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func TestRemoveSnapshotDir(t *testing.T) {`
`45`	`45`	`defer os.RemoveAll(dbDir)`
`46`	`46`
`47`	`47`	`snapshotDir := filepath.Join(dbDir, snapshotName(0))`
`48`		`- tmpDir := snapshotDir + "-tmp"`
	`48`	`+ tmpDir := snapshotDir + TmpSuffix`
`49`	`49`	`if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {`
`50`	`50`	`t.Fatalf("Failed to create dummy snapshot directory: %v", err)`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func NewMultiTreeImporter(dir string, height uint64) (*MultiTreeImporter, error)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func (mti *MultiTreeImporter) tmpDir() string {`
`39`		`- return filepath.Join(mti.dir, mti.snapshotDir+"-tmp")`
	`39`	`+ return filepath.Join(mti.dir, mti.snapshotDir+TmpSuffix)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (mti *MultiTreeImporter) Add(item interface{}) error {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (i IbcKeeperMock) Transfer(goCtx context.Context, msg *types.MsgTransfer) (`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func (i IbcKeeperMock) GetDenomTrace(ctx sdk.Context, denomTraceHash tmbytes.HexBytes) (types.DenomTrace, bool) {`
`18`		`- if denomTraceHash.String() == "6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865" { //nolint:gosec // test only`
	`18`	`+ if denomTraceHash.String() == "6B5A664BF0AF4F71B2F0BAA33141E2F1321242FBD5D19762F541EC971ACB0865" {`
`19`	`19`	`return types.DenomTrace{`
`20`	`20`	`Path: "transfer/channel-0",`
`21`	`21`	`BaseDenom: "basetcro",`