Merge branch 'releases/v0.21.x' into feat/partial-close-postion

NibiruChain · Sep 13, 2023 · 993ac6d · 993ac6d
2 parents 791b520 + 9375f67
commit 993ac6d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/packages/indexer-nibi/src/defaultObjects.ts b/packages/indexer-nibi/src/defaultObjects.ts
@@ -49,6 +49,7 @@ export const defaultUser = defaultActor
 export const defaultPerpMarket = {
   base_reserve: 0,
   ecosystem_fund_fee_ratio: 0,
+  max_funding_rate: 0,
   enabled: true,
   exchange_fee_ratio: 0,
   funding_rate_epoch_id: "",

diff --git a/packages/indexer-nibi/src/gql/generated.ts b/packages/indexer-nibi/src/gql/generated.ts
@@ -230,7 +230,7 @@ export type MarkPriceCandlesFilter = {
 
 export enum MarkPriceCandlesOrder {
   Period = "period",
-  PeriodStartTs = "periodStartTs",
+  PeriodStartTs = "period_start_ts",
 }
 
 export type PeriodFilter = {
@@ -246,11 +246,6 @@ export type PeriodFilter = {
   readonly periodStartTsLte?: InputMaybe<Scalars["Time"]["input"]>
 }
 
-export enum PeriodOrder {
-  Period = "period",
-  PeriodStartTs = "period_start_ts",
-}
-
 export type PerpLeaderboard = {
   readonly __typename?: "PerpLeaderboard"
   readonly avg_pct_pnl: Scalars["Float"]["output"]
@@ -285,6 +280,7 @@ export type PerpMarket = {
   readonly maintenance_margin_ratio: Scalars["Float"]["output"]
   readonly mark_price: Scalars["Float"]["output"]
   readonly mark_price_twap: Scalars["Float"]["output"]
+  readonly max_funding_rate: Scalars["Float"]["output"]
   readonly max_leverage: Scalars["Float"]["output"]
   readonly pair: Scalars["String"]["output"]
   readonly partial_liquidation_ratio: Scalars["Float"]["output"]
@@ -872,6 +868,16 @@ export type StringFilter = {
   readonly like?: InputMaybe<Scalars["String"]["input"]>
 }
 
+export type Subscription = {
+  readonly __typename?: "Subscription"
+  readonly markPriceCandles: ReadonlyArray<MarkPriceCandle>
+}
+
+export type SubscriptionMarkPriceCandlesArgs = {
+  limit?: InputMaybe<Scalars["Int"]["input"]>
+  where?: InputMaybe<MarkPriceCandlesFilter>
+}
+
 export type TimeFilter = {
   readonly eq?: InputMaybe<Scalars["Time"]["input"]>
   readonly gt?: InputMaybe<Scalars["Time"]["input"]>

diff --git a/packages/indexer-nibi/src/gql/schema.graphql b/packages/indexer-nibi/src/gql/schema.graphql
@@ -191,7 +191,7 @@ input MarkPriceCandlesFilter {
 
 enum MarkPriceCandlesOrder {
   period
-  periodStartTs
+  period_start_ts
 }
 
 input PeriodFilter {
@@ -207,11 +207,6 @@ input PeriodFilter {
   periodStartTsLte: Time
 }
 
-enum PeriodOrder {
-  period
-  period_start_ts
-}
-
 type PerpLeaderboard {
   avg_pct_pnl: Float!
   input_margin: Float!
@@ -244,6 +239,7 @@ type PerpMarket {
   maintenance_margin_ratio: Float!
   mark_price: Float!
   mark_price_twap: Float!
+  max_funding_rate: Float!
   max_leverage: Float!
   pair: String!
   partial_liquidation_ratio: Float!
@@ -756,6 +752,13 @@ input StringFilter {
   like: String
 }
 
+type Subscription {
+  markPriceCandles(
+    limit: Int
+    where: MarkPriceCandlesFilter
+  ): [MarkPriceCandle!]!
+}
+
 scalar Time
 
 input TimeFilter {

diff --git a/packages/indexer-nibi/src/heart-monitor.test.ts b/packages/indexer-nibi/src/heart-monitor.test.ts
@@ -193,6 +193,7 @@ test("perpMarket", async () => {
       "latest_cumulative_premium_fraction",
       "exchange_fee_ratio",
       "ecosystem_fund_fee_ratio",
+      "max_funding_rate",
       "liquidation_fee_ratio",
       "partial_liquidation_ratio",
       "funding_rate_epoch_id",
@@ -231,6 +232,7 @@ test("perpMarkets", async () => {
       "latest_cumulative_premium_fraction",
       "exchange_fee_ratio",
       "ecosystem_fund_fee_ratio",
+      "max_funding_rate",
       "liquidation_fee_ratio",
       "partial_liquidation_ratio",
       "funding_rate_epoch_id",