Merge pull request #986 from yihuang/release/v4.2.6-hotfix

Problem: barberry not patched
crypto-org-chain · Jun 9, 2023 · 7eef93e · 7eef93e
2 parents 9c403c8 + 4763662
commit 7eef93e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+*Jun 9, 2023*
+
+## v4.2.6
+
+- [#986](https://github.com/crypto-org-chain/chain-main/pull/986) Patch barberry.
+
 *May 30, 2023*
 
 ## v4.2.5

diff --git a/default.nix b/default.nix
@@ -36,7 +36,7 @@ let
 in
 buildGoApplication rec {
   pname = "chain-maind";
-  version = "4.2.5";
+  version = "4.2.6";
   go = buildPackages.go_1_20;
   src = lib.cleanSourceWith {
     name = "src";

diff --git a/go.mod b/go.mod
@@ -178,7 +178,8 @@ require (
 replace (
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
 	github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6
-	github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4
+	// https://github.com/crypto-org-chain/cosmos-sdk/tree/release/v0.46.12-hotfix
+	github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230608170216-c8ad6f2b4074
 	github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.11.2-0.20220719170349-e736b9afa7d1
 
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.

diff --git a/go.sum b/go.sum
@@ -404,8 +404,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4h4Ki1UE/LF6CKwYEm3OZ+HIBCrzSmOokG1vce0O98=
 github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ=
-github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4 h1:sccBXX4kTWlB2ppRy2foFZqJ+hL1OdvBwcdiXkyuiCw=
-github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM=
+github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230608170216-c8ad6f2b4074 h1:MV2B6Nh+8or24G9FgppDdGSuihyGSvTnNa0mmGTK+1E=
+github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230608170216-c8ad6f2b4074/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM=
 github.com/crypto-org-chain/cronos/versiondb v1.0.4 h1:L2uGseDc6iYuNMt69TnwaxAIh4w9E+h+gw6sbfqpT5o=
 github.com/crypto-org-chain/cronos/versiondb v1.0.4/go.mod h1:pVLpZ3CxfwKZHEYcNuD4IGwCmRoy6hXvJQFoGlXQcpk=
 github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61 h1:Y5OuzOkZtjCfO53Jgzl+H8re6pOU4X205a1VMkDcUdk=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -107,8 +107,8 @@ schema = 3
     version = "v1.0.0-alpha8"
     hash = "sha256-iXzXoS5Kfh5DBy+PhdFWraDWXda/3M4j7j4VECjv4CA="
   [mod."github.com/cosmos/cosmos-sdk"]
-    version = "v0.46.3-0.20230530021201-0a93ffb1f9d4"
-    hash = "sha256-8/fRL+irUZ8mNQX5oNXdLp1OCeDkPrux9j6JiHJsew0="
+    version = "v0.46.3-0.20230608170216-c8ad6f2b4074"
+    hash = "sha256-DIrDj4bnM9n8OI9k093gHVlth0xWw+qnfv6VcgaYxXY="
     replaced = "github.com/crypto-org-chain/cosmos-sdk"
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"