Merge pull request #11 from useLiquidOps/feat--add-wAR/wUSDT

Feat  add w ar/w usdt

Author: LorimerJenkins

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquidops",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Lorimer Jenkins <lorimer@liquidops.io>, Marton Lederer <marton@liquidops.io>",
   "repository": {
     "type": "git",

src/ao/utils/tokenAddressData.ts

@@ -44,8 +44,42 @@ export const tokenData: Record<string, TokenData> = {
     collateralEnabled: true,
     baseDenomination: BigInt(6),
   },
+  WAR: {
+    name: "Wrapped Arweave",
+    icon: "ICMLzIKdVMedibwgOy014I4yan_F8h2ZhORhRG5dgzs",
+    ticker: "WAR",
+    address: "xU9zFkq3X2ZQ6olwNVvr1vUWIjc3kXTWr7xKQD6dh10",
+    oTicker: "oWAR",
+    oAddress: "rAc0aP0g9NXYUXAbvlLjPH_XxyQy6eYmwSuIcf6ukuw",
+    controllerAddress,
+    cleanTicker: "wAR",
+    denomination: BigInt(12),
+    collateralEnabled: true,
+    baseDenomination: BigInt(12),
+  },
+  WUSDT: {
+    name: "Wrapped USD Tether",
+    icon: "JaxupVYerLRZWLd32llz_3CG8sCQaNhn2hAWm51U_7s",
+    ticker: "WUSDT",
+    address: "7j3jUyFpTuepg_uu_sJnwLE6KiTVuA9cLrkfOp2MFlo",
+    oTicker: "oWUSDT",
+    oAddress: "9B9J1O5FDoMsFZGJUSOa6TwivsH7LYIfiaizPn7fUHs",
+    controllerAddress,
+    cleanTicker: "wUSDT",
+    denomination: BigInt(18),
+    collateralEnabled: true,
+    baseDenomination: BigInt(18),
+  },
 };
 
+export function convertTicker(ticker: string): string {
+  if (ticker === "QAR") return "AR";
+  if (ticker === "WUSDC") return "USDC";
+  if (ticker === "WAR") return "AR";
+  if (ticker === "WUSDT") return "USDT";
+  return ticker;
+}
+
 export type SupportedTokensTickers = keyof typeof tokenData;
 export type SupportedTokensAddresses = TokenData["address"];
 export type SupportedOTokensTickers = TokenData["oTicker"];

src/functions/liquidations/getLiquidations.ts

@@ -9,6 +9,7 @@ import {
 import { redstoneOracleAddress } from "../../ao/utils/tokenAddressData";
 import { getAllPositions } from "../protocolData/getAllPositions";
 import { dryRunAwait } from "../../ao/utils/dryRunAwait";
+import { convertTicker } from "../../ao/utils/tokenAddressData";
 
 export interface GetLiquidationsRes {
   liquidations: Map<string, QualifyingPosition>;
@@ -60,12 +61,6 @@ interface GlobalPosition {
   };
 }
 
-function convertTicker(ticker: string): string {
-  if (ticker === "QAR") return "AR";
-  if (ticker === "WUSDC") return "USDC";
-  return ticker;
-}
-
 export async function getLiquidations(
   precisionFactor: number,
 ): Promise<GetLiquidationsRes> {

src/functions/oTokenData/getGlobalPosition.ts

@@ -8,6 +8,7 @@ import {
 import { collateralEnabledTickers } from "../../ao/utils/tokenAddressData";
 import { getPosition } from "./getPosition";
 import { dryRunAwait } from "../../ao/utils/dryRunAwait";
+import { convertTicker } from "../../ao/utils/tokenAddressData";
 
 // Base token position with the core metrics
 interface TokenPosition {
@@ -56,13 +57,7 @@ export async function getGlobalPosition({
     const redstonePriceFeedRes = await getData({
       Target: redstoneOracleAddress,
       Action: "v2.Request-Latest-Data",
-      Tickers: JSON.stringify(
-        collateralEnabledTickers.map((ticker) => {
-          if (ticker === "QAR") return "AR";
-          if (ticker === "WUSDC") return "USDC";
-          return ticker;
-        }),
-      ),
+      Tickers: JSON.stringify(collateralEnabledTickers.map(convertTicker)),
     });
     // add dry run await to not get rate limited
     await dryRunAwait(1);
@@ -128,8 +123,7 @@ export async function getGlobalPosition({
       globalPosition.tokenPositions[token] = tokenPosition;
 
       // Get token price and denomination for USD conversion
-      const tokenPrice =
-        prices[token === "QAR" ? "AR" : token === "WUSDC" ? "USDC" : token].v;
+      const tokenPrice = prices[convertTicker(token)].v;
       const tokenDenomination =
         tokenData[token as SupportedTokensTickers].baseDenomination;