Merge branch 'main' into feature/closed-pnl-fill

Author: pp346

indexer/packages/v4-protos/src/codegen/dydxprotocol/stats/stats.ts

@@ -153,23 +153,23 @@ export interface UserStatsSDKType {
 
   affiliate_30d_referred_volume_quote_quantums: Long;
 }
-/** CachedStakeAmount stores the last calculated total staked amount for address */
+/** CachedStakedBaseTokens stores the last calculated total staked base tokens */
 
-export interface CachedStakeAmount {
-  /** Last calculated total staked amount by the delegator (in coin amount). */
-  stakedAmount: Uint8Array;
+export interface CachedStakedBaseTokens {
+  /** Last calculated total staked base tokens by the delegator. */
+  stakedBaseTokens: Uint8Array;
   /**
    * Block time at which the calculation is cached (in Unix Epoch seconds)
    * Rounded down to nearest second.
    */
 
   cachedAt: Long;
 }
-/** CachedStakeAmount stores the last calculated total staked amount for address */
+/** CachedStakedBaseTokens stores the last calculated total staked base tokens */
 
-export interface CachedStakeAmountSDKType {
-  /** Last calculated total staked amount by the delegator (in coin amount). */
-  staked_amount: Uint8Array;
+export interface CachedStakedBaseTokensSDKType {
+  /** Last calculated total staked base tokens by the delegator. */
+  staked_base_tokens: Uint8Array;
   /**
    * Block time at which the calculation is cached (in Unix Epoch seconds)
    * Rounded down to nearest second.
@@ -573,17 +573,17 @@ export const UserStats = {
 
 };
 
-function createBaseCachedStakeAmount(): CachedStakeAmount {
+function createBaseCachedStakedBaseTokens(): CachedStakedBaseTokens {
   return {
-    stakedAmount: new Uint8Array(),
+    stakedBaseTokens: new Uint8Array(),
     cachedAt: Long.ZERO
   };
 }
 
-export const CachedStakeAmount = {
-  encode(message: CachedStakeAmount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.stakedAmount.length !== 0) {
-      writer.uint32(10).bytes(message.stakedAmount);
+export const CachedStakedBaseTokens = {
+  encode(message: CachedStakedBaseTokens, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.stakedBaseTokens.length !== 0) {
+      writer.uint32(10).bytes(message.stakedBaseTokens);
     }
 
     if (!message.cachedAt.isZero()) {
@@ -593,17 +593,17 @@ export const CachedStakeAmount = {
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): CachedStakeAmount {
+  decode(input: _m0.Reader | Uint8Array, length?: number): CachedStakedBaseTokens {
     const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseCachedStakeAmount();
+    const message = createBaseCachedStakedBaseTokens();
 
     while (reader.pos < end) {
       const tag = reader.uint32();
 
       switch (tag >>> 3) {
         case 1:
-          message.stakedAmount = reader.bytes();
+          message.stakedBaseTokens = reader.bytes();
           break;
 
         case 2:
@@ -619,9 +619,9 @@ export const CachedStakeAmount = {
     return message;
   },
 
-  fromPartial(object: DeepPartial<CachedStakeAmount>): CachedStakeAmount {
-    const message = createBaseCachedStakeAmount();
-    message.stakedAmount = object.stakedAmount ?? new Uint8Array();
+  fromPartial(object: DeepPartial<CachedStakedBaseTokens>): CachedStakedBaseTokens {
+    const message = createBaseCachedStakedBaseTokens();
+    message.stakedBaseTokens = object.stakedBaseTokens ?? new Uint8Array();
     message.cachedAt = object.cachedAt !== undefined && object.cachedAt !== null ? Long.fromValue(object.cachedAt) : Long.ZERO;
     return message;
   }

proto/dydxprotocol/stats/stats.proto

@@ -75,10 +75,10 @@ message UserStats {
   uint64 affiliate_30d_referred_volume_quote_quantums = 4;
 }
 
-// CachedStakeAmount stores the last calculated total staked amount for address
-message CachedStakeAmount {
-  // Last calculated total staked amount by the delegator (in coin amount).
-  bytes staked_amount = 1 [
+// CachedStakedBaseTokens stores the last calculated total staked base tokens
+message CachedStakedBaseTokens {
+  // Last calculated total staked base tokens by the delegator.
+  bytes staked_base_tokens = 1 [
     (gogoproto.customtype) =
         "github.com/dydxprotocol/v4-chain/protocol/dtypes.SerializableInt",
     (gogoproto.nullable) = false

protocol/lib/metrics/metric_keys.go

@@ -27,8 +27,8 @@ const (
 	ClobRateLimitPlaceOrderCount                       = "clob_rate_limit_place_order_count"
 	ClobRateLimitCancelOrderCount                      = "clob_rate_limit_cancel_order_count"
 	ClobRateLimitBatchCancelCount                      = "clob_rate_limit_batch_cancel_count"
-	StatsGetStakedAmountCacheHit                       = "stats_get_staked_amount_cache_hit"
-	StatsGetStakedAmountCacheMiss                      = "stats_get_staked_amount_cache_miss"
+	StatsGetStakedBaseTokensCacheHit                   = "stats_get_staked_base_tokens_cache_hit"
+	StatsGetStakedBaseTokensCacheMiss                  = "stats_get_staked_base_tokens_cache_miss"
 
 	// Gauges
 	InsuranceFundBalance                      = "insurance_fund_balance"
@@ -38,8 +38,8 @@ const (
 	ClobSubaccountsRequiringDeleveragingCount = "clob_subaccounts_requiring_deleveraging_count"
 	SendingProcessDepositToSubaccount         = "sending_process_deposit_to_subaccount"
 	RateLimitInsufficientWithdrawalAmount     = "rate_limit_insufficient_withdrawal_amount"
-	StatsGetStakedAmountLatencyCacheHit       = "stats_get_staked_amount_latency_cache_hit"
-	StatsGetStakedAmountLatencyCacheMiss      = "stats_get_staked_amount_latency_cache_miss"
+	StatsGetStakedBaseTokensLatencyCacheHit   = "stats_get_staked_base_tokens_latency_cache_hit"
+	StatsGetStakedBaseTokensLatencyCacheMiss  = "stats_get_staked_base_tokens_latency_cache_miss"
 
 	// Samples
 	ClobDeleverageSubaccountTotalQuoteQuantumsDistribution         = "clob_deleverage_subaccount_total_quote_quantums_distribution"

protocol/x/affiliates/keeper/grpc_query.go

@@ -40,7 +40,7 @@ func (k Keeper) AffiliateInfo(c context.Context,
 
 	userStats := k.statsKeeper.GetUserStats(ctx, addr.String())
 	referredVolume := userStats.Affiliate_30DReferredVolumeQuoteQuantums
-	stakedAmount := k.statsKeeper.GetStakedAmount(ctx, req.GetAddress())
+	stakedAmount := k.statsKeeper.GetStakedBaseTokens(ctx, req.GetAddress())
 
 	return &types.AffiliateInfoResponse{
 		IsWhitelisted:             isWhitelisted,

protocol/x/affiliates/keeper/keeper.go

@@ -215,23 +215,6 @@ func (k Keeper) GetTierForAffiliate(
 		currentTier = uint32(index)
 	}
 
-	if currentTier == maxTierLevel {
-		return currentTier, tiers[currentTier].TakerFeeSharePpm, nil
-	}
-
-	numCoinsStaked := k.statsKeeper.GetStakedAmount(ctx, affiliateAddr)
-	for i := currentTier + 1; i < numTiers; i++ {
-		// required staked coins is strictly increasing as tiers are traversed in order.
-		expMultiplier, _ := lib.BigPow10(-lib.BaseDenomExponent)
-		reqStakedCoins := new(big.Int).Mul(
-			lib.BigU(tiers[i].ReqStakedWholeCoins),
-			expMultiplier,
-		)
-		if numCoinsStaked.Cmp(reqStakedCoins) < 0 {
-			break
-		}
-		currentTier = i
-	}
 	return currentTier, tiers[currentTier].TakerFeeSharePpm, nil
 }
 

protocol/x/affiliates/keeper/keeper_test.go

@@ -220,7 +220,7 @@ func TestGetTakerFeeShareViaStakedAmount(t *testing.T) {
 	require.Equal(t, types.DefaultAffiliateTiers.Tiers[0].TakerFeeSharePpm, feeSharePpm)
 
 	ctx = ctx.WithBlockTime(ctx.BlockTime().Add(
-		time.Duration(statstypes.StakedAmountCacheDurationSeconds+1) * time.Second,
+		time.Duration(statstypes.StakedBaseTokensCacheDurationSeconds+1) * time.Second,
 	))
 	// Add more staked amount to upgrade tier
 	err = stakingKeeper.SetDelegation(ctx,
@@ -235,7 +235,7 @@ func TestGetTakerFeeShareViaStakedAmount(t *testing.T) {
 	require.NoError(t, err)
 	require.True(t, exists)
 	require.Equal(t, affiliate, affiliateAddr)
-	require.Equal(t, types.DefaultAffiliateTiers.Tiers[1].TakerFeeSharePpm, feeSharePpm)
+	require.Equal(t, types.DefaultAffiliateTiers.Tiers[0].TakerFeeSharePpm, feeSharePpm)
 }
 
 // Test volume qualifies for tier 2 and stake qualifies for tier 3
@@ -288,8 +288,8 @@ func TestGetTierForAffiliate_VolumeAndStake(t *testing.T) {
 	tierLevel, feeSharePpm, err := k.GetTierForAffiliate(ctx, affiliate, map[string]bool{})
 	require.NoError(t, err)
 
-	require.Equal(t, uint32(3), tierLevel)
-	require.Equal(t, affiliateTiers.Tiers[3].TakerFeeSharePpm, feeSharePpm)
+	require.Equal(t, uint32(2), tierLevel)
+	require.Equal(t, affiliateTiers.Tiers[2].TakerFeeSharePpm, feeSharePpm)
 }
 
 func TestUpdateAffiliateTiers(t *testing.T) {
@@ -1116,8 +1116,8 @@ func TestGetTierForAffiliateOverrides(t *testing.T) {
 
 	tierLevel, feeSharePpm, err := k.GetTierForAffiliate(ctx, constants.AliceAccAddress.String(), map[string]bool{})
 	require.NoError(t, err)
-	require.Equal(t, uint32(3), tierLevel)
-	require.Equal(t, uint32(150_000), feeSharePpm)
+	require.Equal(t, uint32(0), tierLevel)
+	require.Equal(t, uint32(50_000), feeSharePpm)
 
 	tierLevel, feeSharePpm, err = k.GetTierForAffiliate(ctx, constants.AliceAccAddress.String(), map[string]bool{
 		constants.AliceAccAddress.String(): true,

protocol/x/affiliates/types/expected_keepers.go

@@ -8,7 +8,7 @@ import (
 )
 
 type StatsKeeper interface {
-	GetStakedAmount(ctx sdk.Context, delegatorAddr string) *big.Int
+	GetStakedBaseTokens(ctx sdk.Context, delegatorAddr string) *big.Int
 	GetBlockStats(ctx sdk.Context) *stattypes.BlockStats
 	GetUserStats(ctx sdk.Context, address string) *stattypes.UserStats
 	SetUserStats(ctx sdk.Context, address string, userStats *stattypes.UserStats)

protocol/x/feetiers/keeper/grpc_query.go

@@ -152,7 +152,7 @@ func (k Keeper) UserStakingTier(
 	_, userFeeTier := k.getUserFeeTier(ctx, req.Address, affiliateParameters.RefereeMinimumFeeTierIdx)
 
 	// Get user's staking info
-	stakedAmount := k.statsKeeper.GetStakedAmount(ctx, req.Address)
+	stakedAmount := k.statsKeeper.GetStakedBaseTokens(ctx, req.Address)
 	discountPpm := k.GetStakingDiscountPpm(ctx, userFeeTier.Name, stakedAmount)
 
 	return &types.QueryUserStakingTierResponse{

protocol/x/feetiers/keeper/grpc_query_test.go

@@ -540,9 +540,9 @@ func TestUserStakingTier(t *testing.T) {
 				if tc.userBondedTokens != nil {
 					bondedAmount = tc.userBondedTokens
 				}
-				statsKeeper.UnsafeSetCachedStakedAmount(ctx, tc.req.Address, &stattypes.CachedStakeAmount{
-					StakedAmount: dtypes.NewIntFromBigInt(bondedAmount),
-					CachedAt:     ctx.BlockTime().Unix(),
+				statsKeeper.UnsafeSetCachedStakedBaseTokens(ctx, tc.req.Address, &stattypes.CachedStakedBaseTokens{
+					StakedBaseTokens: dtypes.NewIntFromBigInt(bondedAmount),
+					CachedAt:         ctx.BlockTime().Unix(),
 				})
 			}
 

protocol/x/feetiers/keeper/keeper.go

@@ -159,7 +159,7 @@ func (k Keeper) GetPerpetualFeePpm(
 				"error", err,
 			)
 		} else {
-			stakedAmount := k.statsKeeper.GetStakedAmount(ctx, address)
+			stakedAmount := k.statsKeeper.GetStakedBaseTokens(ctx, address)
 			stakingDiscountPpm := k.GetStakingDiscountPpm(ctx, userTier.Name, stakedAmount)
 			if stakingDiscountPpm > 0 {
 				// Final fee