add annotations for client tooling and codegen

proto/osmosis/gamm/pool-models/balancer/balancerPool.proto

@@ -7,6 +7,7 @@ package osmosis.gamm.v1beta1;
 
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
@@ -74,6 +75,8 @@ message SmoothWeightChangeParams {
 // governance. Instead they will be managed by the token holders of the pool.
 // The pool's token holders are specified in future_pool_governor.
 message PoolParams {
+  option (amino.name) = "osmosis/gamm/BalancerPoolParams";
+
   string swap_fee = 1 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.moretags) = "yaml:\"swap_fee\"",
@@ -114,6 +117,7 @@ message Pool {
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
   option (cosmos_proto.implements_interface) = "PoolI";
+  option (amino.name) = "osmosis/gamm/BalancerPool";
 
   string address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ];
   uint64 id = 2;

proto/osmosis/gamm/pool-models/balancer/tx/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.gamm.poolmodels.balancer.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "osmosis/gamm/pool-models/balancer/balancerPool.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
@@ -18,6 +19,8 @@ service Msg {
 
 // ===================== MsgCreatePool
 message MsgCreateBalancerPool {
+  option (amino.name) = "osmosis/gamm/create-balancer-pool";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
 
   osmosis.gamm.v1beta1.PoolParams pool_params = 2

proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto

@@ -3,6 +3,7 @@ package osmosis.gamm.poolmodels.stableswap.v1beta1;
 
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
@@ -17,6 +18,8 @@ option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stab
 // governance. Instead they will be managed by the token holders of the pool.
 // The pool's token holders are specified in future_pool_governor.
 message PoolParams {
+  option (amino.name) = "osmosis/gamm/StableswapPoolParams";
+
   string swap_fee = 1 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.moretags) = "yaml:\"swap_fee\"",
@@ -37,6 +40,7 @@ message Pool {
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
   option (cosmos_proto.implements_interface) = "PoolI";
+  option (amino.name) = "osmosis/gamm/StableswapPool";
 
   string address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ];
   uint64 id = 2;

proto/osmosis/gamm/pool-models/stableswap/tx.proto

@@ -3,6 +3,7 @@ package osmosis.gamm.poolmodels.stableswap.v1beta1;
 
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "osmosis/gamm/pool-models/stableswap/stableswap_pool.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap";
@@ -16,6 +17,8 @@ service Msg {
 
 // ===================== MsgCreatePool
 message MsgCreateStableswapPool {
+  option (amino.name) = "osmosis/gamm/create-stableswap-pool";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
 
   PoolParams pool_params = 2 [ (gogoproto.moretags) = "yaml:\"pool_params\"" ];
@@ -43,6 +46,8 @@ message MsgCreateStableswapPoolResponse {
 // Sender must be the pool's scaling_factor_governor in order for the tx to
 // succeed. Adjusts stableswap scaling factors.
 message MsgStableSwapAdjustScalingFactors {
+  option (amino.name) = "osmosis/gamm/stableswap-adjust-scaling-factors";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.customname) = "PoolID" ];
 

proto/osmosis/gamm/v1beta1/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.gamm.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/swap_route.proto";
 
@@ -27,6 +28,8 @@ service Msg {
 // ===================== MsgJoinPool
 // This is really MsgJoinPoolNoSwap
 message MsgJoinPool {
+  option (amino.name) = "osmosis/gamm/join-pool";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string share_out_amount = 3 [
@@ -54,6 +57,8 @@ message MsgJoinPoolResponse {
 
 // ===================== MsgExitPool
 message MsgExitPool {
+  option (amino.name) = "osmosis/gamm/exit-pool";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string share_in_amount = 3 [
@@ -77,6 +82,8 @@ message MsgExitPoolResponse {
 
 // ===================== MsgSwapExactAmountIn
 message MsgSwapExactAmountIn {
+  option (amino.name) = "osmosis/gamm/swap-exact-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated osmosis.poolmanager.v1beta1.SwapAmountInRoute routes = 2
       [ (gogoproto.nullable) = false ];
@@ -100,6 +107,8 @@ message MsgSwapExactAmountInResponse {
 }
 
 message MsgSwapExactAmountOut {
+  option (amino.name) = "osmosis/gamm/swap-exact-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated osmosis.poolmanager.v1beta1.SwapAmountOutRoute routes = 2
       [ (gogoproto.nullable) = false ];
@@ -125,6 +134,8 @@ message MsgSwapExactAmountOutResponse {
 // ===================== MsgJoinSwapExternAmountIn
 // TODO: Rename to MsgJoinSwapExactAmountIn
 message MsgJoinSwapExternAmountIn {
+  option (amino.name) = "osmosis/gamm/join-swap-extern-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   cosmos.base.v1beta1.Coin token_in = 3 [
@@ -152,6 +163,8 @@ message MsgJoinSwapExternAmountInResponse {
 
 // ===================== MsgJoinSwapShareAmountOut
 message MsgJoinSwapShareAmountOut {
+  option (amino.name) = "osmosis/gamm/join-swap-share-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string token_in_denom = 3
@@ -178,6 +191,8 @@ message MsgJoinSwapShareAmountOutResponse {
 
 // ===================== MsgExitSwapShareAmountIn
 message MsgExitSwapShareAmountIn {
+  option (amino.name) = "osmosis/gamm/exit-swap-share-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string token_out_denom = 3
@@ -204,6 +219,8 @@ message MsgExitSwapShareAmountInResponse {
 
 // ===================== MsgExitSwapExternAmountOut
 message MsgExitSwapExternAmountOut {
+  option (amino.name) = "osmosis/gamm/exit-swap-extern-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   cosmos.base.v1beta1.Coin token_out = 3 [

proto/osmosis/incentives/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.incentives;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/incentives/gauge.proto";
@@ -16,6 +17,8 @@ service Msg {
 
 // MsgCreateGauge creates a gague to distribute rewards to users
 message MsgCreateGauge {
+  option (amino.name) = "osmosis/incentives/create-gauge";
+
   // is_perpetual shows if it's a perpetual or non-perpetual gauge
   // Non-perpetual gauges distribute their tokens equally per epoch while the
   // gauge is in the active period. Perpetual gauges distribute all their tokens
@@ -47,6 +50,8 @@ message MsgCreateGaugeResponse {}
 
 // MsgAddToGauge adds coins to a previously created gauge
 message MsgAddToGauge {
+  option (amino.name) = "osmosis/incentives/add-to-gauge";
+
   // owner is the gauge owner's address
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   // gauge_id is the ID of gauge that rewards are getting added to

proto/osmosis/lockup/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.lockup;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/lockup/lock.proto";
@@ -23,6 +24,8 @@ service Msg {
 }
 
 message MsgLockTokens {
+  option (amino.name) = "osmosis/lockup/lock-tokens";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 2 [
     (gogoproto.nullable) = false,
@@ -38,11 +41,15 @@ message MsgLockTokens {
 message MsgLockTokensResponse { uint64 ID = 1; }
 
 message MsgBeginUnlockingAll {
+  option (amino.name) = "osmosis/lockup/begin-unlock-tokens";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 }
 message MsgBeginUnlockingAllResponse { repeated PeriodLock unlocks = 1; }
 
 message MsgBeginUnlocking {
+  option (amino.name) = "osmosis/lockup/begin-unlock-period-lock";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
   // Amount of unlocking coins. Unlock all if not set.

proto/osmosis/pool-incentives/v1beta1/gov.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 package osmosis.poolincentives.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
+import "amino/amino.proto";
 import "osmosis/pool-incentives/v1beta1/incentives.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types";
@@ -17,7 +19,8 @@ message ReplacePoolIncentivesProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
-
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+
   string title = 1;
   string description = 2;
   repeated DistrRecord records = 3 [ (gogoproto.nullable) = false ];
@@ -42,6 +45,8 @@ message UpdatePoolIncentivesProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (amino.name) = "osmosis/UpdatePoolIncentivesProposal";
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;

proto/osmosis/protorev/v1beta1/gov.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.protorev.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
 import "osmosis/protorev/v1beta1/protorev.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
@@ -12,6 +13,7 @@ message SetProtoRevEnabledProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;
@@ -25,6 +27,7 @@ message SetProtoRevAdminAccountProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;

proto/osmosis/protorev/v1beta1/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.protorev.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/api/annotations.proto";
 import "osmosis/protorev/v1beta1/protorev.proto";
 import "cosmos_proto/cosmos.proto";
@@ -54,6 +55,8 @@ service Msg {
 
 // MsgSetHotRoutes defines the Msg/SetHotRoutes request type.
 message MsgSetHotRoutes {
+  option (amino.name) = "osmosis/MsgSetHotRoutes";
+
   // admin is the account that is authorized to set the hot routes.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
@@ -71,6 +74,8 @@ message MsgSetHotRoutesResponse {}
 
 // MsgSetDeveloperAccount defines the Msg/SetDeveloperAccount request type.
 message MsgSetDeveloperAccount {
+  option (amino.name) = "osmosis/MsgSetDeveloperAccount";
+
   // admin is the account that is authorized to set the developer account.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",

proto/osmosis/superfluid/tx.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.superfluid;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
@@ -46,19 +47,25 @@ service Msg {
 }
 
 message MsgSuperfluidDelegate {
+  option (amino.name) = "osmosis/superfluid-delegate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 lock_id = 2;
   string val_addr = 3;
 }
 message MsgSuperfluidDelegateResponse {}
 
 message MsgSuperfluidUndelegate {
+  option (amino.name) = "osmosis/superfluid-undelegate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 lock_id = 2;
 }
 message MsgSuperfluidUndelegateResponse {}
 
 message MsgSuperfluidUnbondLock {
+  option (amino.name) = "osmosis/superfluid-unbond-lock";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 lock_id = 2;
 }
@@ -84,6 +91,8 @@ message MsgSuperfluidUndelegateAndUnbondLockResponse {}
 // and then does a superfluid lock from the newly created lockup, to the
 // specified validator addr.
 message MsgLockAndSuperfluidDelegate {
+  option (amino.name) = "osmosis/lock-and-superfluid-delegate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated cosmos.base.v1beta1.Coin coins = 2 [
     (gogoproto.nullable) = false,
@@ -102,6 +111,8 @@ message MsgLockAndSuperfluidDelegateResponse { uint64 ID = 1; }
 // If the lock was unbonding, the new lockup durations should be the time left
 // until unbond completion.
 message MsgUnPoolWhitelistedPool {
+  option (amino.name) = "osmosis/unpool-whitelisted-pool";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
 }

proto/osmosis/superfluid/v1beta1/gov.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 package osmosis.superfluid.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
+import "cosmos_proto/cosmos.proto";
 import "osmosis/superfluid/superfluid.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
@@ -12,6 +14,8 @@ message SetSuperfluidAssetsProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (amino.name) = "osmosis/set-superfluid-assets-proposal";
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;
@@ -24,6 +28,8 @@ message RemoveSuperfluidAssetsProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (amino.name) = "osmosis/del-superfluid-assets-proposal";
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;
@@ -36,6 +42,8 @@ message UpdateUnpoolWhiteListProposal {
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
+  option (amino.name) = "osmosis/update-unpool-whitelist";
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string title = 1;
   string description = 2;