@aurigami/sdk 1.21.0 → 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.21.0",
+  "version": "1.22.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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

@@ -195,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/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/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;
 };
 

package/src/a.ts.log

@@ -1,29 +0,0 @@
-import { AuToken } from '@aurigami/contracts/typechain';
-import { ethers } from 'ethers';
-import { AuriEnv, formatObject, getDecimal, MAINNET_ADDRESSES, networkAddresses, SDK, Token } from '../src';
-import { ask } from 'stdio';
-const AURORA_DEFAULT_PROVIDER_URL = `https://mainnet.aurora.dev/`;
-
-const AURORA_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
-  AURORA_DEFAULT_PROVIDER_URL
- );
-
- async function foo(contract: AuToken, block: number) {
-  let data = await contract.callStatic.borrowBalanceCurrent('0x25a087dc3512e3be548f0ca13233ae29d3781bdc', {blockTag: block});
-  console.log("c", data.toString());
-  data = await contract.callStatic.borrowBalanceStored('0x25a087dc3512e3be548f0ca13233ae29d3781bdc', {blockTag: block});
-  console.log("s", data.toString());
- }
-
-async function main() {
-  let env = new AuriEnv({ provider: AURORA_DEFAULT_PROVIDER });
-  let contract = env.getAuErc20Contract({address: MAINNET_ADDRESSES.auTokens.USDC});
-  // let block = 60596417;
-  // while (true) {
-  //   block = parseInt(eval(await ask('block')));
-  //   if (block == 0) break;
-  //   await foo(contract, block);
-  // }
-}
-
-main();