cherry-pick 78ba8a9

Problem: latest SDK patch not used (#358)

Solution: bumped dependencies to SDK v0.40.1 which includes security fixes.
+ included the upgrade proposal test handler for crossfire

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
+*January 20, 2021*
+## v0.8.1
+A version based on the patched release of Cosmos SDK 0.40.1 that includes security fixes in Tendermint 0.40.3.
+
 *January 11, 2021*
-## v0.8.0-crossfire 
+## v0.8.0
 A version based on the final release of Cosmos SDK 0.40.
 ### Improvements
 * [347](https://github.com/crypto-com/chain-main/pull/347) keyring options help extended

app/app.go

@@ -429,6 +429,9 @@ func New(
 	app.ScopedIBCKeeper = scopedIBCKeeper
 	app.ScopedTransferKeeper = scopedTransferKeeper
 
+	// TODO: crossfire may not be long-running, so the special config + this may need to be removed later
+	app.UpgradeKeeper.SetUpgradeHandler("crossfire-upgrade-test", func(_ sdk.Context, _ upgradetypes.Plan) {})
+
 	return app
 }
 

default.nix

@@ -25,7 +25,7 @@ let
       src = lib.sourceByRegex ./. src_regexes;
     };
     subPackages = [ "cmd/chain-maind" ];
-    vendorSha256 = sha256:08f2mv6sxgcw5xkqmy87dhz9b8ibj3p7fssmbmbsf2kmaxicq70y;
+    vendorSha256 = sha256:1krm1xx1xrwkx9g1lw46dkarjpiz101yyk9z60v56k6r2hhbq7q7;
     runVend = true;
     outputs = [
       "out"

go.mod

@@ -4,24 +4,24 @@ go 1.15
 
 require (
 	github.com/confluentinc/bincover v0.1.0
-	github.com/cosmos/cosmos-sdk v0.40.0
+	github.com/cosmos/cosmos-sdk v0.40.1
 	github.com/cosmos/ledger-go v0.9.2 // indirect
-	github.com/gogo/protobuf v1.3.1
+	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/imdario/mergo v0.3.11
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.6.1
-	github.com/tendermint/tendermint v0.34.1
+	github.com/stretchr/testify v1.7.0
+	github.com/tendermint/tendermint v0.34.3
 	github.com/tendermint/tm-db v0.6.3
-	google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d
-	google.golang.org/grpc v1.33.2
+	google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f
+	google.golang.org/grpc v1.35.0
 
 )
 
-replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
+replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
 replace github.com/cosmos/ledger-cosmos-go => github.com/crypto-com/ledger-cosmos-go v0.9.10-0.20200929055312-01e1d341de0f

nix/sources.json

@@ -1,15 +1,16 @@
 {
     "cosmos-sdk": {
-        "branch": "master",
+        "branch": "release/v0.40.x",
         "description": ":chains: A Framework for Building High Value Public Blockchains :sparkles:",
         "homepage": "https://cosmos.network/",
         "owner": "cosmos",
         "repo": "cosmos-sdk",
-        "rev": "a334a59df02fe1f227fbf2a9a1ae153323eb6f8b",
-        "sha256": "0cjjm8ghk6illv3mgi1xpfkdcjs8gri8z477rs0dk050qgwdq5vp",
+        "rev": "7cb7a3ab92cdab3dfb260fef7aca665daea2c558",
+        "sha256": "063ci81v7jfmi6gparxgq3kk6h8grcgz1s8svrmckbyjb0x9h6dk",
         "type": "tarball",
-        "url": "https://github.com/cosmos/cosmos-sdk/archive/a334a59df02fe1f227fbf2a9a1ae153323eb6f8b.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+        "url": "https://github.com/cosmos/cosmos-sdk/archive/7cb7a3ab92cdab3dfb260fef7aca665daea2c558.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "v0.40.1"
     },
     "nixpkgs": {
         "branch": "master",

pystarport/pystarport/convert.sh

@@ -5,8 +5,8 @@ TENDERMINT=./tendermint
 TMP=$(whereis grpc_python_plugin)
 PLUGIN="$(cut -d' ' -f2 <<<"$TMP")"
 mkdir $OUTPUT
-git clone --branch v0.40.0 https://github.com/cosmos/cosmos-sdk.git
-git clone --branch v0.34.1 https://github.com/tendermint/tendermint.git
+git clone --branch v0.40.1 https://github.com/cosmos/cosmos-sdk.git
+git clone --branch v0.34.3 https://github.com/tendermint/tendermint.git
 cp -Rf $COSMOS/third_party/proto/* $COSMOS/proto/ 
 rm -rf $COSMOS/proto/cosmos/base/tendermint
 # cosmos