address comments

dydxprotocol · Sep 23, 2024 · 6111a9e · 6111a9e
1 parent 11f651d
commit 6111a9e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 31 deletions.
diff --git a/protocol/app/app.go b/protocol/app/app.go
@@ -982,9 +982,6 @@ func New(
 		*app.FeeTiersKeeper,
 	)
 	revShareModule := revsharemodule.NewAppModule(appCodec, app.RevShareKeeper)
-
-	// Set the revshare keeper in the affiliates keeper.
-	app.AffiliatesKeeper.SetRevShareKeeper(app.RevShareKeeper)
 	app.FeeTiersKeeper.SetRevShareKeeper(app.RevShareKeeper)
 
 	app.PricesKeeper = *pricesmodulekeeper.NewKeeper(

diff --git a/protocol/testing/e2e/gov/feetiers_test.go b/protocol/testing/e2e/gov/feetiers_test.go
@@ -20,16 +20,16 @@ func TestUpdateFeeTiersModuleParams(t *testing.T) {
 		Tiers: []*feetierstypes.PerpetualFeeTier{
 			{
 				Name:        "test_tier_0",
-				MakerFeePpm: 1_000,
-				TakerFeePpm: 2_000,
+				MakerFeePpm: 11_000,
+				TakerFeePpm: 22_000,
 			},
 			{
 				Name:                           "test_tier_1",
 				AbsoluteVolumeRequirement:      200_000,
 				TotalVolumeShareRequirementPpm: 100_000,
 				MakerVolumeShareRequirementPpm: 50_000,
-				MakerFeePpm:                    11_000,
-				TakerFeePpm:                    22_000,
+				MakerFeePpm:                    1_000,
+				TakerFeePpm:                    2_000,
 			},
 		},
 	}

diff --git a/protocol/testutil/keeper/clob.go b/protocol/testutil/keeper/clob.go
@@ -125,7 +125,6 @@ func NewClobKeepersTestContextWithUninitializedMemStore(
 		)
 		revShareKeeper, _, _ := createRevShareKeeper(stateStore, db, cdc, ks.AffiliatesKeeper, ks.FeeTiersKeeper)
 		ks.FeeTiersKeeper.SetRevShareKeeper(revShareKeeper)
-		ks.AffiliatesKeeper.SetRevShareKeeper(revShareKeeper)
 		ks.AffiliatesKeeper.SetFeetiersKeeper(ks.FeeTiersKeeper)
 		ks.MarketMapKeeper, _ = createMarketMapKeeper(stateStore, db, cdc)
 		ks.PricesKeeper, _, _, mockTimeProvider = createPricesKeeper(

diff --git a/protocol/testutil/keeper/subaccounts.go b/protocol/testutil/keeper/subaccounts.go
@@ -80,7 +80,6 @@ func SubaccountsKeepers(t testing.TB, msgSenderEnabled bool) (
 		vaultKeeper, _ := createVaultKeeper(stateStore, db, cdc, transientStoreKey)
 		feetiersKeeper, _ := createFeeTiersKeeper(stateStore, statsKeeper, vaultKeeper, affiliatesKeeper, db, cdc)
 		revShareKeeper, _, _ = createRevShareKeeper(stateStore, db, cdc, affiliatesKeeper, feetiersKeeper)
-		affiliatesKeeper.SetRevShareKeeper(revShareKeeper)
 		marketMapKeeper, _ := createMarketMapKeeper(stateStore, db, cdc)
 		pricesKeeper, _, _, mockTimeProvider = createPricesKeeper(
 			stateStore,

diff --git a/protocol/x/affiliates/keeper/keeper.go b/protocol/x/affiliates/keeper/keeper.go
@@ -23,7 +23,6 @@ type (
 		storeKey            storetypes.StoreKey
 		authorities         map[string]struct{}
 		statsKeeper         types.StatsKeeper
-		revShareKeeper      types.RevShareKeeper
 		feetiersKeeper      types.FeetiersKeeper
 		indexerEventManager indexer_manager.IndexerEventManager
 	}
@@ -279,10 +278,6 @@ func (k Keeper) UpdateAffiliateTiers(ctx sdk.Context, affiliateTiers types.Affil
 	return nil
 }
 
-func (k *Keeper) SetRevShareKeeper(revShareKeeper types.RevShareKeeper) {
-	k.revShareKeeper = revShareKeeper
-}
-
 func (k *Keeper) SetFeetiersKeeper(feetiersKeeper types.FeetiersKeeper) {
 	k.feetiersKeeper = feetiersKeeper
 }

diff --git a/protocol/x/affiliates/types/expected_keepers.go b/protocol/x/affiliates/types/expected_keepers.go
@@ -4,7 +4,6 @@ import (
 	"math/big"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	revsharetypes "github.com/dydxprotocol/v4-chain/protocol/x/revshare/types"
 	stattypes "github.com/dydxprotocol/v4-chain/protocol/x/stats/types"
 )
 
@@ -13,20 +12,6 @@ type StatsKeeper interface {
 	GetBlockStats(ctx sdk.Context) *stattypes.BlockStats
 }
 
-type RevShareKeeper interface {
-	GetUnconditionalRevShareConfigParams(ctx sdk.Context) (revsharetypes.UnconditionalRevShareConfig, error)
-	GetMarketMapperRevenueShareParams(
-		ctx sdk.Context,
-	) revsharetypes.MarketMapperRevenueShareParams
-	ValidateRevShareSafety(
-		ctx sdk.Context,
-		unconditionalRevShareConfig revsharetypes.UnconditionalRevShareConfig,
-		marketMapperRevShareParams revsharetypes.MarketMapperRevenueShareParams,
-		lowestTakerFee int32,
-		lowestMakerFee int32,
-	) bool
-}
-
 type FeetiersKeeper interface {
 	GetAffiliateRefereeLowestTakerFee(ctx sdk.Context) int32
 	GetLowestMakerFee(ctx sdk.Context) int32

diff --git a/protocol/x/feetiers/keeper/keeper.go b/protocol/x/feetiers/keeper/keeper.go
@@ -160,6 +160,7 @@ func GetAffiliateRefereeLowestTakerFeeFromTiers(tiers []*types.PerpetualFeeTier)
 			break
 		}
 	}
+
 	if uint32(len(tiers)) > types.RefereeStartingFeeTier {
 		return min(takerFeePpm, tiers[types.RefereeStartingFeeTier].TakerFeePpm)
 	}

diff --git a/protocol/x/revshare/keeper/revshare.go b/protocol/x/revshare/keeper/revshare.go
@@ -125,7 +125,7 @@ func (k Keeper) SetUnconditionalRevShareConfigParams(ctx sdk.Context, config typ
 
 // Check two conditions to ensure rev shares are safe.
 // 1. totalUnconditionalRevSharePpm + totalMarketMapperRevSharePpm < 100%
-// 2. highestAffilliateTierRevSharePpm/lib.OneMillion - lowest_taker_fee/lowest_maker_fee < 1
+// 2. Highest_affiliate_rev_share[protocol constant of 50%] * lowest_taker_fee - lowest_maker_fee < lowest_taker_fee
 func (k Keeper) ValidateRevShareSafety(
 	ctx sdk.Context,
 	unconditionalRevShareConfig types.UnconditionalRevShareConfig,
@@ -147,7 +147,7 @@ func (k Keeper) ValidateRevShareSafety(
 	}
 
 	// taker fee can never be 0. Adding a check to ensure lowest_taker_fee is not 0
-	if lowestTakerFeePpm == 0 || int32(highestAffilliateTierRevSharePpm)*
+	if int32(highestAffilliateTierRevSharePpm)*
 		lowestTakerFeePpm-lowestMakerFeePpm*int32(lib.OneMillion) > int32(lib.OneMillion)*lowestTakerFeePpm {
 		return false
 	}