Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Problem: fasten memiavl restore and versiondb version mismatch fixes are not backported #1307

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Problem: fasten memiavl restore and versiondb version mismatch fixes are not backported #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
362b015
Problem: versiondb version mismatch related fixes are not backported
mmsqe Jan 30, 2024
3deb86f
update doc
mmsqe Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## UNRELEASED

- [#1298](https://github.com/crypto-org-chain/cronos/pull/1298) Update cosmos-sdk to latest `v0.46.x`.
- [#1307](https://github.com/crypto-org-chain/cronos/pull/1307) Include fasten memiavl restore and versiondb version mismatch related fixes from submodules.

*Jan 05, 2024*

Expand Down
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/armon/go-metrics v0.4.1
github.com/cosmos/cosmos-sdk v0.46.15-0.20231107150241-7799bba7bc88
github.com/cosmos/ibc-go/v5 v5.2.1
github.com/crypto-org-chain/cronos/store v0.0.5
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231115070216-b0af3db7b932
github.com/crypto-org-chain/cronos/store v0.0.0-20240130060137-c12016e4052e
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240130060137-c12016e4052e
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
github.com/ethereum/go-ethereum v1.10.26
github.com/evmos/ethermint v0.0.0-00010101000000-000000000000
github.com/gogo/protobuf v1.3.3
Expand Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/cosmos/iavl v0.19.6 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
github.com/creachadair/taskgroup v0.3.2 // indirect
github.com/crypto-org-chain/cronos/memiavl v0.0.5 // indirect
github.com/crypto-org-chain/cronos/memiavl v0.0.4 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
Expand Down Expand Up @@ -219,6 +219,7 @@ replace (
// the version used by cockroach v22.2.7 release
github.com/cockroachdb/pebble => github.com/cockroachdb/pebble v0.0.0-20230206180212-744ea7cc8f90
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63
github.com/crypto-org-chain/cronos/memiavl => github.com/crypto-org-chain/cronos/memiavl v0.0.0-20240130060137-c12016e4052e
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// 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
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,12 +1262,12 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ=
github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1QJ9a3XdYMSKo+1RdFifxb/g3lNypC52L/rpYrWoKo=
github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
github.com/crypto-org-chain/cronos/memiavl v0.0.5 h1:Uwt1+7LGYuAem2Jrg2IQM7IqOmHbkgnia24a61joeA4=
github.com/crypto-org-chain/cronos/memiavl v0.0.5/go.mod h1:sPIAu3w4KkWWTlN92GyLaB/qeMdszSYd6fF3r+p0C+A=
github.com/crypto-org-chain/cronos/store v0.0.5 h1:Ll9FxohR4I3mJlng+w2m6X7iIqYejJ1jqLWww1VT8Qk=
github.com/crypto-org-chain/cronos/store v0.0.5/go.mod h1:KC9cV7VK8BNIJySzztw2nWSqPqVGcffsumMl3sORPCM=
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231115070216-b0af3db7b932 h1:t4TisWGxHLtmDeugl4KApCuxCplj/avwmlms7GFsJMk=
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231115070216-b0af3db7b932/go.mod h1:i9e8vrU54C/JvSM+rX/jUidFRBcyXZ8FgNX+EvrasQc=
github.com/crypto-org-chain/cronos/memiavl v0.0.0-20240130060137-c12016e4052e h1:i/5RUn3u17PoPPm40mA30Pd89E+xCRVOvtogbQFE8Qo=
github.com/crypto-org-chain/cronos/memiavl v0.0.0-20240130060137-c12016e4052e/go.mod h1:sPIAu3w4KkWWTlN92GyLaB/qeMdszSYd6fF3r+p0C+A=
github.com/crypto-org-chain/cronos/store v0.0.0-20240130060137-c12016e4052e h1:xH57WcZkh3wxRbKQwK7WVnKOQSinNKVjWNCFHOxTVaY=
github.com/crypto-org-chain/cronos/store v0.0.0-20240130060137-c12016e4052e/go.mod h1:KC9cV7VK8BNIJySzztw2nWSqPqVGcffsumMl3sORPCM=
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240130060137-c12016e4052e h1:9tr6e1b+XB4dkmyAF2fzGJokbosiOXJPQFUUa/R2odU=
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240130060137-c12016e4052e/go.mod h1:i9e8vrU54C/JvSM+rX/jUidFRBcyXZ8FgNX+EvrasQc=
github.com/crypto-org-chain/ethermint v0.20.11-cronos.0.20231220064956-a85daedc6ffc h1:1sdpqaZTdUJtq8N35yVVOhYT/5SzQnA/jI7UYAWXsjw=
github.com/crypto-org-chain/ethermint v0.20.11-cronos.0.20231220064956-a85daedc6ffc/go.mod h1:EDjmywAw/EMpMufJA2Q+E9pNHAB00Dt5siQanMOZC88=
github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable h1:VQLW0R8t9DcC/HvQZO1i0mIWjJfAezhI8lLUCholP0M=
Expand Down
11 changes: 6 additions & 5 deletions gomod2nix.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,15 @@ schema = 3
version = "v0.3.2"
hash = "sha256-Y261IO/d9xjV0UScqHvo31broxvnKn4IQQC9Mu6jNkE="
[mod."github.com/crypto-org-chain/cronos/memiavl"]
version = "v0.0.5"
version = "v0.0.0-20240130060137-c12016e4052e"
hash = "sha256-4chV7TmG5Kw4Nac1s0kAcBk5UtyucP5HU5flijas3eg="
replaced = "github.com/crypto-org-chain/cronos/memiavl"
[mod."github.com/crypto-org-chain/cronos/store"]
version = "v0.0.5"
hash = "sha256-L1g4acxQq0V/d6oY3GTixW5nSh+fKsapSbT/nXI4GJI="
version = "v0.0.0-20240130060137-c12016e4052e"
hash = "sha256-Kuv0nCgbnzrNPaQkSCCKmVNr/AcNhM9cCpW5e1DdyhM="
[mod."github.com/crypto-org-chain/cronos/versiondb"]
version = "v0.0.0-20231115070216-b0af3db7b932"
hash = "sha256-9bPXHiTF8+RZ75INmfXj1OyAGQykmYuFq3AC8L+Wb1s="
version = "v0.0.0-20240130060137-c12016e4052e"
hash = "sha256-qI16polu5o09nG0v2WYRThv7bXoEG3HlBgzhy9FBnXo="
[mod."github.com/danieljoos/wincred"]
version = "v1.1.2"
hash = "sha256-Nnklfg12vmWCOhELGyoRqEF4w4srp0WbPwreaChYLKs="
Expand Down
Loading