From 476ab3d45ea186d24a02c56d71b0e1ac1a082aa4 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Sat, 17 Dec 2022 16:17:10 -0800 Subject: [PATCH 1/3] add annotations for client tooling and codegen --- .../pool-models/balancer/balancerPool.proto | 4 ++++ .../gamm/pool-models/balancer/tx/tx.proto | 3 +++ .../stableswap/stableswap_pool.proto | 4 ++++ .../gamm/pool-models/stableswap/tx.proto | 5 +++++ proto/osmosis/gamm/v1beta1/tx.proto | 17 +++++++++++++++++ proto/osmosis/incentives/tx.proto | 5 +++++ proto/osmosis/lockup/tx.proto | 7 +++++++ proto/osmosis/pool-incentives/v1beta1/gov.proto | 7 ++++++- proto/osmosis/protorev/v1beta1/gov.proto | 3 +++ proto/osmosis/protorev/v1beta1/tx.proto | 5 +++++ proto/osmosis/superfluid/tx.proto | 11 +++++++++++ proto/osmosis/superfluid/v1beta1/gov.proto | 8 ++++++++ proto/osmosis/tokenfactory/v1beta1/tx.proto | 9 +++++++++ proto/osmosis/txfees/v1beta1/gov.proto | 5 +++++ proto/osmosis/valset-pref/v1beta1/tx.proto | 9 +++++++++ 15 files changed, 101 insertions(+), 1 deletion(-) diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto index 6ee8f13314d..cc2073ef924 100644 --- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto +++ b/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\"", @@ -111,6 +114,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; diff --git a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto b/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto index 5ed0fdc070e..909489d642b 100644 --- a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto +++ b/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"; option go_package = "github.com/osmosis-labs/osmosis/v13/x/gamm/pool-models/balancer"; @@ -13,6 +14,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 diff --git a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto index 582a37b3ec5..9cc823c3ef5 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto +++ b/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/v13/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\"", @@ -34,6 +37,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; diff --git a/proto/osmosis/gamm/pool-models/stableswap/tx.proto b/proto/osmosis/gamm/pool-models/stableswap/tx.proto index 73a74b06255..c2c5a05537f 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/tx.proto +++ b/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/v13/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" ]; diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto index 1e0c3b61d10..4a734a0bdb1 100644 --- a/proto/osmosis/gamm/v1beta1/tx.proto +++ b/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"; option go_package = "github.com/osmosis-labs/osmosis/v13/x/gamm/types"; @@ -26,6 +27,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 [ @@ -53,6 +56,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 [ @@ -82,6 +87,8 @@ message SwapAmountInRoute { } message MsgSwapExactAmountIn { + option (amino.name) = "osmosis/gamm/swap-exact-amount-in"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; repeated SwapAmountInRoute routes = 2 [ (gogoproto.nullable) = false ]; cosmos.base.v1beta1.Coin token_in = 3 [ @@ -111,6 +118,8 @@ message SwapAmountOutRoute { } message MsgSwapExactAmountOut { + option (amino.name) = "osmosis/gamm/swap-exact-amount-out"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; repeated SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ]; string token_in_max_amount = 3 [ @@ -135,6 +144,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 [ @@ -162,6 +173,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 @@ -188,6 +201,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 @@ -214,6 +229,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 [ diff --git a/proto/osmosis/incentives/tx.proto b/proto/osmosis/incentives/tx.proto index b0881650769..9d7e09de1cb 100644 --- a/proto/osmosis/incentives/tx.proto +++ b/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 diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto index 9d5c0642533..d17846954dc 100644 --- a/proto/osmosis/lockup/tx.proto +++ b/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. diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index d37925236d2..1107a658717 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/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/v13/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; diff --git a/proto/osmosis/protorev/v1beta1/gov.proto b/proto/osmosis/protorev/v1beta1/gov.proto index b73033f69a4..daa20697a60 100644 --- a/proto/osmosis/protorev/v1beta1/gov.proto +++ b/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/v13/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; diff --git a/proto/osmosis/protorev/v1beta1/tx.proto b/proto/osmosis/protorev/v1beta1/tx.proto index dca2fcfbdf3..57976b3d369 100644 --- a/proto/osmosis/protorev/v1beta1/tx.proto +++ b/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"; @@ -25,6 +26,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; // hot_routes is the list of hot routes to set. @@ -36,6 +39,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; // developer_account is the account that will receive a portion of the profits diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto index 67b4a915150..2d0b371ec1b 100644 --- a/proto/osmosis/superfluid/tx.proto +++ b/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 "osmosis/superfluid/superfluid.proto"; @@ -36,6 +37,8 @@ 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; @@ -43,12 +46,16 @@ message MsgSuperfluidDelegate { 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; } @@ -65,6 +72,8 @@ message MsgSuperfluidUnbondLockResponse {} // 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, @@ -83,6 +92,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\"" ]; } diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto index dea2dc8732c..72d871c5853 100644 --- a/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/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/v13/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; diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 938b1fa9e78..1d81d36f41d 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package osmosis.tokenfactory.v1beta1; import "gogoproto/gogo.proto"; +import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/bank.proto"; @@ -31,6 +32,8 @@ service Msg { // originally set to be the creator, but this can be changed later. The token // denom does not indicate the current admin. message MsgCreateDenom { + option (amino.name) = "osmosis/tokenfactory/create-denom"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; // subdenom can be up to 44 "alphanumeric" characters long. string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ]; @@ -46,6 +49,8 @@ message MsgCreateDenomResponse { // MsgMint is the sdk.Msg type for allowing an admin account to mint // more of a token. For now, we only support minting to the sender account message MsgMint { + option (amino.name) = "osmosis/tokenfactory/mint"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.moretags) = "yaml:\"amount\"", @@ -58,6 +63,8 @@ message MsgMintResponse {} // MsgBurn is the sdk.Msg type for allowing an admin account to burn // a token. For now, we only support burning from the sender account. message MsgBurn { + option (amino.name) = "osmosis/tokenfactory/burn"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.moretags) = "yaml:\"amount\"", @@ -70,6 +77,8 @@ message MsgBurnResponse {} // MsgChangeAdmin is the sdk.Msg type for allowing an admin account to reassign // adminship of a denom to a new account message MsgChangeAdmin { + option (amino.name) = "osmosis/tokenfactory/change-admin"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ]; diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto index 16ab174133c..a1ee1c4f041 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; option go_package = "github.com/osmosis-labs/osmosis/v13/x/txfees/types"; @@ -12,6 +14,9 @@ option go_package = "github.com/osmosis-labs/osmosis/v13/x/txfees/types"; // used to update the Pool to associate with the denom. If Pool ID is set to 0, // it will remove the denom from the whitelisted set. message UpdateFeeTokenProposal { + option (amino.name) = "osmosis/UpdateFeeTokenProposal"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; + option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; diff --git a/proto/osmosis/valset-pref/v1beta1/tx.proto b/proto/osmosis/valset-pref/v1beta1/tx.proto index ac0b4ffefa2..1e1a5ab250b 100644 --- a/proto/osmosis/valset-pref/v1beta1/tx.proto +++ b/proto/osmosis/valset-pref/v1beta1/tx.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package osmosis.valsetpref.v1beta1; import "gogoproto/gogo.proto"; +import "amino/amino.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/valset-pref/v1beta1/state.proto"; @@ -39,6 +40,8 @@ service Msg { // MsgCreateValidatorSetPreference is a list that holds validator-set. message MsgSetValidatorSetPreference { + option (amino.name) = "osmosis/valset-pref/MsgSetValidatorSetPreference"; + // delegator is the user who is trying to create a validator-set. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -54,6 +57,8 @@ message MsgSetValidatorSetPreferenceResponse {} // MsgDelegateToValidatorSet allows users to delegate to an existing // validator-set message MsgDelegateToValidatorSet { + option (amino.name) = "osmosis/valset-pref/MsgDelegateToValidatorSet"; + // delegator is the user who is trying to delegate. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -70,6 +75,8 @@ message MsgDelegateToValidatorSet { message MsgDelegateToValidatorSetResponse {} message MsgUndelegateFromValidatorSet { + option (amino.name) = "osmosis/valset-pref/MsgUndelegateFromValidatorSet"; + // delegator is the user who is trying to undelegate. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -102,6 +109,8 @@ message MsgRedelegateValidatorSetResponse {} // MsgWithdrawDelegationRewards allows user to claim staking rewards from the // validator set. message MsgWithdrawDelegationRewards { + option (amino.name) = "osmosis/valset-pref/MsgWithdrawDelegationRewards"; + // delegator is the user who is trying to claim staking rewards. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; } From 72b34ce5fe8f633d094e2add73e0704c21d09765 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Sat, 17 Dec 2022 17:53:53 -0800 Subject: [PATCH 2/3] simple interface namespace --- proto/osmosis/pool-incentives/v1beta1/gov.proto | 4 ++-- proto/osmosis/protorev/v1beta1/gov.proto | 4 ++-- proto/osmosis/superfluid/v1beta1/gov.proto | 6 +++--- proto/osmosis/txfees/v1beta1/gov.proto | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index 1107a658717..a065ba6cb45 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -19,7 +19,7 @@ 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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; @@ -46,7 +46,7 @@ message UpdatePoolIncentivesProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; option (amino.name) = "osmosis/UpdatePoolIncentivesProposal"; - option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/protorev/v1beta1/gov.proto b/proto/osmosis/protorev/v1beta1/gov.proto index daa20697a60..e0ce3b6fa46 100644 --- a/proto/osmosis/protorev/v1beta1/gov.proto +++ b/proto/osmosis/protorev/v1beta1/gov.proto @@ -13,7 +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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; @@ -27,7 +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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto index 72d871c5853..e0d8e67df45 100644 --- a/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/proto/osmosis/superfluid/v1beta1/gov.proto @@ -15,7 +15,7 @@ message SetSuperfluidAssetsProposal { 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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; @@ -29,7 +29,7 @@ message RemoveSuperfluidAssetsProposal { 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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; @@ -43,7 +43,7 @@ message UpdateUnpoolWhiteListProposal { 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"; + option (cosmos_proto.implements_interface) = "Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto index a1ee1c4f041..20526900c09 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -15,7 +15,7 @@ option go_package = "github.com/osmosis-labs/osmosis/v13/x/txfees/types"; // it will remove the denom from the whitelisted set. message UpdateFeeTokenProposal { option (amino.name) = "osmosis/UpdateFeeTokenProposal"; - option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; + option (cosmos_proto.implements_interface) = "Content"; option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; From 2a762f6155a030c18f082957f638f24d09af3e7a Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Sat, 17 Dec 2022 21:10:11 -0800 Subject: [PATCH 3/3] Revert "simple interface namespace" This reverts commit 72b34ce5fe8f633d094e2add73e0704c21d09765. --- proto/osmosis/pool-incentives/v1beta1/gov.proto | 4 ++-- proto/osmosis/protorev/v1beta1/gov.proto | 4 ++-- proto/osmosis/superfluid/v1beta1/gov.proto | 6 +++--- proto/osmosis/txfees/v1beta1/gov.proto | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index a065ba6cb45..1107a658717 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -19,7 +19,7 @@ message ReplacePoolIncentivesProposal { option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; @@ -46,7 +46,7 @@ message UpdatePoolIncentivesProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; option (amino.name) = "osmosis/UpdatePoolIncentivesProposal"; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/protorev/v1beta1/gov.proto b/proto/osmosis/protorev/v1beta1/gov.proto index e0ce3b6fa46..daa20697a60 100644 --- a/proto/osmosis/protorev/v1beta1/gov.proto +++ b/proto/osmosis/protorev/v1beta1/gov.proto @@ -13,7 +13,7 @@ message SetProtoRevEnabledProposal { option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; @@ -27,7 +27,7 @@ message SetProtoRevAdminAccountProposal { option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto index e0d8e67df45..72d871c5853 100644 --- a/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/proto/osmosis/superfluid/v1beta1/gov.proto @@ -15,7 +15,7 @@ message SetSuperfluidAssetsProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; option (amino.name) = "osmosis/set-superfluid-assets-proposal"; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; @@ -29,7 +29,7 @@ message RemoveSuperfluidAssetsProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; option (amino.name) = "osmosis/del-superfluid-assets-proposal"; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; @@ -43,7 +43,7 @@ message UpdateUnpoolWhiteListProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; option (amino.name) = "osmosis/update-unpool-whitelist"; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto index 20526900c09..a1ee1c4f041 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -15,7 +15,7 @@ option go_package = "github.com/osmosis-labs/osmosis/v13/x/txfees/types"; // it will remove the denom from the whitelisted set. message UpdateFeeTokenProposal { option (amino.name) = "osmosis/UpdateFeeTokenProposal"; - option (cosmos_proto.implements_interface) = "Content"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; option (gogoproto.equal) = true; option (gogoproto.goproto_getters) = false;