From 14aa1754174ed480ee77860fbab55930ae93d01d Mon Sep 17 00:00:00 2001
From: Tomas Tauber <2410580+tomtau@users.noreply.github.com>
Date: Fri, 26 Mar 2021 11:23:21 +0800
Subject: [PATCH] cherry-picked 47e0b6daaabab35d5e1f61c78799235388854a1b
 39a8c9634e05a83fb7ee4c277593b42d23965a90

Problem: not using the latest SDK release (#429)

Solution: bumped the dependency to Cosmos SDK v0.42.3

Problem: duplicate commands(fixes #421) (#423)

Solution: removed the duplicate commands
---
 CHANGELOG.md               | 15 +++++++++++++++
 cmd/chain-maind/app/app.go |  3 ---
 default.nix                |  4 ++--
 go.mod                     |  2 +-
 go.sum                     |  4 ++--
 third_party/cosmos-sdk     |  2 +-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce447877a..30ef732e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+*unreleased*
+
+## v2.0.0
+
+### Breaking changes
+
+- [381](https://github.com/crypto-org-chain/chain-main/pull/381) Add subscription module
+
+*March 26, 2021*
+
+## v1.2.0
+A version based on the upstream release of Cosmos SDK 0.42.3.
+### Bug Fixes
+* [423](https://github.com/crypto-org-chain/chain-main/pull/423) duplicate commands removed
+
 *March 11, 2021*
 ## v1.1.0
 A version based on the upstream release of Cosmos SDK 0.42.1.
diff --git a/cmd/chain-maind/app/app.go b/cmd/chain-maind/app/app.go
index b38dae9a3..bf36b826d 100644
--- a/cmd/chain-maind/app/app.go
+++ b/cmd/chain-maind/app/app.go
@@ -29,7 +29,6 @@ import (
 	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
-	vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -227,8 +226,6 @@ func txCommand() *cobra.Command {
 		authcmd.GetBroadcastCommand(),
 		authcmd.GetEncodeCommand(),
 		authcmd.GetDecodeCommand(),
-		flags.LineBreak,
-		vestingcli.GetTxCmd(),
 	)
 
 	app.ModuleBasics.AddTxCommands(cmd)
diff --git a/default.nix b/default.nix
index 62a700be6..efc177b18 100644
--- a/default.nix
+++ b/default.nix
@@ -22,13 +22,13 @@ let
   lib = pkgs.lib;
   build-chain-maind = { ledger_zemu ? false, network ? "mainnet" }: pkgs.buildGoModule rec {
     pname = "chain-maind";
-    version = "1.1.0";
+    version = "1.2.0";
     src = lib.cleanSourceWith {
       name = "src";
       src = lib.sourceByRegex ./. src_regexes;
     };
     subPackages = [ "cmd/chain-maind" ];
-    vendorSha256 = sha256:0b0l65il7b01005zik6b2df0j24lcfga0xbn3wigwxfyrx3yz481;
+    vendorSha256 = sha256:0fyik7c9r7cicqrlzf5vln59wjm3rawvvbiyd9z9ca062g9d1453;
     runVend = true;
     outputs = [
       "out"
diff --git a/go.mod b/go.mod
index 511d7ae16..35f0640ce 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/confluentinc/bincover v0.1.0
-	github.com/cosmos/cosmos-sdk v0.42.1
+	github.com/cosmos/cosmos-sdk v0.42.3
 	github.com/cosmos/ledger-go v0.9.2 // indirect
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.4.3
diff --git a/go.sum b/go.sum
index 0b5ae1591..7af3a43d1 100644
--- a/go.sum
+++ b/go.sum
@@ -102,8 +102,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cosmos/cosmos-sdk v0.42.1 h1:/0SqvXdxbHBRUFRTLdiL4VYE18DMNXd2ONhC5d90EBQ=
-github.com/cosmos/cosmos-sdk v0.42.1/go.mod h1:xiLp1G8mumj82S5KLJGCAyeAlD+7VNomg/aRSJV12yk=
+github.com/cosmos/cosmos-sdk v0.42.3 h1:VFYq7spDBBIlygAxwcI79Xh2JuIrG1ZCPKpvqKghIZs=
+github.com/cosmos/cosmos-sdk v0.42.3/go.mod h1:xiLp1G8mumj82S5KLJGCAyeAlD+7VNomg/aRSJV12yk=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
diff --git a/third_party/cosmos-sdk b/third_party/cosmos-sdk
index 21814558e..7648bfca4 160000
--- a/third_party/cosmos-sdk
+++ b/third_party/cosmos-sdk
@@ -1 +1 @@
-Subproject commit 21814558eaa47b018018711e5fe16e0b16811fce
+Subproject commit 7648bfca45b9d0897103ec739210607dce77c4fb