update

proto/cosmos/auth/v1beta1/auth.proto

@@ -20,8 +20,8 @@ message BaseAccount {
   string              address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   google.protobuf.Any pub_key = 2
       [(gogoproto.jsontag) = "public_key,omitempty", (gogoproto.moretags) = "yaml:\"public_key\""];
-  uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""], (cosmos_proto.scalar) = "cosmos.Int"];
-  uint64 sequence       = 4 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""];
+  uint64 sequence       = 4;
 }
 
 // ModuleAccount defines an account for modules that holds coins on a pool.
@@ -40,11 +40,11 @@ message Params {
   option (gogoproto.equal)            = true;
   option (gogoproto.goproto_stringer) = false;
 
-  uint64 max_memo_characters     = 1 [(cosmos_proto.scalar) = "cosmos.Int"], (gogoproto.moretags) = "yaml:\"max_memo_characters\""];
-  uint64 tx_sig_limit            = 2 [(cosmos_proto.scalar) = "cosmos.Int"], (gogoproto.moretags) = "yaml:\"tx_sig_limit\""];
-  uint64 tx_size_cost_per_byte   = 3 [(cosmos_proto.scalar) = "cosmos.Int"], (gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""];
+  uint64 max_memo_characters     = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""];
+  uint64 tx_sig_limit            = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""];
+  uint64 tx_size_cost_per_byte   = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""];
   uint64 sig_verify_cost_ed25519 = 4
-      [(cosmos_proto.scalar) = "cosmos.Int"], (gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
+      [(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
   uint64 sig_verify_cost_secp256k1 = 5
-      [(cosmos_proto.scalar) = "cosmos.Int"], (gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
+      [(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
 }

proto/cosmos/authz/v1beta1/tx.proto

@@ -60,8 +60,8 @@ message MsgGrantResponse {}
 // MsgRevoke revokes any authorization with the provided sdk.Msg type on the
 // granter's account with that has been granted to the grantee.
 message MsgRevoke {
-  string granter      = 1;
-  string grantee      = 2;
+  string granter      = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  string grantee      = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];;
   string msg_type_url = 3;
 }
 

proto/cosmos/bank/v1beta1/query.proto

@@ -182,7 +182,7 @@ message QueryDenomOwnersRequest {
 // balance of the denominated token.
 message DenomOwner {
   // address defines the address that owns a particular denomination.
-  string address = 1;
+  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];;
 
   // balance is the balance of the denominated coin for an account.
   cosmos.base.v1beta1.Coin balance = 2 [(gogoproto.nullable) = false];

proto/cosmos/base/abci/v1beta1/abci.proto

@@ -124,15 +124,15 @@ message SearchTxsResult {
   option (gogoproto.stringer) = true;
 
   // Count of all txs
-  uint64 total_count = 1 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"total_count\"", (gogoproto.jsontag) = "total_count"];
+  uint64 total_count = 1 [(gogoproto.moretags) = "yaml:\"total_count\"", (gogoproto.jsontag) = "total_count"];
   // Count of txs in current page
-  uint64 count = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 count = 2 ;
   // Index of current page, start from 1
-  uint64 page_number = 3 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"page_number\"", (gogoproto.jsontag) = "page_number"];
+  uint64 page_number = 3 [(gogoproto.moretags) = "yaml:\"page_number\"", (gogoproto.jsontag) = "page_number"];
   // Count of total pages
-  uint64 page_total = 4 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"page_total\"", (gogoproto.jsontag) = "page_total"];
+  uint64 page_total = 4 [(gogoproto.moretags) = "yaml:\"page_total\"", (gogoproto.jsontag) = "page_total"];
   // Max count txs per page
-  uint64 limit = 5 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 limit = 5;
   // List of txs in current page
   repeated TxResponse txs = 6;
 }

proto/cosmos/base/query/v1beta1/pagination.proto

@@ -21,11 +21,11 @@ message PageRequest {
   // offset is a numeric offset that can be used when key is unavailable.
   // It is less efficient than using key. Only one of offset or key should
   // be set.
-  uint64 offset = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 offset = 2;
 
   // limit is the total number of results to be returned in the result page.
   // If left empty it will default to a value to be set by each app.
-  uint64 limit = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 limit = 3;
 
   // count_total is set to true  to indicate that the result set should include
   // a count of the total number of items available for pagination in UIs.
@@ -51,5 +51,5 @@ message PageResponse {
 
   // total is total number of results available if PageRequest.count_total
   // was set, its value is undefined otherwise
-  uint64 total = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 total = 2;
 }

proto/cosmos/base/snapshots/v1beta1/snapshot.proto

@@ -8,9 +8,9 @@ option go_package = "github.com/cosmos/cosmos-sdk/snapshots/types";
 
 // Snapshot contains Tendermint state sync snapshot info.
 message Snapshot {
-  uint64   height   = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
-  uint32   format   = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
-  uint32   chunks   = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64   height   = 1;
+  uint32   format   = 2;
+  uint32   chunks   = 3;
   bytes    hash     = 4;
   Metadata metadata = 5 [(gogoproto.nullable) = false];
 }

proto/cosmos/base/store/v1beta1/commit_info.proto

@@ -9,8 +9,8 @@ option go_package = "github.com/cosmos/cosmos-sdk/store/types";
 // CommitInfo defines commit information used by the multi-store when committing
 // a version/height.
 message CommitInfo {
-  int64              version     = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
-  repeated StoreInfo store_infos = 2 [(gogoproto.nullable) = false];
+  int64              version     = 1;
+  repeated StoreInfo store_infos = 2;
 }
 
 // StoreInfo defines store-specific commit information. It contains a reference
@@ -25,6 +25,6 @@ message StoreInfo {
 message CommitID {
   option (gogoproto.goproto_stringer) = false;
 
-  int64 version = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64 version = 1;
   bytes hash    = 2;
 }

proto/cosmos/base/store/v1beta1/snapshot.proto

@@ -24,6 +24,6 @@ message SnapshotStoreItem {
 message SnapshotIAVLItem {
   bytes key     = 1;
   bytes value   = 2;
-  int64 version = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
-  int32 height  = 4 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64 version = 3;
+  int32 height  = 4;
 }

proto/cosmos/base/tendermint/v1beta1/query.proto

@@ -43,14 +43,14 @@ service Service {
 
 // GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method.
 message GetValidatorSetByHeightRequest {
-  int64 height = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64 height = 1;
   // pagination defines an pagination for the request.
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 // GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method.
 message GetValidatorSetByHeightResponse {
-  int64              block_height = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64              block_height = 1;
   repeated Validator validators   = 2;
   // pagination defines an pagination for the response.
   cosmos.base.query.v1beta1.PageResponse pagination = 3;
@@ -64,7 +64,7 @@ message GetLatestValidatorSetRequest {
 
 // GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method.
 message GetLatestValidatorSetResponse {
-  int64              block_height = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64              block_height = 1;
   repeated Validator validators   = 2;
   // pagination defines an pagination for the response.
   cosmos.base.query.v1beta1.PageResponse pagination = 3;
@@ -74,13 +74,13 @@ message GetLatestValidatorSetResponse {
 message Validator {
   string              address           = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   google.protobuf.Any pub_key           = 2;
-  int64               voting_power      = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
-  int64               proposer_priority = 4 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64               voting_power      = 3;
+  int64               proposer_priority = 4;
 }
 
 // GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method.
 message GetBlockByHeightRequest {
-  int64 height = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64 height = 1;
 }
 
 // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method.

proto/cosmos/base/v1beta1/coin.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package cosmos.base.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
 
 option go_package                       = "github.com/cosmos/cosmos-sdk/types";
 option (gogoproto.goproto_stringer_all) = false;
@@ -26,15 +27,15 @@ message DecCoin {
   option (gogoproto.equal) = true;
 
   string denom  = 1;
-  string amount = 2 [(gogoproto.customtype) = "Dec", (gogoproto.nullable) = false];
+  string amount = 2 [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "Dec", (gogoproto.nullable) = false];
 }
 
 // IntProto defines a Protobuf wrapper around an Int object.
 message IntProto {
-  string int = 1 [(gogoproto.customtype) = "Int", (gogoproto.nullable) = false];
+  string int = 1 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "Int", (gogoproto.nullable) = false];
 }
 
 // DecProto defines a Protobuf wrapper around a Dec object.
 message DecProto {
-  string dec = 1 [(gogoproto.customtype) = "Dec", (gogoproto.nullable) = false];
+  string dec = 1 [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "Dec", (gogoproto.nullable) = false];
 }

proto/cosmos/capability/v1beta1/capability.proto

@@ -9,7 +9,7 @@ import "gogoproto/gogo.proto";
 // provided to a Capability must be globally unique.
 message Capability {
   option (gogoproto.goproto_stringer) = false;
-  uint64 index = 1 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"index\""];
+  uint64 index = 1 [(gogoproto.moretags) = "yaml:\"index\""];
 }
 
 // Owner defines a single capability owner. An owner is defined by the name of

proto/cosmos/capability/v1beta1/genesis.proto

@@ -3,14 +3,13 @@ package cosmos.capability.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/capability/v1beta1/capability.proto";
-import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/capability/types";
 
 // GenesisOwners defines the capability owners with their corresponding index.
 message GenesisOwners {
   // index is the index of the capability owner.
-  uint64 index = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 index = 1;
 
   // index_owners are the owners at the given index.
   CapabilityOwners index_owners = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"index_owners\""];
@@ -19,7 +18,7 @@ message GenesisOwners {
 // GenesisState defines the capability module's genesis state.
 message GenesisState {
   // index is the capability global index.
-  uint64 index = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 index = 1;
 
   // owners represents a map from index to owners of the capability index
   // index key is string to allow amino marshalling.

proto/cosmos/crypto/multisig/keys.proto

@@ -3,7 +3,6 @@ package cosmos.crypto.multisig;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
-import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/multisig";
 
@@ -13,7 +12,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/multisig";
 message LegacyAminoPubKey {
   option (gogoproto.goproto_getters) = false;
 
-  uint32   threshold                       = 1 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"threshold\""];
+  uint32   threshold                       = 1 [(gogoproto.moretags) = "yaml:\"threshold\""];
   repeated google.protobuf.Any public_keys = 2
       [(gogoproto.customname) = "PubKeys", (gogoproto.moretags) = "yaml:\"pubkeys\""];
 }

proto/cosmos/crypto/multisig/v1beta1/multisig.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 package cosmos.crypto.multisig.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/crypto/types";
 
@@ -21,6 +20,6 @@ message MultiSignature {
 message CompactBitArray {
   option (gogoproto.goproto_stringer) = false;
 
-  uint32 extra_bits_stored = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint32 extra_bits_stored = 1;
   bytes  elems             = 2;
 }

proto/cosmos/distribution/v1beta1/distribution.proto

@@ -6,6 +6,7 @@ option (gogoproto.equal_all) = true;
 
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "cosmos_proto/cosmos.proto";
 
 // Params defines the set of params for the distribution module.
 message Params {
@@ -81,7 +82,7 @@ message ValidatorOutstandingRewards {
 // for delegations which are withdrawn after a slash has occurred.
 message ValidatorSlashEvent {
   uint64 validator_period = 1 [(gogoproto.moretags) = "yaml:\"validator_period\""];
-  string fraction = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string fraction = 2 [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
 // ValidatorSlashEvents is a collection of ValidatorSlashEvent messages.
@@ -124,6 +125,7 @@ message CommunityPoolSpendProposal {
 message DelegatorStartingInfo {
   uint64 previous_period = 1 [(gogoproto.moretags) = "yaml:\"previous_period\""];
   string stake           = 2 [
+    (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.moretags)   = "yaml:\"stake\"",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable)   = false
@@ -137,7 +139,10 @@ message DelegationDelegatorReward {
   option (gogoproto.goproto_getters)  = false;
   option (gogoproto.goproto_stringer) = true;
 
-  string validator_address = 1 [(gogoproto.moretags) = "yaml:\"validator_address\""];
+  string validator_address = 1 [
+    (cosmos_proto.scalar) = "cosmos.AddressString", 
+    (gogoproto.moretags) = "yaml:\"validator_address\""
+  ];
 
   repeated cosmos.base.v1beta1.DecCoin reward = 2
       [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false];

proto/cosmos/distribution/v1beta1/genesis.proto

@@ -63,7 +63,7 @@ message ValidatorHistoricalRewardsRecord {
   string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""];
 
   // period defines the period the historical rewards apply to.
-  uint64 period = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  uint64 period = 2;
 
   // rewards defines the historical rewards of a validator.
   ValidatorHistoricalRewards rewards = 3 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"rewards\""];
@@ -105,9 +105,9 @@ message ValidatorSlashEventRecord {
   // validator_address is the address of the validator.
   string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""];
   // height defines the block height at which the slash event occured.
-  uint64 height = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 height = 2;
   // period is the period of the slash event.
-  uint64 period = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 period = 3;
   // validator_slash_event describes the slash event.
   ValidatorSlashEvent validator_slash_event = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"event\""];
 }

proto/cosmos/distribution/v1beta1/query.proto

@@ -110,9 +110,9 @@ message QueryValidatorSlashesRequest {
   // validator_address defines the validator address to query for.
   string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // starting_height defines the optional starting height to query the slashes.
-  uint64 starting_height = 2 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 starting_height = 2;
   // starting_height defines the optional ending height to query the slashes.
-  uint64 ending_height = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
+  uint64 ending_height = 3;
   // pagination defines an optional pagination for the request.
   cosmos.base.query.v1beta1.PageRequest pagination = 4;
 }

proto/cosmos/evidence/v1beta1/evidence.proto

@@ -15,8 +15,8 @@ message Equivocation {
   option (gogoproto.goproto_getters)  = false;
   option (gogoproto.equal)            = false;
 
-  int64                     height            = 1 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64                     height            = 1 ;
   google.protobuf.Timestamp time              = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
-  int64                     power             = 3 [(cosmos_proto.scalar) = "cosmos.Int"];
+  int64                     power             = 3 ;
   string                    consensus_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"consensus_address\""];
 }

proto/cosmos/gov/v1beta1/genesis.proto

@@ -4,14 +4,13 @@ package cosmos.gov.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/gov/v1beta1/gov.proto";
-import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
 
 // GenesisState defines the gov module's genesis state.
 message GenesisState {
   // starting_proposal_id is the ID of the starting proposal.
-  uint64 starting_proposal_id = 1 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.moretags) = "yaml:\"starting_proposal_id\""];
+  uint64 starting_proposal_id = 1 [(gogoproto.moretags) = "yaml:\"starting_proposal_id\""];
   // deposits defines all the deposits present at genesis.
   repeated Deposit deposits = 2 [(gogoproto.castrepeated) = "Deposits", (gogoproto.nullable) = false];
   // votes defines all the votes present at genesis.