Add lock id to return value of MsgSuperfluidUndelegateAndUnbondLockResponse

CHANGELOG.md

@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * [#4892](https://github.com/osmosis-labs/osmosis/pull/4847) Update Golang to 1.20
   * [#4893](https://github.com/osmosis-labs/osmosis/pull/4893) Update alpine docker base image to `alpine:3.17`
   * [#4912](https://github.com/osmosis-labs/osmosis/pull/4912) Export Position_lock_id mappings to GenesisState
+  * [#4974](https://github.com/osmosis-labs/osmosis/pull/4974) Add lock id to `MsgSuperfluidUndelegateAndUnbondLockResponse`
 
 ### API breaks
 

proto/osmosis/superfluid/tx.proto

@@ -71,7 +71,12 @@ message MsgSuperfluidUndelegateAndUnbondLock {
   cosmos.base.v1beta1.Coin coin = 3
       [ (gogoproto.moretags) = "yaml:\"coin\"", (gogoproto.nullable) = false ];
 }
-message MsgSuperfluidUndelegateAndUnbondLockResponse {}
+message MsgSuperfluidUndelegateAndUnbondLockResponse {
+  // lock id of the new lock created for the remaining amount.
+  // returns the original lockid if the unlocked amount is eqaul to the
+  // original lock's amount.
+  uint64 lock_id = 1;
+}
 
 // message MsgSuperfluidRedelegate {
 //   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];

x/superfluid/keeper/msg_server.go

@@ -96,11 +96,11 @@ func (server msgServer) SuperfluidUndelegateAndUnbondLock(goCtx context.Context,
 ) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	_, err := server.keeper.SuperfluidUndelegateAndUnbondLock(ctx, msg.LockId, msg.Sender, msg.Coin.Amount)
+	lockId, err := server.keeper.SuperfluidUndelegateAndUnbondLock(ctx, msg.LockId, msg.Sender, msg.Coin.Amount)
 	if err == nil {
 		events.EmitSuperfluidUndelegateAndUnbondLockEvent(ctx, msg.LockId)
 	}
-	return &types.MsgSuperfluidUndelegateAndUnbondLockResponse{}, err
+	return &types.MsgSuperfluidUndelegateAndUnbondLockResponse{LockId: lockId}, err
 }
 
 // LockAndSuperfluidDelegate locks and superfluid delegates given tokens in a single message.