[ECO-1900] use event_name col instead of type for filtering (#126)

econia-labs · Jun 24, 2024 · a04c0d2 · a04c0d2
1 parent ab25a3c
commit a04c0d2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/src/typescript/sdk/src/queries/candlestick.ts b/src/typescript/sdk/src/queries/candlestick.ts
@@ -2,7 +2,6 @@
 
 import { type CandlestickResolution } from "../const";
 import { INBOX_EVENTS_TABLE, LIMIT, ORDER_BY } from "./const";
-import { STRUCT_STRINGS } from "../utils";
 import { wrap } from "./utils";
 import { type JSONTypes } from "../types";
 import {
@@ -23,7 +22,7 @@ export const paginateCandlesticks = async (
   let query = postgrest
     .from(INBOX_EVENTS_TABLE)
     .select("*")
-    .filter("type", "eq", STRUCT_STRINGS.PeriodicStateEvent)
+    .filter("event_name", "eq", "emojicoin_dot_fun::PeriodicState")
     .eq("data->market_metadata->market_id", wrap(marketID))
     .limit(Math.min(LIMIT, args.maxTotalRows ?? Infinity))
     .order("transaction_version", ORDER_BY.DESC);

diff --git a/src/typescript/sdk/src/queries/chat.ts b/src/typescript/sdk/src/queries/chat.ts
@@ -1,7 +1,6 @@
 import "server-only";
 
 import { INBOX_EVENTS_TABLE, LIMIT, ORDER_BY } from "./const";
-import { STRUCT_STRINGS } from "../utils";
 import { type JSONTypes } from "../types";
 import { wrap } from "./utils";
 import { type AggregateQueryResultsArgs, aggregateQueryResults } from "./query-helper";
@@ -18,7 +17,7 @@ export const paginateChatEvents = async (
   const query = postgrest
     .from(INBOX_EVENTS_TABLE)
     .select("*")
-    .filter("type", "eq", STRUCT_STRINGS.ChatEvent)
+    .filter("event_name", "eq", "emojicoin_dot_fun::Chat")
     .eq("data->market_metadata->market_id", wrap(marketID))
     .limit(Math.min(LIMIT, maxTotalRows ?? Infinity))
     .order("transaction_version", ORDER_BY.DESC);

diff --git a/src/typescript/sdk/src/queries/liquidity.ts b/src/typescript/sdk/src/queries/liquidity.ts
@@ -1,7 +1,6 @@
 import "server-only";
 
 import { type Types, type JSONTypes, toLiquidityEvent } from "../types";
-import { STRUCT_STRINGS } from "../utils";
 import { INBOX_EVENTS_TABLE, LIMIT, ORDER_BY } from "./const";
 import {
   type AggregateQueryResultsArgs,
@@ -29,7 +28,7 @@ export const paginateLiquidityEvents = async (
   let query = postgrest
     .from(INBOX_EVENTS_TABLE)
     .select("*")
-    .filter("type", "eq", STRUCT_STRINGS.LiquidityEvent)
+    .filter("event_name", "eq", "emojicoin_dot_fun::Liquidity")
     .limit(Math.min(LIMIT, args.maxTotalRows ?? Infinity))
     .order("transaction_version", ORDER_BY.DESC);
 

diff --git a/src/typescript/sdk/src/queries/market.ts b/src/typescript/sdk/src/queries/market.ts
@@ -3,7 +3,6 @@ import "server-only";
 import { MODULE_ADDRESS } from "../const";
 import { SYMBOL_DATA, type SymbolEmojiData } from "../emoji_data";
 import { INBOX_EVENTS_TABLE, ORDER_BY } from "./const";
-import { STRUCT_STRINGS } from "../utils";
 import { type Types, type JSONTypes, toMarketRegistrationEvent } from "../types";
 import { type AggregateQueryResultsArgs, aggregateQueryResults } from "./query-helper";
 import { postgrest } from "./inbox-url";
@@ -47,7 +46,7 @@ export const paginateMarketRegistrations = async (
     query: postgrest
       .from(INBOX_EVENTS_TABLE)
       .select("*")
-      .filter("type", "eq", STRUCT_STRINGS.MarketRegistrationEvent)
+      .filter("event_name", "eq", "emojicoin_dot_fun::MarketRegistration")
       .order("transaction_version", ORDER_BY.DESC),
   });
 

diff --git a/src/typescript/sdk/src/queries/state.ts b/src/typescript/sdk/src/queries/state.ts
@@ -1,7 +1,6 @@
 import "server-only";
 
 import { type Types, toGlobalStateEvent, toStateEvent, toMarketDataView } from "../types";
-import { STRUCT_STRINGS } from "../utils/type-tags";
 import { INBOX_EVENTS_TABLE, MARKET_DATA_VIEW, ORDER_BY } from "./const";
 import { wrap } from "./utils";
 import {
@@ -65,7 +64,7 @@ export const paginateGlobalStateEvents = async (
     query: postgrest
       .from(INBOX_EVENTS_TABLE)
       .select("*")
-      .filter("type", "eq", STRUCT_STRINGS.GlobalStateEvent)
+      .filter("event_name", "eq", "emojicoin_dot_fun::GlobalState")
       .order("transaction_version", ORDER_BY.DESC),
   });
 
@@ -87,7 +86,7 @@ export const paginateStateEventsByMarketID = async (
     query: postgrest
       .from(INBOX_EVENTS_TABLE)
       .select("*")
-      .filter("type", "eq", STRUCT_STRINGS.StateEvent)
+      .filter("event_name", "eq", "emojicoin_dot_fun::State")
       .eq("data->market_metadata->market_id", wrap(marketID))
       .order("transaction_version", ORDER_BY.DESC),
   });

diff --git a/src/typescript/sdk/src/queries/swap.ts b/src/typescript/sdk/src/queries/swap.ts
@@ -1,7 +1,6 @@
 import "server-only";
 
 import { type Types, type JSONTypes, toSwapEvent } from "../types";
-import { STRUCT_STRINGS } from "../utils";
 import { INBOX_EVENTS_TABLE, LIMIT, ORDER_BY } from "./const";
 import {
   type AggregateQueryResultsArgs,
@@ -22,7 +21,7 @@ export const paginateSwapEvents = async (
   let query = postgrest
     .from(INBOX_EVENTS_TABLE)
     .select("*")
-    .filter("type", "eq", STRUCT_STRINGS.SwapEvent)
+    .filter("event_name", "eq", "emojicoin_dot_fun::Swap")
     .order("transaction_version", ORDER_BY.DESC);
 
   query = marketID ? query.eq("data->market_id", wrap(marketID)) : query;
@@ -50,7 +49,7 @@ export const getAllPostBondingCurveMarkets = async (
     query: postgrest
       .from(INBOX_EVENTS_TABLE)
       .select("*")
-      .filter("type", "eq", STRUCT_STRINGS.SwapEvent)
+      .filter("event_name", "eq", "emojicoin_dot_fun::Swap")
       .filter("data->results_in_state_transition", "eq", true)
       .limit(Math.min(LIMIT, args.maxTotalRows ?? Infinity))
       .order("transaction_version", ORDER_BY.DESC),