rename

dydxprotocol · Sep 19, 2024 · 3f21cf6 · 3f21cf6
1 parent 2060d21
commit 3f21cf6
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 63 deletions.
diff --git a/protocol/x/revshare/keeper/revshare.go b/protocol/x/revshare/keeper/revshare.go
@@ -163,8 +163,8 @@ func (k Keeper) GetAllRevShares(
 	feeSourceToRevSharePpm := make(map[types.RevShareFeeSource]uint32)
 	feeSourceToQuoteQuantums[types.REV_SHARE_FEE_SOURCE_TAKER_FEE] = big.NewInt(0)
 	feeSourceToRevSharePpm[types.REV_SHARE_FEE_SOURCE_TAKER_FEE] = 0
-	feeSourceToQuoteQuantums[types.REV_SHARE_FEE_SOURCE_NET_FEE] = big.NewInt(0)
-	feeSourceToRevSharePpm[types.REV_SHARE_FEE_SOURCE_NET_FEE] = 0
+	feeSourceToQuoteQuantums[types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE] = big.NewInt(0)
+	feeSourceToRevSharePpm[types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE] = 0
 
 	totalFeesShared := big.NewInt(0)
 	takerFees := fill.TakerFeeQuoteQuantums
@@ -264,7 +264,7 @@ func (k Keeper) getUnconditionalRevShares(
 		feeShared := lib.BigMulPpm(netFees, lib.BigU(revShare.SharePpm), false)
 		revShare := types.RevShare{
 			Recipient:         revShare.Address,
-			RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+			RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 			RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 			QuoteQuantums:     feeShared,
 			RevSharePpm:       revShare.SharePpm,
@@ -291,7 +291,7 @@ func (k Keeper) getMarketMapperRevShare(
 	marketMapperRevshareAmount := lib.BigMulPpm(netFees, lib.BigU(revenueSharePpm), false)
 	revShares = append(revShares, types.RevShare{
 		Recipient:         marketMapperRevshareAddress.String(),
-		RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+		RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 		RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 		QuoteQuantums:     marketMapperRevshareAmount,
 		RevSharePpm:       revenueSharePpm,

diff --git a/protocol/x/revshare/keeper/revshare_test.go b/protocol/x/revshare/keeper/revshare_test.go
@@ -332,21 +332,21 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					},
 					{
 						Recipient:         constants.BobAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(2_100_000),
 						RevSharePpm:       200_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(3_150_000),
 						RevSharePpm:       300_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 						QuoteQuantums:     big.NewInt(1_050_000),
 						RevSharePpm:       100_000,
@@ -360,12 +360,12 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					RevSharePpm:       150_000,
 				},
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(1_500_000),
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(6_300_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(1_500_000),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(6_300_000),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 150_000,
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   600_000,
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            150_000,
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 600_000,
 				},
 			},
 			fill: clobtypes.FillForProcess{
@@ -420,33 +420,33 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					},
 					{
 						Recipient:         constants.BobAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(1_300_000),
 						RevSharePpm:       200_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(1_950_000),
 						RevSharePpm:       300_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 						QuoteQuantums:     big.NewInt(650_000),
 						RevSharePpm:       100_000,
 					},
 				},
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(1_500_000),
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(3_900_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(1_500_000),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(3_900_000),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 150_000,
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   600_000,
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            150_000,
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 600_000,
 				},
 				AffiliateRevShare: &types.RevShare{
 					Recipient:         constants.BobAccAddress.String(),
@@ -511,34 +511,34 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 				AllRevShares: []types.RevShare{
 					{
 						Recipient:         constants.BobAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(2_400_000),
 						RevSharePpm:       200_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(3_600_000),
 						RevSharePpm:       300_000,
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 						QuoteQuantums:     big.NewInt(1_200_000),
 						RevSharePpm:       100_000,
 					},
 				},
 				AffiliateRevShare: nil,
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(7_200_000),
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(0),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(7_200_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(0),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   600_000,
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 0,
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 600_000,
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            0,
 				},
 			},
 			setup: func(tApp *testapp.TestApp, ctx sdk.Context, keeper *keeper.Keeper,
@@ -582,19 +582,19 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 						QuoteQuantums:     big.NewInt(1_050_000),
 						RevSharePpm:       100_000, // 10%
 					},
 				},
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(1_050_000),
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(1_500_000),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(1_050_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(1_500_000),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   100_000, // 10%
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 150_000, // 15%
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 100_000, // 10%
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            150_000, // 15%
 				},
 				AffiliateRevShare: &types.RevShare{
 					Recipient:         constants.BobAccAddress.String(),
@@ -643,19 +643,19 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					},
 					{
 						Recipient:         constants.BobAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(2_100_000),
 						RevSharePpm:       200_000, // 20%
 					},
 				},
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(2_100_000),
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(1_500_000),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(2_100_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(1_500_000),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   200_000, // 20%
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 150_000, // 15%
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 200_000, // 20%
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            150_000, // 15%
 				},
 				AffiliateRevShare: &types.RevShare{
 					Recipient:         constants.BobAccAddress.String(),
@@ -705,7 +705,7 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					},
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      types.REV_SHARE_TYPE_MARKET_MAPPER,
 						QuoteQuantums:     big.NewInt(950_000),
 						RevSharePpm:       100_000, // 10%
@@ -719,12 +719,12 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 					RevSharePpm:       250_000, // 25%
 				},
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(950_000),
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(2_500_000),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(950_000),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(2_500_000),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   100_000, // 10%
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 250_000, // 25%
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 100_000, // 10%
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            250_000, // 25%
 				},
 			},
 			fill: clobtypes.FillForProcess{
@@ -767,12 +767,12 @@ func TestKeeper_GetAllRevShares_Valid(t *testing.T) {
 				AllRevShares:      []types.RevShare{},
 				AffiliateRevShare: nil,
 				FeeSourceToQuoteQuantums: map[types.RevShareFeeSource]*big.Int{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(0),
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(0),
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(0),
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(0),
 				},
 				FeeSourceToRevSharePpm: map[types.RevShareFeeSource]uint32{
-					types.REV_SHARE_FEE_SOURCE_NET_FEE:   0,
-					types.REV_SHARE_FEE_SOURCE_TAKER_FEE: 0,
+					types.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 0,
+					types.REV_SHARE_FEE_SOURCE_TAKER_FEE:            0,
 				},
 			},
 			fill: clobtypes.FillForProcess{

diff --git a/protocol/x/revshare/types/types.go b/protocol/x/revshare/types/types.go
@@ -41,7 +41,7 @@ type RevShareFeeSource int
 
 const (
 	REV_SHARE_FEE_SOURCE_UNSPECIFIED RevShareFeeSource = iota
-	REV_SHARE_FEE_SOURCE_NET_FEE
+	REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE
 	REV_SHARE_FEE_SOURCE_TAKER_FEE
 )
 

diff --git a/protocol/x/rewards/keeper/keeper.go b/protocol/x/rewards/keeper/keeper.go
@@ -140,7 +140,7 @@ func (k Keeper) AddRewardSharesForFill(
 	maxMakerRebatePpm := lib.Min(int32(0), lowestMakerFee)
 
 	totalNetFeeRevSharePpm := uint32(0)
-	if value, ok := revSharesForFill.FeeSourceToRevSharePpm[revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE]; ok {
+	if value, ok := revSharesForFill.FeeSourceToRevSharePpm[revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE]; ok {
 		totalNetFeeRevSharePpm = value
 	}
 	totalTakerFeeRevShareQuantums := big.NewInt(0)

diff --git a/protocol/x/rewards/keeper/keeper_test.go b/protocol/x/rewards/keeper/keeper_test.go
@@ -343,19 +343,19 @@ func TestAddRewardSharesForFill(t *testing.T) {
 				AllRevShares: []revsharetypes.RevShare{
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      revsharetypes.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(200_000),
 						RevSharePpm:       100_000, // 10%
 					},
 				},
 				FeeSourceToQuoteQuantums: map[revsharetypes.RevShareFeeSource]*big.Int{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(200_000),
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(0),
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(200_000),
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(0),
 				},
 				FeeSourceToRevSharePpm: map[revsharetypes.RevShareFeeSource]uint32{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   100_000, // 10%
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: 0,
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 100_000, // 10%
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            0,
 				},
 				AffiliateRevShare: nil,
 			},
@@ -391,26 +391,26 @@ func TestAddRewardSharesForFill(t *testing.T) {
 				AllRevShares: []revsharetypes.RevShare{
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      revsharetypes.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(200_000),
 						RevSharePpm:       100_000, // 10%
 					},
 					{
 						Recipient:         constants.BobAccAddress.String(),
-						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      revsharetypes.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(200_000),
 						RevSharePpm:       100_000, // 10%
 					},
 				},
 				FeeSourceToQuoteQuantums: map[revsharetypes.RevShareFeeSource]*big.Int{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(400_000),
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(0),
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(400_000),
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(0),
 				},
 				FeeSourceToRevSharePpm: map[revsharetypes.RevShareFeeSource]uint32{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   200_000, // 20%
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: 0,
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 200_000, // 20%
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            0,
 				},
 				AffiliateRevShare: nil,
 			},
@@ -446,7 +446,7 @@ func TestAddRewardSharesForFill(t *testing.T) {
 				AllRevShares: []revsharetypes.RevShare{
 					{
 						Recipient:         constants.AliceAccAddress.String(),
-						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE,
+						RevShareFeeSource: revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE,
 						RevShareType:      revsharetypes.REV_SHARE_TYPE_UNCONDITIONAL,
 						QuoteQuantums:     big.NewInt(200_000),
 						RevSharePpm:       100_000, // 10%
@@ -460,12 +460,12 @@ func TestAddRewardSharesForFill(t *testing.T) {
 					},
 				},
 				FeeSourceToQuoteQuantums: map[revsharetypes.RevShareFeeSource]*big.Int{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   big.NewInt(200_000),
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: big.NewInt(200_000),
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: big.NewInt(200_000),
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            big.NewInt(200_000),
 				},
 				FeeSourceToRevSharePpm: map[revsharetypes.RevShareFeeSource]uint32{
-					revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE:   100_000, // 10%
-					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE: 100_000, // 10%
+					revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE: 100_000, // 10%
+					revsharetypes.REV_SHARE_FEE_SOURCE_TAKER_FEE:            100_000, // 10%
 				},
 				AffiliateRevShare: &revsharetypes.RevShare{
 					Recipient:         takerAddress,

diff --git a/protocol/x/subaccounts/keeper/transfer.go b/protocol/x/subaccounts/keeper/transfer.go
@@ -268,7 +268,8 @@ func (k Keeper) DistributeFees(
 		totalTakerFeeRevShareQuantums = value
 	}
 	totalNetFeeRevShareQuantums := big.NewInt(0)
-	if value, ok := revSharesForFill.FeeSourceToQuoteQuantums[revsharetypes.REV_SHARE_FEE_SOURCE_NET_FEE]; ok {
+	if value, ok :=
+		revSharesForFill.FeeSourceToQuoteQuantums[revsharetypes.REV_SHARE_FEE_SOURCE_NET_PROTOCOL_REVENUE]; ok {
 		totalNetFeeRevShareQuantums = value
 	}