Problem: protobuf files are using v1beta from cosmos-sdk (fixes #395) (…

…#397) Solution: - upgraded Cosmos SDK to a patched version of 0.40.4 - updated changelog - updated the module to explicitely prefix with v1 - updated the custom protobufs to be v1 instead of v1beta1 and regenerated files using protocgen
crypto-org-chain · Mar 3, 2021 · ec02b54 · ec02b54
1 parent 2977f84
commit ec02b54
Show file tree

Hide file tree

Showing 33 changed files with 154 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-*unreleased*
-## v1.0.0?
-A version based on a patched fork of Cosmos SDK 0.41.3.
+*March 4, 2021*
+## v1.0.0
+A final initial released version based on a patched fork of Cosmos SDK 0.41.4
+(the patch is identical to the 0.8.1 to 0.9.1 releases, i.e. it fixes the bech32 address lookup issue in v0.40/v0.41 SDK releases).
+
+### Breaking changes
+* initial modules and custom protobuf were named with "v1"
 
 *February 4, 2021*
 ## v0.9.1

diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ ifeq ($(NETWORK),testnet)
 	TEST_TAGS := "--tags=testnet"
 endif
 
-SIMAPP = github.com/crypto-org-chain/chain-main/app
+SIMAPP = github.com/crypto-org-chain/chain-main/v1/app
 BINDIR ?= ~/go/bin
 
 OS := $(shell uname)

diff --git a/app/app.go b/app/app.go
@@ -82,13 +82,13 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	appparams "github.com/crypto-org-chain/chain-main/app/params"
-	"github.com/crypto-org-chain/chain-main/x/chainmain"
-	chainmainkeeper "github.com/crypto-org-chain/chain-main/x/chainmain/keeper"
-	chainmaintypes "github.com/crypto-org-chain/chain-main/x/chainmain/types"
-	supply "github.com/crypto-org-chain/chain-main/x/supply"
-	supplykeeper "github.com/crypto-org-chain/chain-main/x/supply/keeper"
-	supplytypes "github.com/crypto-org-chain/chain-main/x/supply/types"
+	appparams "github.com/crypto-org-chain/chain-main/v1/app/params"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain"
+	chainmainkeeper "github.com/crypto-org-chain/chain-main/v1/x/chainmain/keeper"
+	chainmaintypes "github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
+	supply "github.com/crypto-org-chain/chain-main/v1/x/supply"
+	supplykeeper "github.com/crypto-org-chain/chain-main/v1/x/supply/keeper"
+	supplytypes "github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 
 	// unnamed import of statik for swagger UI support
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"

diff --git a/app/encoding.go b/app/encoding.go
@@ -2,7 +2,7 @@ package app
 
 import (
 	"github.com/cosmos/cosmos-sdk/std"
-	"github.com/crypto-org-chain/chain-main/app/params"
+	"github.com/crypto-org-chain/chain-main/v1/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

diff --git a/cmd/chain-maind/app/app.go b/cmd/chain-maind/app/app.go
@@ -34,10 +34,10 @@ import (
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/crypto-org-chain/chain-main/app"
-	"github.com/crypto-org-chain/chain-main/app/params"
-	"github.com/crypto-org-chain/chain-main/config"
-	chainmaincli "github.com/crypto-org-chain/chain-main/x/chainmain/client/cli"
+	"github.com/crypto-org-chain/chain-main/v1/app"
+	"github.com/crypto-org-chain/chain-main/v1/app/params"
+	"github.com/crypto-org-chain/chain-main/v1/config"
+	chainmaincli "github.com/crypto-org-chain/chain-main/v1/x/chainmain/client/cli"
 )
 
 // NewRootCmd creates a new root command for chain-maind. It is called once in the

diff --git a/cmd/chain-maind/main.go b/cmd/chain-maind/main.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	"github.com/crypto-org-chain/chain-main/app"
-	cmd "github.com/crypto-org-chain/chain-main/cmd/chain-maind/app"
+	"github.com/crypto-org-chain/chain-main/v1/app"
+	cmd "github.com/crypto-org-chain/chain-main/v1/cmd/chain-maind/app"
 )
 
 func main() {

diff --git a/cmd/chain-maind/main_test.go b/cmd/chain-maind/main_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/confluentinc/bincover"
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	"github.com/crypto-org-chain/chain-main/app"
-	cmd "github.com/crypto-org-chain/chain-main/cmd/chain-maind/app"
+	"github.com/crypto-org-chain/chain-main/v1/app"
+	cmd "github.com/crypto-org-chain/chain-main/v1/cmd/chain-maind/app"
 )
 
 func test_main() {

diff --git a/config/config_test.go b/config/config_test.go
@@ -11,7 +11,7 @@ import (
 	keys "github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/crypto-org-chain/chain-main/config"
+	"github.com/crypto-org-chain/chain-main/v1/config"
 )
 
 func TestMnemonic(t *testing.T) {

diff --git a/default.nix b/default.nix
@@ -28,7 +28,7 @@ let
       src = lib.sourceByRegex ./. src_regexes;
     };
     subPackages = [ "cmd/chain-maind" ];
-    vendorSha256 = sha256:0bfpc25s90l5q11jc3qp5h9lrdpa5jn844fqcllh27zp0s1gm26i;
+    vendorSha256 = sha256:0pzq4fawihvmdd2zf5ckydqcddf11pydpwyr0qswszag329vrhc3;
     runVend = true;
     outputs = [
       "out"

diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
-module github.com/crypto-org-chain/chain-main
+module github.com/crypto-org-chain/chain-main/v1
 
 go 1.15
 
 require (
 	github.com/confluentinc/bincover v0.1.0
-	github.com/cosmos/cosmos-sdk v0.41.0
+	github.com/cosmos/cosmos-sdk v0.41.4
 	github.com/cosmos/ledger-go v0.9.2 // indirect
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.4.3
@@ -15,7 +15,7 @@ require (
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.1
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.7
+	github.com/tendermint/tendermint v0.34.8
 	github.com/tendermint/tm-db v0.6.4
 	google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f
 	google.golang.org/grpc v1.35.0

diff --git a/go.sum b/go.sum
@@ -576,8 +576,8 @@ github.com/tendermint/tendermint v0.34.0-rc6 h1:SVuKGvvE22KxfuK8QUHctUrmOWJsncZS
 github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg=
 github.com/tendermint/tendermint v0.34.0 h1:eXCfMgoqVSzrjzOj6clI9GAejcHH0LvOlRjpCmMJksU=
 github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ=
-github.com/tendermint/tendermint v0.34.7 h1:lvBJFNqpDuEzKfLZKtUXOL5dMOpqHonHlO6LCujyl6E=
-github.com/tendermint/tendermint v0.34.7/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss=
+github.com/tendermint/tendermint v0.34.8 h1:PMWgUx47FrNTsfhxCWzoiIlVAC1SE9+WBlnsF9oQW0I=
+github.com/tendermint/tendermint v0.34.8/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss=
 github.com/tendermint/tm-db v0.6.2 h1:DOn8jwCdjJblrCFJbtonEIPD1IuJWpbRUUdR8GWE4RM=
 github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=
 github.com/tendermint/tm-db v0.6.3 h1:ZkhQcKnB8/2jr5EaZwGndN4owkPsGezW2fSisS9zGbg=

diff --git a/proto/chainmain/v1beta/genesis.proto → proto/chainmain/v1/genesis.proto b/proto/chainmain/v1beta/genesis.proto → proto/chainmain/v1/genesis.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package chainmain.chainmain.v1beta1;
+package chainmain.chainmain.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/chainmain/types";
 

diff --git a/proto/supply/v1beta/accounts.proto → proto/supply/v1/accounts.proto b/proto/supply/v1beta/accounts.proto → proto/supply/v1/accounts.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package chainmain.supply.v1beta1;
+package chainmain.supply.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";
 

diff --git a/proto/supply/v1beta/genesis.proto → proto/supply/v1/genesis.proto b/proto/supply/v1beta/genesis.proto → proto/supply/v1/genesis.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package chainmain.supply.v1beta1;
+package chainmain.supply.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";
 

diff --git a/proto/supply/v1beta/query.proto → proto/supply/v1/query.proto b/proto/supply/v1beta/query.proto → proto/supply/v1/query.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package chainmain.supply.v1beta1;
+package chainmain.supply.v1;
 
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
@@ -11,12 +11,12 @@ option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";
 service Query {
     // TotalSupply queries the total supply of all coins.
     rpc TotalSupply(SupplyRequest) returns (SupplyResponse) {
-        option (google.api.http).get = "/cosmos/supply/v1beta1/total";
+        option (google.api.http).get = "/chainmain/supply/v1/total";
     }
 
     // LiquidSupply queries the liquid supply of all coins.
     rpc LiquidSupply(SupplyRequest) returns (SupplyResponse) {
-        option (google.api.http).get = "/cosmos/supply/v1beta1/liquid";
+        option (google.api.http).get = "/chainmain/supply/v1/liquid";
     }
 }
 

diff --git a/pystarport/pystarport/convert.sh b/pystarport/pystarport/convert.sh
@@ -5,7 +5,7 @@ TENDERMINT=./tendermint
 TMP=$(whereis grpc_python_plugin)
 PLUGIN="$(cut -d' ' -f2 <<<"$TMP")"
 mkdir $OUTPUT
-git clone --branch v0.34.7 https://github.com/tendermint/tendermint.git
+git clone --branch v0.34.8 https://github.com/tendermint/tendermint.git
 # cosmos
 python -m grpc.tools.protoc --proto_path=$COSMOS/proto --proto_path=$COSMOS/third_party/proto --python_out=$OUTPUT $(find $COSMOS/proto/cosmos -iname "*.proto") --grpc_python_out=$OUTPUT  --plugin=protoc-gen-grpc_python=$PLUGIN
 # cosmos third-party

diff --git a/third_party/cosmos-sdk b/third_party/cosmos-sdk
diff --git a/x/chainmain/client/cli/query.go b/x/chainmain/client/cli/query.go
@@ -13,8 +13,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/crypto-org-chain/chain-main/config"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/types"
+	"github.com/crypto-org-chain/chain-main/v1/config"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module

diff --git a/x/chainmain/client/cli/tx.go b/x/chainmain/client/cli/tx.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
 )
 
 // GetTxCmd returns the transaction commands for this module

diff --git a/x/chainmain/genesis.go b/x/chainmain/genesis.go
@@ -2,8 +2,8 @@ package chainmain
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/keeper"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/keeper"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
 )
 
 // InitGenesis initializes the capability module's state from a provided genesis

diff --git a/x/chainmain/keeper/keeper.go b/x/chainmain/keeper/keeper.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
 )
 
 type (

diff --git a/x/chainmain/module.go b/x/chainmain/module.go
@@ -16,9 +16,9 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/client/cli"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/keeper"
-	"github.com/crypto-org-chain/chain-main/x/chainmain/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/client/cli"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/keeper"
+	"github.com/crypto-org-chain/chain-main/v1/x/chainmain/types"
 )
 
 var (

diff --git a/x/chainmain/types/genesis.pb.go b/x/chainmain/types/genesis.pb.go
diff --git a/x/supply/client/cli/query.go b/x/supply/client/cli/query.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/x/supply/client/rest/query.go b/x/supply/client/rest/query.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/types/rest"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 )
 
 // TotalSupplyHandlerFn returns HTTP request handler to query the total supply of coins

diff --git a/x/supply/keeper/genesis.go b/x/supply/keeper/genesis.go
@@ -2,7 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 )
 
 // InitGenesis initializes the supply module's state from a given genesis state.

diff --git a/x/supply/keeper/grpc_query.go b/x/supply/keeper/grpc_query.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 )
 
 // TotalSupply implements the Query/TotalSupply gRPC method

diff --git a/x/supply/keeper/keeper.go b/x/supply/keeper/keeper.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"

diff --git a/x/supply/module.go b/x/supply/module.go
@@ -5,16 +5,16 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/crypto-org-chain/chain-main/x/supply/client/cli"
-	"github.com/crypto-org-chain/chain-main/x/supply/client/rest"
-	"github.com/crypto-org-chain/chain-main/x/supply/keeper"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/client/cli"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/client/rest"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/keeper"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/crypto-org-chain/chain-main/x/supply/types"
+	"github.com/crypto-org-chain/chain-main/v1/x/supply/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
+1 −1		.github/workflows/test.yml
+22 −7		CHANGELOG.md
+27 −3		RELEASE_NOTES.md
+20 −15		client/keys/migrate.go
+12 −18		client/keys/migrate_test.go
+ −		client/keys/testdata/keys/keys.db/000136.ldb
+ −		client/keys/testdata/keys/keys.db/000137.ldb
+1 −1		client/keys/testdata/keys/keys.db/CURRENT
+1 −1		client/keys/testdata/keys/keys.db/CURRENT.bak
+876 −30		client/keys/testdata/keys/keys.db/LOG
+ −		client/keys/testdata/keys/keys.db/MANIFEST-000005
+ −		client/keys/testdata/keys/keys.db/MANIFEST-000167
+17 −1		crypto/keyring/keyring.go
+4 −0		docs/.vuepress/config.js
+12 −0		docs/basics/app-anatomy.md
+12 −0		docs/basics/query-lifecycle.md
+1 −1		docs/core/cli.md
+12 −0		docs/core/grpc_rest.md
+7 −7		docs/migrations/rest.md
+615 −893		docs/package-lock.json
+1 −1		go.mod
+2 −2		go.sum
+1 −1		server/grpc/server_test.go
+1 −0		simapp/simd/cmd/root.go
+35 −3		store/cachekv/store.go
+77 −0		x/auth/client/cli/cli_test.go
+215 −25		x/auth/client/cli/tx_multisign.go
+9 −6		x/auth/client/cli/tx_sign.go
+105 −0		x/auth/client/rest/rest_test.go
+14 −0		x/auth/client/testutil/helpers.go
+0 −4		x/auth/legacy/legacytx/stdsign.go
+19 −3		x/auth/legacy/legacytx/stdtx.go
+16 −67		x/auth/tx/service.go
+20 −8		x/auth/tx/service_test.go
+157 −0		x/auth/tx/xauthclient.go
+38 −12		x/bank/types/balance.go
+79 −1		x/bank/types/balance_test.go
+2 −2		x/bank/types/genesis_test.go
+1 −1		x/slashing/keeper/infractions.go