[Chore] Add amino name for tx msgs (#5784)

* updated amino name * updated (cherry picked from commit 1e3149f) # Conflicts: # proto/osmosis/tokenfactory/v1beta1/tx.proto # x/tokenfactory/types/tx.pb.go
osmosis-labs · Jul 7, 2023 · 8d7b744 · 8d7b744
1 parent d72fe81
commit 8d7b744
Show file tree

Hide file tree

Showing 14 changed files with 456 additions and 310 deletions.
diff --git a/proto/osmosis/concentrated-liquidity/tx.proto b/proto/osmosis/concentrated-liquidity/tx.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
@@ -26,6 +27,8 @@ service Msg {
 
 // ===================== MsgCreatePosition
 message MsgCreatePosition {
+  option (amino.name) = "osmosis/cl-create-position";
+
   uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   int64 lower_tick = 3 [ (gogoproto.moretags) = "yaml:\"lower_tick\"" ];
@@ -77,6 +80,8 @@ message MsgCreatePositionResponse {
 
 // ===================== MsgAddToPosition
 message MsgAddToPosition {
+  option (amino.name) = "osmosis/cl-add-to-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   // amount0 represents the amount of token0 willing to put in.
@@ -127,6 +132,8 @@ message MsgAddToPositionResponse {
 
 // ===================== MsgWithdrawPosition
 message MsgWithdrawPosition {
+  option (amino.name) = "osmosis/cl-withdraw-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   string liquidity_amount = 3 [
@@ -151,6 +158,8 @@ message MsgWithdrawPositionResponse {
 
 // ===================== MsgCollectSpreadRewards
 message MsgCollectSpreadRewards {
+  option (amino.name) = "osmosis/cl-col-sp-rewards";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
@@ -166,6 +175,8 @@ message MsgCollectSpreadRewardsResponse {
 
 // ===================== MsgCollectIncentives
 message MsgCollectIncentives {
+  option (amino.name) = "osmosis/cl-collect-incentives";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
@@ -186,6 +197,8 @@ message MsgCollectIncentivesResponse {
 
 // ===================== MsgFungifyChargedPositions
 message MsgFungifyChargedPositions {
+  option (amino.name) = "osmosis/cl-fungify-charged-positions";
+
   repeated uint64 position_ids = 1
       [ (gogoproto.moretags) = "yaml:\"position_ids\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];

diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto
@@ -69,6 +69,8 @@ message MsgBeginUnlockingResponse {
 // MsgExtendLockup extends the existing lockup's duration.
 // The new duration is longer than the original.
 message MsgExtendLockup {
+  option (amino.name) = "osmosis/lockup/extend-lockup";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
 
@@ -89,6 +91,8 @@ message MsgExtendLockupResponse { bool success = 1; }
 // MsgForceUnlock unlocks locks immediately for
 // addresses registered via governance.
 message MsgForceUnlock {
+  option (amino.name) = "osmosis/lockup/force-unlock-tokens";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
   // Amount of unlocking coins. Unlock all if not set.
@@ -101,6 +105,8 @@ message MsgForceUnlock {
 message MsgForceUnlockResponse { bool success = 1; }
 
 message MsgSetRewardReceiverAddress {
+  option (amino.name) = "osmosis/lockup/set-reward-receiver-address";
+
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 lockID = 2;
   string reward_receiver = 3

diff --git a/proto/osmosis/poolmanager/v1beta1/tx.proto b/proto/osmosis/poolmanager/v1beta1/tx.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package osmosis.poolmanager.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/swap_route.proto";
 
@@ -20,6 +21,8 @@ service Msg {
 
 // ===================== MsgSwapExactAmountIn
 message MsgSwapExactAmountIn {
+  option (amino.name) = "osmosis/poolmanager/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 [
@@ -43,6 +46,8 @@ message MsgSwapExactAmountInResponse {
 
 // ===================== MsgSplitRouteSwapExactAmountIn
 message MsgSplitRouteSwapExactAmountIn {
+  option (amino.name) = "osmosis/poolmanager/split-amount-in";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountInSplitRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_in_denom = 3
@@ -64,6 +69,8 @@ message MsgSplitRouteSwapExactAmountInResponse {
 
 // ===================== MsgSwapExactAmountOut
 message MsgSwapExactAmountOut {
+  option (amino.name) = "osmosis/poolmanager/swap-exact-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_in_max_amount = 3 [
@@ -87,6 +94,8 @@ message MsgSwapExactAmountOutResponse {
 
 // ===================== MsgSplitRouteSwapExactAmountOut
 message MsgSplitRouteSwapExactAmountOut {
+  option (amino.name) = "osmosis/poolmanager/split-amount-out";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated SwapAmountOutSplitRoute routes = 2 [ (gogoproto.nullable) = false ];
   string token_out_denom = 3

diff --git a/proto/osmosis/protorev/v1beta1/tx.proto b/proto/osmosis/protorev/v1beta1/tx.proto
@@ -93,6 +93,8 @@ message MsgSetDeveloperAccountResponse {}
 
 // MsgSetPoolWeights defines the Msg/SetPoolWeights request type.
 message MsgSetPoolWeights {
+  option (amino.name) = "osmosis/MsgSetPoolWeights";
+
   // admin is the account that is authorized to set the pool weights.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
@@ -110,6 +112,8 @@ message MsgSetPoolWeightsResponse {}
 
 // MsgSetMaxPoolPointsPerTx defines the Msg/SetMaxPoolPointsPerTx request type.
 message MsgSetMaxPoolPointsPerTx {
+  option (amino.name) = "osmosis/MsgSetMaxPoolPointsPerTx";
+
   // admin is the account that is authorized to set the max pool points per tx.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",
@@ -128,6 +132,8 @@ message MsgSetMaxPoolPointsPerTxResponse {}
 // MsgSetMaxPoolPointsPerBlock defines the Msg/SetMaxPoolPointsPerBlock request
 // type.
 message MsgSetMaxPoolPointsPerBlock {
+  option (amino.name) = "osmosis/MsgSetPoolWeights";
+
   // admin is the account that is authorized to set the max pool points per
   // block.
   string admin = 1 [
@@ -146,6 +152,8 @@ message MsgSetMaxPoolPointsPerBlockResponse {}
 
 // MsgSetBaseDenoms defines the Msg/SetBaseDenoms request type.
 message MsgSetBaseDenoms {
+  option (amino.name) = "osmosis/MsgSetBaseDenoms";
+
   // admin is the account that is authorized to set the base denoms.
   string admin = 1 [
     (gogoproto.moretags) = "yaml:\"admin\"",

diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto
@@ -122,6 +122,8 @@ message MsgLockAndSuperfluidDelegateResponse { uint64 ID = 1; }
 // MsgCreateFullRangePositionAndSuperfluidDelegate creates a full range position
 // in a concentrated liquidity pool, then superfluid delegates.
 message MsgCreateFullRangePositionAndSuperfluidDelegate {
+  option (amino.name) = "osmosis/full-range-and-sf-delegate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   repeated cosmos.base.v1beta1.Coin coins = 2 [
     (gogoproto.nullable) = false,
@@ -157,6 +159,8 @@ message MsgUnPoolWhitelistedPoolResponse {
 // =====================
 // MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition
 message MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition {
+  option (amino.name) = "osmosis/unlock-and-migrate";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   int64 lock_id = 2 [ (gogoproto.moretags) = "yaml:\"lock_id\"" ];
   cosmos.base.v1beta1.Coin shares_to_migrate = 3 [
@@ -196,6 +200,8 @@ message MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse {
 
 // ===================== MsgAddToConcentratedLiquiditySuperfluidPosition
 message MsgAddToConcentratedLiquiditySuperfluidPosition {
+  option (amino.name) = "osmosis/add-to-cl-superfluid-position";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   cosmos.base.v1beta1.Coin token_desired0 = 3 [
@@ -233,6 +239,8 @@ message MsgAddToConcentratedLiquiditySuperfluidPositionResponse {
 
 // ===================== MsgLockExistingFullRangePositionAndSFStake
 message MsgLockExistingFullRangePositionAndSFStake {
+  option (amino.name) = "osmosis/lock-existing-full-range-and-sf-stake";
+
   uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ];
   string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   string val_addr = 3 [ (gogoproto.moretags) = "yaml:\"val_addr\"" ];

diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto
@@ -89,6 +89,7 @@ message MsgChangeAdmin {
 // MsgChangeAdmin message.
 message MsgChangeAdminResponse {}
 
+<<<<<<< HEAD
 // // MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
 // // assign a CosmWasm contract to call with a BeforeSend hook
 // message MsgSetBeforeSendHook {
@@ -97,6 +98,18 @@ message MsgChangeAdminResponse {}
 //   string cosmwasm_address = 3
 //       [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
 // }
+=======
+// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
+// assign a CosmWasm contract to call with a BeforeSend hook
+message MsgSetBeforeSendHook {
+  option (amino.name) = "osmosis/tokenfactory/set-beforesend-hook";
+
+  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
+  string cosmwasm_address = 3
+      [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
+}
+>>>>>>> 1e3149f0 ([Chore] Add amino name for tx msgs (#5784))
 
 // // MsgSetBeforeSendHookResponse defines the response structure for an
 // executed
@@ -118,6 +131,8 @@ message MsgSetDenomMetadata {
 message MsgSetDenomMetadataResponse {}
 
 message MsgForceTransfer {
+  option (amino.name) = "osmosis/tokenfactory/force-transfer";
+
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   cosmos.base.v1beta1.Coin amount = 2 [
     (gogoproto.moretags) = "yaml:\"amount\"",