Skip to content

Commit 32ee6bd

Browse files
mmsqeHuangYi
andauthored
Problem: security patch not included (#1134)
* Problem: security patch not included * patch ibc * bump version * fix win build --------- Co-authored-by: HuangYi <huang@crypto.com>
1 parent 09d9ae9 commit 32ee6bd

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

CHANGELOG.md

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

3+
*Mar 13, 2025*
4+
5+
## v5.0.1
6+
7+
### Bug Fixes
8+
9+
- [#1134](https://github.com/crypto-org-chain/chain-main/pull/1134) Merge commit from fork.
10+
311
*Mar 3, 2025*
412

513
## v5.0.0

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let
3838
in
3939
buildGoApplication rec {
4040
pname = "chain-maind";
41-
version = "5.0.0";
41+
version = "5.0.1";
4242
go = buildPackages.go_1_23;
4343
src = lib.cleanSourceWith {
4444
name = "src";

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ replace (
195195
// use cosmos fork of keyring
196196
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
197197
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6
198-
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250220173250-5ab318c11638
199-
github.com/cosmos/ibc-go/v5 => github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250228042756-4cb8fbb89fa4
198+
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250312155614-629f87307283
199+
github.com/cosmos/ibc-go/v5 => github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250312161521-f6964623c015
200200
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
201201
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
202202
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,16 +412,16 @@ github.com/crypto-org-chain/cometbft v0.0.0-20250203074611-413db99f819d h1:o3VTf
412412
github.com/crypto-org-chain/cometbft v0.0.0-20250203074611-413db99f819d/go.mod h1:Odd7GxmuyLf7ARo9fzuZXV6J9DlfN7UtsBAD41i6700=
413413
github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4h4Ki1UE/LF6CKwYEm3OZ+HIBCrzSmOokG1vce0O98=
414414
github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ=
415-
github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250220173250-5ab318c11638 h1:eadpZmbJEvAADk/2YOAazn54dSfiwf4e6xeg4e/hwm4=
416-
github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250220173250-5ab318c11638/go.mod h1:ShveistGZHeyPFHFiZsjlEH6uL5E0ouev2GApJ57E8w=
415+
github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250312155614-629f87307283 h1:910FWXC49TreJYskr2RqXizDibPy97f1T8Q8iHU7Flk=
416+
github.com/crypto-org-chain/cosmos-sdk v0.46.16-0.20250312155614-629f87307283/go.mod h1:ShveistGZHeyPFHFiZsjlEH6uL5E0ouev2GApJ57E8w=
417417
github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20230904032434-c575f4797ca4 h1:TXArRgse2/3r1FxFbbukJhQpE5HHxJaOI3YAwz4Zu00=
418418
github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20230904032434-c575f4797ca4/go.mod h1:sCbJoEppeM3/7+Ox1heGlbVt+eWBcTmLb9UEjuotXIc=
419419
github.com/crypto-org-chain/cronos/store v0.0.5-0.20230904032434-c575f4797ca4 h1:9jlbWwXuuoWCOxBJX3MqtyBuK8YA2Tnmp9QBQVl79Uk=
420420
github.com/crypto-org-chain/cronos/store v0.0.5-0.20230904032434-c575f4797ca4/go.mod h1:KC9cV7VK8BNIJySzztw2nWSqPqVGcffsumMl3sORPCM=
421421
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230904032434-c575f4797ca4 h1:V88JCIhw059oKuFanb8WbKW1o1TezG3uGRvzL7/VQKI=
422422
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230904032434-c575f4797ca4/go.mod h1:i9e8vrU54C/JvSM+rX/jUidFRBcyXZ8FgNX+EvrasQc=
423-
github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250228042756-4cb8fbb89fa4 h1:seSseg+uGWWqTgwY5TrgZOBkLi9+PmptUtYtPNWGges=
424-
github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250228042756-4cb8fbb89fa4/go.mod h1:eH18ghfqGGT9gDCTMDLWg1zPLXplSnPxXRNWPx98xhU=
423+
github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250312161521-f6964623c015 h1:wgksHCh1uVidfm/DtQuMfyqhJ2j/O8B+HVd1p+Q1TrI=
424+
github.com/crypto-org-chain/ibc-go/v5 v5.2.2-0.20250312161521-f6964623c015/go.mod h1:eH18ghfqGGT9gDCTMDLWg1zPLXplSnPxXRNWPx98xhU=
425425
github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61 h1:Y5OuzOkZtjCfO53Jgzl+H8re6pOU4X205a1VMkDcUdk=
426426
github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61/go.mod h1:BA6bNc7haulu2IjMy/I2SJiKWjQzfIb7LEAMsnIoLWU=
427427
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=

gomod2nix.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ schema = 3
106106
version = "v1.0.0-beta.1"
107107
hash = "sha256-oATkuj+fM5eBn+ywO+w/tL0AFSIEkx0J3Yz+VhVe0QA="
108108
[mod."github.com/cosmos/cosmos-sdk"]
109-
version = "v0.46.16-0.20250220173250-5ab318c11638"
110-
hash = "sha256-Y2lrCD8KibkUBCXkR6Hq0SgiC8lqyLj7lltUFdJkNP4="
109+
version = "v0.46.16-0.20250312155614-629f87307283"
110+
hash = "sha256-Ni1o4EE6U/HQsNgDyIEQcZg32tBfBhlB6T7P0ZKpoVk="
111111
replaced = "github.com/crypto-org-chain/cosmos-sdk"
112112
[mod."github.com/cosmos/go-bip39"]
113113
version = "v1.0.0"
@@ -119,8 +119,8 @@ schema = 3
119119
version = "v0.19.6"
120120
hash = "sha256-0Om7nXftrgVkCpRTGNTGnc2lUJsFQ9aihwgtkUkwleg="
121121
[mod."github.com/cosmos/ibc-go/v5"]
122-
version = "v5.2.2-0.20250228042756-4cb8fbb89fa4"
123-
hash = "sha256-+VYlGG99rE0pu3I2Zggmxp/LOOar5McpWnKbGVUDCAA="
122+
version = "v5.2.2-0.20250312161521-f6964623c015"
123+
hash = "sha256-qrn8HBLsj6Cpy7gpzWRlOyY90U+0VHiyu3mKHgqW6Zk="
124124
replaced = "github.com/crypto-org-chain/ibc-go/v5"
125125
[mod."github.com/cosmos/ledger-cosmos-go"]
126126
version = "v0.12.4"

nix/bundle-win-exe.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runCommand "tarball-${chain-maind.name}"
1616
deps = [
1717
"${rocksdb}/bin/librocksdb-shared.dll"
1818
"${snappy}/bin/libsnappy.dll"
19-
"${lz4.out}/lib/liblz4.dll"
19+
"${lz4.out}/bin/liblz4.dll"
2020
"${bzip2.bin}/bin/libbz2-1.dll"
2121
"${zlib}/bin/zlib1.dll"
2222
"${zstd.bin}/bin/libzstd.dll"

0 commit comments

Comments
 (0)