Merge branch 'dev' into cp-395/add_support_for_v1_16

Author: aarmoa

chain/exchange/types/exchange.go

@@ -47,6 +47,15 @@ type MatchedMarketDirection struct {
 	SellsExists bool
 }
 
+type TriggeredOrdersInMarket struct {
+	Market             *DerivativeMarket
+	MarkPrice          math.LegacyDec
+	MarketOrders       []*DerivativeMarketOrder
+	LimitOrders        []*DerivativeLimitOrder
+	HasLimitBuyOrders  bool
+	HasLimitSellOrders bool
+}
+
 type TradingRewardAccountPoints struct {
 	Account sdk.AccAddress
 	Points  math.LegacyDec

chain/exchange/types/market.go

@@ -13,6 +13,12 @@ import (
 
 var BinaryOptionsMarketRefundFlagPrice = math.LegacyNewDec(-1)
 
+type DerivativeMarketInfo struct {
+	Market    *DerivativeMarket
+	MarkPrice math.LegacyDec
+	Funding   *PerpetualMarketFunding
+}
+
 func NewSpotMarketID(baseDenom, quoteDenom string) common.Hash {
 	basePeggyDenom, err := peggytypes.NewPeggyDenomFromString(baseDenom)
 	if err == nil {

proto/injective/txfees/v1beta1/txfees.proto

@@ -12,14 +12,17 @@ message Params {
   option (amino.name) = "txfees/Params";
   option (gogoproto.equal) = true;
 
-  uint64 max_gas_wanted_per_tx = 1 [(gogoproto.moretags) = "yaml:\"max_gas_wanted_per_tx\""];
-  uint64 high_gas_tx_threshold = 2 [(gogoproto.moretags) = "yaml:\"high_gas_tx_threshold\""];
+  uint64 max_gas_wanted_per_tx = 1
+      [ (gogoproto.moretags) = "yaml:\"max_gas_wanted_per_tx\"" ];
+  uint64 high_gas_tx_threshold = 2
+      [ (gogoproto.moretags) = "yaml:\"high_gas_tx_threshold\"" ];
   string min_gas_price_for_high_gas_tx = 3 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"min_gas_price_for_high_gas_tx\""
   ];
-  bool mempool1559_enabled = 4 [(gogoproto.moretags) = "yaml:\"mempool1559_enabled\""];
+  bool mempool1559_enabled = 4
+      [ (gogoproto.moretags) = "yaml:\"mempool1559_enabled\"" ];
   string min_gas_price = 5 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false,
@@ -35,7 +38,7 @@ message Params {
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"max_base_fee_multiplier\""
   ];
-  int64 reset_interval = 8 [(gogoproto.moretags) = "yaml:\"reset_interval\""];
+  int64 reset_interval = 8 [ (gogoproto.moretags) = "yaml:\"reset_interval\"" ];
   string max_block_change_rate = 9 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false,