From b9f3a652a6ed9b63d01812254d5ffef20e1c7a66 Mon Sep 17 00:00:00 2001
From: Matt <90358481+xbtmatt@users.noreply.github.com>
Date: Tue, 4 Mar 2025 00:45:22 -0800
Subject: [PATCH] Format and lint

---
 src/typescript/sdk/src/broker-v2/types.ts   |  4 ++++
 src/typescript/sdk/src/types/arena-types.ts | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/typescript/sdk/src/broker-v2/types.ts b/src/typescript/sdk/src/broker-v2/types.ts
index e0784abe7..4a517a7ad 100644
--- a/src/typescript/sdk/src/broker-v2/types.ts
+++ b/src/typescript/sdk/src/broker-v2/types.ts
@@ -4,6 +4,10 @@ import {
   type DatabaseJsonType,
   TableName,
 } from "../indexer-v2/types/json-types";
+<<<<<<< Updated upstream
+=======
+import { type ARENA_CANDLESTICK_NAME } from "../types/arena-types";
+>>>>>>> Stashed changes
 import { type AnyNumberString } from "../types/types";
 
 export type BrokerEvent = SubscribableBrokerEvents | BrokerArenaEvent;
diff --git a/src/typescript/sdk/src/types/arena-types.ts b/src/typescript/sdk/src/types/arena-types.ts
index 016b21f24..35f818f78 100644
--- a/src/typescript/sdk/src/types/arena-types.ts
+++ b/src/typescript/sdk/src/types/arena-types.ts
@@ -362,4 +362,15 @@ export const isArenaVaultBalanceUpdateModel = (
   e: BrokerEventModels
 ): e is ArenaVaultBalanceUpdateModel => e.eventName === "ArenaVaultBalanceUpdate";
 
+<<<<<<< Updated upstream
+=======
+export const isArenaEventModelWithMeleeID = (
+  e: BrokerEventModels
+): e is ArenaEventModelWithMeleeID =>
+  isArenaEnterModel(e) || isArenaExitModel(e) || isArenaMeleeModel(e) || isArenaSwapModel(e);
+
+export const isArenaEventModel = (e: BrokerEventModels): e is ArenaEventModels =>
+  isArenaEventModelWithMeleeID(e) || isArenaVaultBalanceUpdateModel(e);
+
+>>>>>>> Stashed changes
 /* eslint-enable import/no-unused-modules */