@aurigami/sdk 1.20.8 → 1.22.0

package/dist/types/index.d.ts

@@ -177,23 +177,21 @@ export declare type UserNotification = {
         liquidation: boolean;
     }[];
 };
-export declare type UserLiquidationHistorySubgraph = {
-    liquidationEvents: LiquidationEventSubgraph[];
-};
-export declare type LiquidationEventSubgraph = {
-    auTokenSymbol: string;
-    amount: number;
-    blockTime: number;
-    from: string;
-    id: string;
-    underlyingRepayAmount: number;
-    underlyingRepayAmountUSD: number;
-    underlyingSymbol: string;
+export declare type LiquidationEventEntity = {
+    liquidator: string;
+    borrower: string;
+    /** bigint string */
+    repayAmount: string;
+    marketRepayToken: string;
+    /** bigint string */
+    seizeTokens: string;
+    auTokenCollateral: string;
+    txnHash: string;
+    blockNumber: number;
 };
 export declare type LiquidationDetail = {
     liquidationTime: Timestamp;
     tokenAmount: TokenAmount;
-    value: CurrencyAmount;
     transactionId: string;
 };
 export declare type Timestamp = number;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.20.8",
+  "version": "1.22.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -61,7 +61,7 @@
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "@aurigami/contracts": "3.18.0",
+    "@aurigami/contracts": "3.20.0",
     "axios": "^0.26.1",
     "bignumber.js": "^9.0.2",
     "cache-decorator": "^0.1.6",

package/src/SDK.ts

@@ -1,18 +1,12 @@
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import BigNumber from 'bignumber.js';
-import {
-  ALL_STAKING_POOLS,
-  AURIGAMI_SUBGRAPH_URL,
-  SD_INCENTIVE_IN_SD,
-  networkAddresses,
-} from './consts';
+import { ALL_STAKING_POOLS, networkAddresses } from './consts';
 import { AuriEnv, BlockchainEntity, BlockchainEntityRead, Token, TokenAmount } from './entities';
+import { getBlocksTimestamp, getDecimal } from './helpers';
+import * as AuriAPI from './helpers/aurigami-api';
+import * as NotificationApi from './helpers/notification-api';
 import { MiscRead, StakingRead, StakingReadWrite } from './interactors';
 import * as types from './types';
-import * as NotificationApi from './helpers/notification-api';
-import { BigNumber as BN } from 'ethers';
-import { getDecimal, queryGraphQL } from './helpers';
-import { getLiquidationEventsQuery } from './helpers/subgraphQuery';
 
 export class SdkRead extends BlockchainEntityRead {
   protected env: AuriEnv;
@@ -158,26 +152,26 @@ export class SdkRead extends BlockchainEntityRead {
   }
 
   public async getLiquidationHistory(address: string): Promise<types.LiquidationDetail[]> {
-    const liquidationHistorySubgraph = (await queryGraphQL(
-      getLiquidationEventsQuery(address, 100),
-      AURIGAMI_SUBGRAPH_URL
-    )) as types.UserLiquidationHistorySubgraph;
-    const liquidationEvents = liquidationHistorySubgraph.liquidationEvents.map((event) => {
-      const value: types.CurrencyAmount = {
-        amount: event.underlyingRepayAmountUSD.toString(),
-        currency: 'USD',
-      };
+    const liquidationHistoryResp = await AuriAPI.getPaginatedApi<types.LiquidationEventEntity>(
+      '/liquidate/history',
+      {
+        user: address,
+      }
+    );
+    const blocks = liquidationHistoryResp.items.map((event) => event.blockNumber);
+    const blocksTimestamp = await getBlocksTimestamp(this._networkConnection.provider, blocks);
+
+    const liquidationEvents = liquidationHistoryResp.items.map((event, idx) => {
       const underlyingAddress = networkAddresses.auTokens.find(
-        (auToken) => auToken.name.slice(2).toLowerCase() === event.underlyingSymbol.toLowerCase()
+        (auToken) => auToken.address.toLowerCase() === event.marketRepayToken.toLowerCase()
       )!.underlying;
       const decimal = getDecimal(underlyingAddress);
       const token = new Token(underlyingAddress, decimal);
-      const tokenAmount = new TokenAmount(token, event.underlyingRepayAmount.toString(), false);
+      const tokenAmount = new TokenAmount(token, event.repayAmount.toString(), true);
       return {
-        liquidationTime: event.blockTime,
+        liquidationTime: blocksTimestamp[idx],
         tokenAmount,
-        value,
-        transactionId: event.id.split('-')[0],
+        transactionId: event.txnHash,
       };
     }) as types.LiquidationDetail[];
     return liquidationEvents;

package/src/consts/constants.ts

@@ -75,7 +75,8 @@ export const networkAddresses = {
   ],
   misc: {
     COMPTROLLER: MAINNET_ADDRESSES.comptroller.toLowerCase(),
-    oracle: MAINNET_ADDRESSES.oracle.toLowerCase(),
+    DEPRECATED_OLD_ORACLE: MAINNET_ADDRESSES.oracle.toLowerCase(),
+    PYTH_ORACLE: MAINNET_ADDRESSES.pythOracle.toLowerCase(),
     AURIFAIRLAUNCH: MAINNET_ADDRESSES.fairLaunch.toLowerCase(),
     AURILENS: MAINNET_ADDRESSES.auriLens.toLowerCase(),
     ETHREPAYHELPER: MAINNET_ADDRESSES.ethRepayHelper.toLowerCase(),
@@ -194,4 +195,4 @@ export const USDT_ETH = '0xdAC17F958D2ee523a2206206994597C13D831ec7'.toLowerCase
 export const AURIGAMI_SUBGRAPH_URL =
   'https://api.thegraph.com/subgraphs/name/takao-aurigami/aurigami-feb-27';
 
-export const GRAPHQL_URL = 'https://explorer.mainnet.aurora.dev/graphiql';
+export const GRAPHQL_URL = 'https://old.explorer.aurora.dev/api/v1/graphql';

package/src/entities/auriEnv.ts

@@ -7,15 +7,15 @@ import {
   AuriOracle,
   Comptroller,
   IERC20,
-  PlyGame,
   PULP,
-  ReferralDirectoryV2,
+  PlyGame,
   PlyTokenLock,
+  ReferralDirectoryV2,
 } from '@aurigami/contracts/typechain';
 import { Contract } from 'ethers';
-import { assert } from '../helpers/helpers';
 import * as abis from '../abis';
 import { networkAddresses } from '../consts/constants';
+import { assert } from '../helpers/helpers';
 import { AuTokenWithUnderlying } from '../types';
 import { BlockchainEntityRead } from './BlockchainEntity';
 
@@ -152,7 +152,7 @@ export class AuriEnv extends BlockchainEntityRead {
   get oracle(): AuriOracle {
     if (!this._oracle) {
       this._oracle = this.getContract<AuriOracle>(
-        networkAddresses.misc.oracle,
+        networkAddresses.misc.PYTH_ORACLE,
         abis.AuriOracleABI.abi
       );
     }

package/src/helpers/aurigami-api.ts

@@ -23,12 +23,12 @@ export type PaginagedApiResponse<T> = {
   meta: MetaApiResponse;
 };
 
-export async function getPaginatedApi(
+export async function getPaginatedApi<T = any>(
   url: string,
   params: Record<string, any> = {},
   page: number = 1,
   pageSize: number = 50
-): Promise<PaginagedApiResponse<any>> {
+): Promise<PaginagedApiResponse<T>> {
   params = {
     ...params,
     page,

package/src/helpers/helpers.ts

@@ -3,7 +3,7 @@ import { Provider } from '@ethersproject/abstract-provider';
 import BigNumber from 'bignumber.js';
 import { BigNumber as BN, utils } from 'ethers';
 import { Result } from 'ethers/lib/utils';
-import { CACHE_TIMEOUT, GRAPHQL_URL, networkAddresses } from '../consts/constants';
+import { GRAPHQL_URL, networkAddresses } from '../consts/constants';
 import { decimalRecords } from '../consts/decimals';
 import { symbolRecords } from '../consts/symbols';
 import { Address } from '../types';
@@ -135,7 +135,7 @@ export async function getBlocksTimestamp(
   // merge all the json objects
   let results = (await Promise.all(promises)).reduce((acc, cur) => {
     return { ...acc, ...cur };
-  });
+  }, {});
 
   let missingBlocks = blockNumbers.filter((blockNumber) => !results[`b${blockNumber}`]);
   if (missingBlocks.length > 0) {

package/src/helpers/historicalPriceFetcher.ts

@@ -104,8 +104,15 @@ export async function fetchHistoricalPriceFromOracle(
   provider: providers.Provider,
   block: number
 ): Promise<BigNumber> {
+  // from this block, we switch to use pyth
+  // TODO: add to consts
+  const oracleAddress =
+    block < 102438637
+      ? networkAddresses.misc.DEPRECATED_OLD_ORACLE
+      : networkAddresses.misc.PYTH_ORACLE;
+
   const oracleContract: PriceOracle = new Contract(
-    networkAddresses.misc.oracle,
+    oracleAddress,
     AuriOracleABI.abi,
     provider
   ) as PriceOracle;

package/src/helpers/priceFetcher.ts

@@ -1,5 +1,5 @@
 import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
-import { ERC20, IUniswapV2Pair, PriceOracle } from '@aurigami/contracts/typechain';
+import { AuriPythOracle, ERC20, IUniswapV2Pair } from '@aurigami/contracts/typechain';
 import axios from 'axios';
 import BigNumber from 'bignumber.js';
 import { BigNumber as BN, Contract, ethers, providers } from 'ethers';
@@ -7,10 +7,10 @@ import { AuriOracleABI, EIP20InterfaceABI, IUniswapV2PairABI } from '../abis';
 import {
   DECIMAL_PRECISION,
   HARDCODE_PRICE_TOKENS,
-  networkAddresses,
   PRICE_WHITELISTED,
   STADER_ETH,
   USDT_ETH,
+  networkAddresses,
 } from '../consts/constants';
 import { TokenAmount } from '../entities/tokenAmount';
 import { Address, TokenValuation } from '../types';
@@ -229,11 +229,11 @@ export async function fetchPriceFromOracle(
   underlyingDecimal: number,
   provider: providers.Provider
 ): Promise<BigNumber> {
-  const oracleContract: PriceOracle = new Contract(
-    networkAddresses.misc.oracle,
+  const oracleContract: AuriPythOracle = new Contract(
+    networkAddresses.misc.PYTH_ORACLE,
     AuriOracleABI.abi,
     provider
-  ) as PriceOracle;
+  ) as AuriPythOracle;
   const rawPrice = await oracleContract.getUnderlyingPrice(auTokenAddress).catch((e: any) => {
     console.log(`Unable to fetch price from oracle for ${auTokenAddress}`);
     return BN.from(0);

package/src/interactors/misc.ts

@@ -1,4 +1,4 @@
-import { AuToken, PriceOracle } from '@aurigami/contracts/typechain';
+import { AuToken } from '@aurigami/contracts/typechain';
 import BigNumber from 'bignumber.js';
 import { BigNumber as BN } from 'ethers';
 import * as abis from '../abis';
@@ -290,10 +290,7 @@ export class MiscRead extends BlockchainEntityRead {
     dust: BigNumber = new BigNumber(0.1)
   ): Promise<types.AccountAuTokensInfo[]> {
     const _1E18 = BN.from(10).pow(18);
-    const oracle = this.env.getContract<PriceOracle>(
-      consts.networkAddresses.misc.oracle,
-      abis.AuriOracleABI.abi
-    );
+    const oracle = this.env.oracle;
     const tokens = tokenAddresses.map((addr) =>
       this.env.getContract<AuToken>(addr, abis.AuTokenABI.abi)
     );

package/src/types/index.ts

@@ -200,25 +200,22 @@ export type UserNotification = {
   }[];
 };
 
-export type UserLiquidationHistorySubgraph = {
-  liquidationEvents: LiquidationEventSubgraph[];
-};
-
-export type LiquidationEventSubgraph = {
-  auTokenSymbol: string;
-  amount: number;
-  blockTime: number;
-  from: string;
-  id: string;
-  underlyingRepayAmount: number;
-  underlyingRepayAmountUSD: number;
-  underlyingSymbol: string;
+export type LiquidationEventEntity = {
+  liquidator: string;
+  borrower: string;
+  /** bigint string */
+  repayAmount: string;
+  marketRepayToken: string;
+  /** bigint string */
+  seizeTokens: string;
+  auTokenCollateral: string;
+  txnHash: string;
+  blockNumber: number;
 };
 
 export type LiquidationDetail = {
   liquidationTime: Timestamp;
   tokenAmount: TokenAmount;
-  value: CurrencyAmount;
   transactionId: string;
 };