Add query for undelegating time (#988)

(cherry picked from commit 237b6f0)
osmosis-labs · Feb 26, 2022 · b4d674d · b4d674d
1 parent 91e48c5
commit b4d674d
Show file tree

Hide file tree

Showing 3 changed files with 165 additions and 93 deletions.
diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto
@@ -8,6 +8,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "osmosis/superfluid/superfluid.proto";
 import "osmosis/superfluid/params.proto";
+import "osmosis/lockup/lock.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types";
@@ -200,6 +201,8 @@ message SuperfluidUndelegationsByDelegatorResponse {
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
+  repeated osmosis.lockup.SyntheticLock synthetic_locks = 3
+      [ (gogoproto.nullable) = false ];
 }
 
 message SuperfluidDelegationsByValidatorDenomRequest {

diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go
@@ -7,6 +7,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
 	"github.com/osmosis-labs/osmosis/v7/x/superfluid/types"
 )
 
@@ -177,6 +178,7 @@ func (k Keeper) SuperfluidUndelegationsByDelegator(goCtx context.Context, req *t
 	res := types.SuperfluidUndelegationsByDelegatorResponse{
 		SuperfluidDelegationRecords: []types.SuperfluidDelegationRecord{},
 		TotalUndelegatedCoins:       sdk.NewCoins(),
+		SyntheticLocks:              []lockuptypes.SyntheticLock{},
 	}
 
 	syntheticLocks := k.lk.GetAllSyntheticLockupsByAddr(ctx, delAddr)
@@ -204,6 +206,7 @@ func (k Keeper) SuperfluidUndelegationsByDelegator(goCtx context.Context, req *t
 				DelegationAmount: lockedCoin,
 			},
 		)
+		res.SyntheticLocks = append(res.SyntheticLocks, syntheticLock)
 		res.TotalUndelegatedCoins = res.TotalUndelegatedCoins.Add(lockedCoin)
 	}
 	return &res, nil