Skip to content

Commit 65db56d

Browse files
yihuangmmsqe
andauthored
Problem: sdk v0.46.11 is not used (#909)
* Problem: sdk v0.46.11 is not used Solution: - update sdk/tendermint/ethermint dependencies - patch cometbft-db to use grocksdb - still need to replace tm-db because of indirect dependencies * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> * fix lint ci * use crypto-org-chain fork * Problem: v1.0.5 is not released * fix dates * Apply suggestions from code review Co-authored-by: mmsqe <[email protected]> Signed-off-by: yihuang <[email protected]> * tag ethermint * fix release workflow --------- Signed-off-by: yihuang <[email protected]> Co-authored-by: mmsqe <[email protected]>
1 parent 7f84535 commit 65db56d

File tree

9 files changed

+411
-138
lines changed

9 files changed

+411
-138
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
sha256sum *.tar.gz > "checksums.txt"
4040
echo 'FILES<<EOF' >> $GITHUB_ENV
4141
ls -1 *.tar.gz >> $GITHUB_ENV
42-
ls -1 checksums-*.txt >> $GITHUB_ENV
42+
echo "checksums.txt" >> $GITHUB_ENV
4343
echo 'EOF' >> $GITHUB_ENV
4444
cat $GITHUB_ENV
4545
- name: upload binaries
@@ -95,7 +95,7 @@ jobs:
9595
sha256sum *.tar.gz > "checksums-macos.txt"
9696
echo 'FILES<<EOF' >> $GITHUB_ENV
9797
ls -1 *.tar.gz >> $GITHUB_ENV
98-
ls -1 checksums-*.txt >> $GITHUB_ENV
98+
echo "checksums-macos.txt" >> $GITHUB_ENV
9999
echo 'EOF' >> $GITHUB_ENV
100100
cat $GITHUB_ENV
101101
- name: upload binaries

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Changelog
22

3-
## UNRELEASED
3+
*Mar 6, 2023*
4+
5+
## v1.0.5
46

57
### Bug Fixes
68

@@ -10,8 +12,9 @@
1012

1113
- [#904](https://github.com/crypto-org-chain/cronos/pull/904) Enable "dynamic-level-bytes" on new `application.db`.
1214
- [#907](https://github.com/crypto-org-chain/cronos/pull/907) Apply a configurable limit in rpc apis.
15+
- [#909](https://github.com/crypto-org-chain/cronos/pull/909) Update to cosmos-sdk v0.46.11.
1316

14-
*Feb 15, 2022*
17+
*Feb 15, 2023*
1518

1619
## v1.0.4
1720

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
, rev ? "dirty"
99
}:
1010
let
11-
version = "v1.0.4";
11+
version = "v1.0.5";
1212
pname = "cronosd";
1313
tags = [ "ledger" "netgo" network "rocksdb" "grocksdb_no_link" ];
1414
ldflags = lib.concatStringsSep "\n" ([

go.mod

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
cosmossdk.io/errors v1.0.0-beta.7
77
cosmossdk.io/math v1.0.0-beta.4
88
github.com/armon/go-metrics v0.4.1
9-
github.com/cosmos/cosmos-sdk v0.46.10
9+
github.com/cosmos/cosmos-sdk v0.46.11
1010
github.com/cosmos/ibc-go/v5 v5.2.0
1111
github.com/crypto-org-chain/cronos/versiondb v0.0.0
1212
github.com/ethereum/go-ethereum v1.10.19
@@ -21,21 +21,21 @@ require (
2121
github.com/spf13/cast v1.5.0
2222
github.com/spf13/cobra v1.6.1
2323
github.com/spf13/pflag v1.0.5
24-
github.com/stretchr/testify v1.8.1
25-
github.com/tendermint/tendermint v0.34.26
24+
github.com/stretchr/testify v1.8.2
25+
github.com/tendermint/tendermint v0.34.27
2626
github.com/tendermint/tm-db v0.6.7
2727
golang.org/x/exp v0.0.0-20230118134722-a68e582fa157
28-
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
29-
google.golang.org/grpc v1.52.3
28+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
29+
google.golang.org/grpc v1.53.0
3030
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8
3131
gopkg.in/yaml.v2 v2.4.0
3232
)
3333

3434
require (
35-
cloud.google.com/go v0.105.0 // indirect
36-
cloud.google.com/go/compute v1.12.1 // indirect
37-
cloud.google.com/go/compute/metadata v0.2.1 // indirect
38-
cloud.google.com/go/iam v0.7.0 // indirect
35+
cloud.google.com/go v0.107.0 // indirect
36+
cloud.google.com/go/compute v1.15.1 // indirect
37+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
38+
cloud.google.com/go/iam v0.8.0 // indirect
3939
cloud.google.com/go/storage v1.27.0 // indirect
4040
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
4141
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -56,10 +56,11 @@ require (
5656
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
5757
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
5858
github.com/cespare/xxhash v1.1.0 // indirect
59-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
59+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6060
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
6161
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
6262
github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
63+
github.com/cometbft/cometbft-db v0.7.0 // indirect
6364
github.com/confio/ics23/go v0.9.0 // indirect
6465
github.com/cosmos/btcutil v1.0.5 // indirect
6566
github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect
@@ -99,7 +100,7 @@ require (
99100
github.com/google/orderedcode v0.0.1 // indirect
100101
github.com/google/uuid v1.3.0 // indirect
101102
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
102-
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
103+
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
103104
github.com/gorilla/handlers v1.5.1 // indirect
104105
github.com/gorilla/websocket v1.5.0 // indirect
105106
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -173,17 +174,17 @@ require (
173174
github.com/ulikunitz/xz v0.5.8 // indirect
174175
github.com/zondax/hid v0.9.1 // indirect
175176
github.com/zondax/ledger-go v0.14.1 // indirect
176-
go.etcd.io/bbolt v1.3.6 // indirect
177-
go.opencensus.io v0.23.0 // indirect
177+
go.etcd.io/bbolt v1.3.7 // indirect
178+
go.opencensus.io v0.24.0 // indirect
178179
golang.org/x/crypto v0.5.0 // indirect
179-
golang.org/x/net v0.5.0 // indirect
180-
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
180+
golang.org/x/net v0.7.0 // indirect
181+
golang.org/x/oauth2 v0.4.0 // indirect
181182
golang.org/x/sync v0.1.0 // indirect
182-
golang.org/x/sys v0.4.0 // indirect
183-
golang.org/x/term v0.4.0 // indirect
184-
golang.org/x/text v0.6.0 // indirect
183+
golang.org/x/sys v0.5.0 // indirect
184+
golang.org/x/term v0.5.0 // indirect
185+
golang.org/x/text v0.7.0 // indirect
185186
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
186-
google.golang.org/api v0.102.0 // indirect
187+
google.golang.org/api v0.103.0 // indirect
187188
google.golang.org/appengine v1.6.7 // indirect
188189
gopkg.in/ini.v1 v1.67.0 // indirect
189190
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
@@ -193,12 +194,14 @@ require (
193194
)
194195

195196
replace (
197+
// https://github.com/cometbft/cometbft-db/pull/42
198+
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230306031617-b3e4fd3331c4
196199
// Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
197200
github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0
198-
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.10
201+
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.11
199202
github.com/crypto-org-chain/cronos/versiondb => ./versiondb
200203
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable
201-
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.7-cronos
204+
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.8-cronos
202205
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
203206
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
204207
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
@@ -210,9 +213,10 @@ replace (
210213

211214
// TODO: remove when gravity update dependencies
212215
github.com/peggyjv/gravity-bridge/module/v2 => github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20220815102151-48275db7e1ee
213-
// use informal system fork of tendermint
214-
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26
216+
// use cometbft
217+
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
215218
// https://github.com/crypto-org-chain/tm-db/tree/release/v0.6.x
219+
// still need this replacement for indirect dependencies on tm-db
216220
github.com/tendermint/tm-db => github.com/crypto-org-chain/tm-db v0.6.8-0.20230118040049-14dc6b00a5b3
217221

218222
// TODO: remove after fixed https://github.com/cosmos/cosmos-sdk/issues/11364

0 commit comments

Comments
 (0)