Merge remote-tracking branch 'origin/eric/proposal-logic' into eric/p…

…rotocol-feature-flags
skip-mev · Mar 4, 2024 · 5811502 · 5811502
2 parents 6adf756 + 7feaddb
commit 5811502
Show file tree

Hide file tree

Showing 27 changed files with 1,636 additions and 271 deletions.
diff --git a/protocol/app/app.go b/protocol/app/app.go
@@ -100,6 +100,7 @@ import (
 	"github.com/dydxprotocol/v4-chain/protocol/app/flags"
 	"github.com/dydxprotocol/v4-chain/protocol/app/middleware"
 	"github.com/dydxprotocol/v4-chain/protocol/app/prepare"
+	"github.com/dydxprotocol/v4-chain/protocol/app/prepare/prices"
 	"github.com/dydxprotocol/v4-chain/protocol/app/process"
 
 	"github.com/dydxprotocol/v4-chain/protocol/lib"
@@ -1332,6 +1333,7 @@ func New(
 	app.SetPrepareCheckStater(app.PrepareCheckStater)
 
 	// PrepareProposal setup.
+	priceUpdateGenerator := prices.NewDefaultPriceUpdateGenerator(app.PricesKeeper)
 	if appFlags.NonValidatingFullNode {
 		app.SetPrepareProposal(prepare.FullNodePrepareProposalHandler())
 	} else {
@@ -1340,13 +1342,14 @@ func New(
 				txConfig,
 				app.BridgeKeeper,
 				app.ClobKeeper,
-				app.PricesKeeper,
 				app.PerpetualsKeeper,
+				priceUpdateGenerator,
 			),
 		)
 	}
 
 	// ProcessProposal setup.
+	priceUpdateDecoder := process.NewDefaultUpdateMarketPriceTxDecoder(app.PricesKeeper, app.txConfig.TxDecoder())
 	if appFlags.NonValidatingFullNode {
 		// Note: If the command-line flag `--non-validating-full-node` is enabled, this node will use
 		// an implementation of `ProcessProposal` which always returns `abci.ResponseProcessProposal_ACCEPT`.
@@ -1358,7 +1361,7 @@ func New(
 				app.ClobKeeper,
 				app.StakingKeeper,
 				app.PerpetualsKeeper,
-				app.PricesKeeper,
+				priceUpdateDecoder,
 			),
 		)
 	} else {
@@ -1370,6 +1373,7 @@ func New(
 				app.StakingKeeper,
 				app.PerpetualsKeeper,
 				app.PricesKeeper,
+				priceUpdateDecoder,
 			),
 		)
 	}

diff --git a/protocol/app/prepare/expected_keepers.go b/protocol/app/prepare/expected_keepers.go
@@ -7,7 +7,6 @@ import (
 	bridgetypes "github.com/dydxprotocol/v4-chain/protocol/x/bridge/types"
 	clobtypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types"
 	perpstypes "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals/types"
-	pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
 )
 
 // PrepareClobKeeper defines the expected CLOB keeper used for `PrepareProposal`.
@@ -20,11 +19,6 @@ type PreparePerpetualsKeeper interface {
 	GetAddPremiumVotes(ctx sdk.Context) *perpstypes.MsgAddPremiumVotes
 }
 
-// PreparePricesKeeper defines the expected Prices keeper used for `PrepareProposal`.
-type PreparePricesKeeper interface {
-	GetValidMarketPriceUpdates(ctx sdk.Context) *pricestypes.MsgUpdateMarketPrices
-}
-
 // PrepareBridgeKeeper defines the expected Bridge keeper used for `PrepareProposal`.
 type PrepareBridgeKeeper interface {
 	GetAcknowledgeBridges(ctx sdk.Context, blockTimestamp time.Time) *bridgetypes.MsgAcknowledgeBridges

diff --git a/protocol/app/prepare/prepare_proposal.go b/protocol/app/prepare/prepare_proposal.go
@@ -10,7 +10,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/dydxprotocol/v4-chain/protocol/app/prepare/prices"
 	"github.com/dydxprotocol/v4-chain/protocol/lib/metrics"
+	pricetypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
+	slinkyabci "github.com/skip-mev/slinky/abci/types"
 )
 
 var (
@@ -52,8 +55,8 @@ func PrepareProposalHandler(
 	txConfig client.TxConfig,
 	bridgeKeeper PrepareBridgeKeeper,
 	clobKeeper PrepareClobKeeper,
-	pricesKeeper PreparePricesKeeper,
 	perpetualKeeper PreparePerpetualsKeeper,
+	priceUpdateGenerator prices.PriceUpdateGenerator,
 ) sdk.PrepareProposalHandler {
 	return func(ctx sdk.Context, req *abci.RequestPrepareProposal) (*abci.ResponsePrepareProposal, error) {
 		defer telemetry.ModuleMeasureSince(
@@ -71,8 +74,21 @@ func PrepareProposalHandler(
 			return &EmptyResponse, nil
 		}
 
+		var extCommitBzTx []byte
+		if len(req.Txs) >= slinkyabci.NumInjectedTxs {
+			extCommitBzTx = req.Txs[slinkyabci.OracleInfoIndex]
+		}
+
+		// get the update market prices tx
+		msg, err := priceUpdateGenerator.GetValidMarketPriceUpdates(ctx, extCommitBzTx)
+		if err != nil {
+			ctx.Logger().Error(fmt.Sprintf("GetValidMarketPriceUpdates error: %v", err))
+			recordErrorMetricsWithLabel(metrics.PricesTx)
+			return &EmptyResponse, nil
+		}
+
 		// Gather "FixedSize" group messages.
-		pricesTxResp, err := GetUpdateMarketPricesTx(ctx, txConfig, pricesKeeper)
+		pricesTxResp, err := EncodeMarketPriceUpdates(txConfig, msg)
 		if err != nil {
 			ctx.Logger().Error(fmt.Sprintf("GetUpdateMarketPricesTx error: %v", err))
 			recordErrorMetricsWithLabel(metrics.PricesTx)
@@ -180,19 +196,12 @@ func PrepareProposalHandler(
 	}
 }
 
-// GetUpdateMarketPricesTx returns a tx containing `MsgUpdateMarketPrices`.
-func GetUpdateMarketPricesTx(
-	ctx sdk.Context,
+// EncodeMarketPriceUpdates returns a tx containing `MsgUpdateMarketPrices`.
+func EncodeMarketPriceUpdates(
 	txConfig client.TxConfig,
-	pricesKeeper PreparePricesKeeper,
+	msg *pricetypes.MsgUpdateMarketPrices,
 ) (PricesTxResponse, error) {
-	// Get prices to update.
-	msgUpdateMarketPrices := pricesKeeper.GetValidMarketPriceUpdates(ctx)
-	if msgUpdateMarketPrices == nil {
-		return PricesTxResponse{}, fmt.Errorf("MsgUpdateMarketPrices cannot be nil")
-	}
-
-	tx, err := EncodeMsgsIntoTxBytes(txConfig, msgUpdateMarketPrices)
+	tx, err := EncodeMsgsIntoTxBytes(txConfig, msg)
 	if err != nil {
 		return PricesTxResponse{}, err
 	}
@@ -202,7 +211,7 @@ func GetUpdateMarketPricesTx(
 
 	return PricesTxResponse{
 		Tx:         tx,
-		NumMarkets: len(msgUpdateMarketPrices.MarketPriceUpdates),
+		NumMarkets: len(msg.MarketPriceUpdates),
 	}, nil
 }