From b3ea683919f251bca9a6e41d5dee9d155a3413df Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Tue, 9 Jan 2024 16:08:11 -0800 Subject: [PATCH 1/9] Bump version to v3.6.0 --- CHANGELOG.md | 14 ++++++++++++++ app/upgrades.go | 3 +++ go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bcda57f00..0a48c49608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,20 @@ Ref: https://keepachangelog.com/en/1.0.0/ --> # Changelog +## v3.6.0 +sei-chain: +* [#1170](https://github.com/sei-protocol/sei-chain/pull/1170) Integrate SeiDB into Sei Chain +* [#1196](https://github.com/sei-protocol/sei-chain/pull/1196) Add panic handler in dex endblock +* [#1204](https://github.com/sei-protocol/sei-chain/pull/1204) Cleanup removed oracle feeds + +sei-cosmos: +* [#373](https://github.com/sei-protocol/sei-cosmos/pull/373) Add root multistore v2 for SeiDB +* [#388](https://github.com/sei-protocol/sei-cosmos/pull/388) Improve cachekv write performance +* [#391](https://github.com/sei-protocol/sei-cosmos/pull/391) Fix potential memory leak due to emitting events + +sei-tendermint: +* [#175](https://github.com/sei-protocol/sei-tendermint/pull/175) Fix self remediation bug for block sync + ## v3.5.0 sei-chain: * [#1164](https://github.com/sei-protocol/sei-chain/pull/1164) Bump wasmd diff --git a/app/upgrades.go b/app/upgrades.go index f8911c83a8..eac78f91a5 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -60,11 +60,14 @@ var upgradesList = []string{ "3.0.6", "3.0.7", "3.0.8", + // We change naming convention to prepend version with "v" "v3.0.9", "v3.1.1", "v3.2.1", "v3.3.0", "v3.5.0", + // SeiDB is available after v3.6.0 + "v3.6.0", } // if there is an override list, use that instead, for integration tests diff --git a/go.mod b/go.mod index a4478d0fe4..2c3f5660ac 100644 --- a/go.mod +++ b/go.mod @@ -306,14 +306,14 @@ require ( replace ( github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.0.4 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.69 - github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.8 + github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.71 + github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.9 github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/sei-protocol/sei-db => github.com/sei-protocol/sei-db v0.0.24 + github.com/sei-protocol/sei-db => github.com/sei-protocol/sei-db v0.0.26 // Latest goleveldb is broken, we have to stick to this version github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.35 + github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.36 github.com/tendermint/tm-db => github.com/sei-protocol/tm-db v0.0.4 google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index 0bf6496433..a28ae82696 100644 --- a/go.sum +++ b/go.sum @@ -1169,16 +1169,16 @@ github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+f github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sei-protocol/goutils v0.0.2 h1:Bfa7Sv+4CVLNM20QcpvGb81B8C5HkQC/kW1CQpIbXDA= github.com/sei-protocol/goutils v0.0.2/go.mod h1:iYE2DuJfEnM+APPehr2gOUXfuLuPsVxorcDO+Tzq9q8= -github.com/sei-protocol/sei-cosmos v0.2.69 h1:tN18VEles46CzClEQmLiBO3tYbhYIFWJvFuSJtWRdV4= -github.com/sei-protocol/sei-cosmos v0.2.69/go.mod h1:nd65tkKknX2nrtkSldt17rGU5uaNZ/ly/fB3FqNoYck= -github.com/sei-protocol/sei-db v0.0.24 h1:rSidZZ4GNEJRY+0gm5+RioNqmYiOiPaZuDQ+vIAiqi0= -github.com/sei-protocol/sei-db v0.0.24/go.mod h1:F/ZKZA8HJPcUzSZPA8yt6pfwlGriJ4RDR4eHKSGLStI= -github.com/sei-protocol/sei-iavl v0.1.8 h1:HcK7Nv64PtJXUSdPV2+8AwRNRrcFQwsAmSZX6Em625E= -github.com/sei-protocol/sei-iavl v0.1.8/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk= +github.com/sei-protocol/sei-cosmos v0.2.71 h1:L1aNyXd/xQA52AuDilf1RDc5RrkShu4cYqvrA2N393E= +github.com/sei-protocol/sei-cosmos v0.2.71/go.mod h1:CykNPmj90YkwBorkvnc05u9k9MBNDHC3h4CIdmq3R98= +github.com/sei-protocol/sei-db v0.0.26 h1:/jC5AZ1aq9+SpYx+VL9HJfLFoW7/KrGN//QyWVqRsqs= +github.com/sei-protocol/sei-db v0.0.26/go.mod h1:F/ZKZA8HJPcUzSZPA8yt6pfwlGriJ4RDR4eHKSGLStI= +github.com/sei-protocol/sei-iavl v0.1.9 h1:y4mVYftxLNRs6533zl7N0/Ch+CzRQc04JDfHolIxgBE= +github.com/sei-protocol/sei-iavl v0.1.9/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk= github.com/sei-protocol/sei-ibc-go/v3 v3.3.0 h1:/mjpTuCSEVDJ51nUDSHU92N0bRSwt49r1rmdC/lqgp8= github.com/sei-protocol/sei-ibc-go/v3 v3.3.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= -github.com/sei-protocol/sei-tendermint v0.2.35 h1:TvmcsNLsv1l8gJRVwsFRNa/YsySp7jtPku/JfyOBO4w= -github.com/sei-protocol/sei-tendermint v0.2.35/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4= +github.com/sei-protocol/sei-tendermint v0.2.36 h1:bzD2aEVcS7A5JOO1izMB+U7rbMwhcuDzIUpkmhmWy9Y= +github.com/sei-protocol/sei-tendermint v0.2.36/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4= github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY= github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY= github.com/sei-protocol/sei-wasmd v0.0.4 h1:vkmBD8Xbl9s0NznPJA0btonqFAcNO4gUGcYmhuMUULA= From 168fd1ddfa4e257ead273ef3929342b95bdb2373 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Wed, 10 Jan 2024 11:11:56 -0800 Subject: [PATCH 2/9] Fix empty branch --- loadtest/tx.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/loadtest/tx.go b/loadtest/tx.go index 85a462dac5..8c7361b78f 100644 --- a/loadtest/tx.go +++ b/loadtest/tx.go @@ -36,8 +36,6 @@ func SendTx( } if grpcRes.TxResponse.Code == 0 { atomic.AddInt64(sentCount, 1) - } else { - } } From 3244a7191e8b0af495e2b7ee05087a9cc2ba994e Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 17:15:43 -0800 Subject: [PATCH 3/9] Bump cosmos to fix upgrade migration --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e35c03fcf6..15714e9304 100644 --- a/go.mod +++ b/go.mod @@ -307,7 +307,7 @@ require ( replace ( github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.0.4 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.71 + github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.72 github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.9 github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 4d6d71854a..d914824cbd 100644 --- a/go.sum +++ b/go.sum @@ -1170,8 +1170,8 @@ github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+f github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sei-protocol/goutils v0.0.2 h1:Bfa7Sv+4CVLNM20QcpvGb81B8C5HkQC/kW1CQpIbXDA= github.com/sei-protocol/goutils v0.0.2/go.mod h1:iYE2DuJfEnM+APPehr2gOUXfuLuPsVxorcDO+Tzq9q8= -github.com/sei-protocol/sei-cosmos v0.2.71 h1:L1aNyXd/xQA52AuDilf1RDc5RrkShu4cYqvrA2N393E= -github.com/sei-protocol/sei-cosmos v0.2.71/go.mod h1:CykNPmj90YkwBorkvnc05u9k9MBNDHC3h4CIdmq3R98= +github.com/sei-protocol/sei-cosmos v0.2.72 h1:pv1J3fBIpVJwYqTV3unRSJ0/krEGDN5bByZLCkPOIG4= +github.com/sei-protocol/sei-cosmos v0.2.72/go.mod h1:CykNPmj90YkwBorkvnc05u9k9MBNDHC3h4CIdmq3R98= github.com/sei-protocol/sei-db v0.0.26 h1:/jC5AZ1aq9+SpYx+VL9HJfLFoW7/KrGN//QyWVqRsqs= github.com/sei-protocol/sei-db v0.0.26/go.mod h1:F/ZKZA8HJPcUzSZPA8yt6pfwlGriJ4RDR4eHKSGLStI= github.com/sei-protocol/sei-iavl v0.1.9 h1:y4mVYftxLNRs6533zl7N0/Ch+CzRQc04JDfHolIxgBE= From 2dbfd4296aea0156cb291c8e627fd7415a9f1194 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 17:17:20 -0800 Subject: [PATCH 4/9] Update version --- app/upgrades.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrades.go b/app/upgrades.go index eac78f91a5..d8684b344c 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -67,7 +67,7 @@ var upgradesList = []string{ "v3.3.0", "v3.5.0", // SeiDB is available after v3.6.0 - "v3.6.0", + "v3.6.1", } // if there is an override list, use that instead, for integration tests From c2e5f86380e7cdac65517edd7dbf62807e6bda45 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 17:32:09 -0800 Subject: [PATCH 5/9] Fix changelogs readme --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a48c49608..39546a7314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,16 +27,17 @@ Ref: https://keepachangelog.com/en/1.0.0/ --> # Changelog -## v3.6.0 +## v3.6.1 sei-chain: -* [#1170](https://github.com/sei-protocol/sei-chain/pull/1170) Integrate SeiDB into Sei Chain -* [#1196](https://github.com/sei-protocol/sei-chain/pull/1196) Add panic handler in dex endblock * [#1204](https://github.com/sei-protocol/sei-chain/pull/1204) Cleanup removed oracle feeds +* [#1196](https://github.com/sei-protocol/sei-chain/pull/1196) Add panic handler in dex endblock +* [#1170](https://github.com/sei-protocol/sei-chain/pull/1170) Integrate SeiDB into Sei Chain sei-cosmos: -* [#373](https://github.com/sei-protocol/sei-cosmos/pull/373) Add root multistore v2 for SeiDB -* [#388](https://github.com/sei-protocol/sei-cosmos/pull/388) Improve cachekv write performance * [#391](https://github.com/sei-protocol/sei-cosmos/pull/391) Fix potential memory leak due to emitting events +* [#388](https://github.com/sei-protocol/sei-cosmos/pull/388) Improve cachekv write performance +* [#385](https://github.com/sei-protocol/sei-cosmos/pull/385) Add params to disable seqno +* [#373](https://github.com/sei-protocol/sei-cosmos/pull/373) Add root multistore v2 for SeiDB sei-tendermint: * [#175](https://github.com/sei-protocol/sei-tendermint/pull/175) Fix self remediation bug for block sync From 077e3fd55859d885b6f8e371988bb4f4c822b803 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 18:07:50 -0800 Subject: [PATCH 6/9] Bump tendermint version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 15714e9304..2c1794248b 100644 --- a/go.mod +++ b/go.mod @@ -314,7 +314,7 @@ replace ( github.com/sei-protocol/sei-db => github.com/sei-protocol/sei-db v0.0.26 // Latest goleveldb is broken, we have to stick to this version github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.36 + github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.37 github.com/tendermint/tm-db => github.com/sei-protocol/tm-db v0.0.4 google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index d914824cbd..4545c332e4 100644 --- a/go.sum +++ b/go.sum @@ -1178,8 +1178,8 @@ github.com/sei-protocol/sei-iavl v0.1.9 h1:y4mVYftxLNRs6533zl7N0/Ch+CzRQc04JDfHo github.com/sei-protocol/sei-iavl v0.1.9/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk= github.com/sei-protocol/sei-ibc-go/v3 v3.3.0 h1:/mjpTuCSEVDJ51nUDSHU92N0bRSwt49r1rmdC/lqgp8= github.com/sei-protocol/sei-ibc-go/v3 v3.3.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= -github.com/sei-protocol/sei-tendermint v0.2.36 h1:bzD2aEVcS7A5JOO1izMB+U7rbMwhcuDzIUpkmhmWy9Y= -github.com/sei-protocol/sei-tendermint v0.2.36/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4= +github.com/sei-protocol/sei-tendermint v0.2.37 h1:rCVsvngDNKtN8A48zWEn083Sq/TZ/C6qm/PSN4xSxQI= +github.com/sei-protocol/sei-tendermint v0.2.37/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4= github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY= github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY= github.com/sei-protocol/sei-wasmd v0.0.4 h1:vkmBD8Xbl9s0NznPJA0btonqFAcNO4gUGcYmhuMUULA= From 9d0b0e6013ea3172cf63bbeb01073accd0b7545a Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 18:14:47 -0800 Subject: [PATCH 7/9] Fix version --- app/upgrades.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrades.go b/app/upgrades.go index d8684b344c..eac78f91a5 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -67,7 +67,7 @@ var upgradesList = []string{ "v3.3.0", "v3.5.0", // SeiDB is available after v3.6.0 - "v3.6.1", + "v3.6.0", } // if there is an override list, use that instead, for integration tests From 8c692ddf2a59346745b527c8baf2cdf7c781ca27 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 18:57:42 -0800 Subject: [PATCH 8/9] Add 3.6.1 upgrade handler --- app/upgrades.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index eac78f91a5..745eea8379 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -66,8 +66,7 @@ var upgradesList = []string{ "v3.2.1", "v3.3.0", "v3.5.0", - // SeiDB is available after v3.6.0 - "v3.6.0", + "v3.6.1", } // if there is an override list, use that instead, for integration tests From e71d3915dd403626f1dacd630ee61476c7053b3c Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Thu, 11 Jan 2024 20:52:15 -0800 Subject: [PATCH 9/9] Supress lint --- loadtest/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/loadtest/main.go b/loadtest/main.go index 6655e2b24c..0b6baed84a 100644 --- a/loadtest/main.go +++ b/loadtest/main.go @@ -550,6 +550,7 @@ func (c *LoadTestClient) generateVortexOrder(config Config, key cryptotypes.Priv return msgs } +// nolint func getLastHeight(blockchainEndpoint string) int { out, err := exec.Command("curl", blockchainEndpoint+"/blockchain").Output() if err != nil {