migrate some types

liquidations/aave-v2/index.ts

@@ -1,5 +1,5 @@
 import { gql, request } from "graphql-request";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 import { getPagedGql } from "../utils/gql";
 
 const query = gql`

liquidations/angle/index.ts

@@ -4,7 +4,7 @@ import { ethers } from "ethers";
 import { providers } from "../utils/ethers";
 import BigNumber from "bignumber.js";
 import { getPagedGql } from "../utils/gql";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 
 const subgraphUrl = "https://api.thegraph.com/subgraphs/name/picodes/borrow";
 

liquidations/benqi/index.ts

@@ -1,7 +1,7 @@
 import { gql } from "graphql-request";
 import { getPagedGql } from "../utils/gql";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 import {
   Account,
   borrowBalanceUnderlying,

liquidations/compound/index.ts

@@ -1,7 +1,7 @@
 import { gql } from "graphql-request";
 import { getPagedGql } from "../utils/gql";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 import {
   Account,
   borrowBalanceUnderlying,

liquidations/euler/index.ts

@@ -1,7 +1,7 @@
 import { gql } from "graphql-request";
 import { getPagedGql } from "../utils/gql";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 
 const subgraphUrl = "https://api.thegraph.com/subgraphs/name/euler-xyz/euler-mainnet";
 

liquidations/liquity/index.ts

@@ -1,7 +1,7 @@
 import { gql, request } from "graphql-request";
 import BigNumber from "bignumber.js";
 import { getPagedGql } from "../utils/gql";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 
 const subgraphUrl = "https://api.thegraph.com/subgraphs/name/liquity/liquity";
 

liquidations/maker/index.ts

@@ -1,7 +1,7 @@
 import { ethers } from "ethers";
 import { providers } from "../utils/ethers";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 const sdk = require("@defillama/sdk");
 
 // all maker contracts: https://chainlog.makerdao.com/api/mainnet/active.json

liquidations/solend/index.ts

@@ -1,7 +1,7 @@
 import { PublicKey, Connection } from "@solana/web3.js";
 import { SolendMarket, SolendObligation, parseObligation } from "@solendprotocol/solend-sdk";
 import { BigNumber } from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 
 const endpoint = process.env.SOLANA_RPC || "https://solana-api.projectserum.com/"; // or "https://api.mainnet-beta.solana.com"
 const connection = new Connection(endpoint, "confirmed");

liquidations/traderjoe/index.ts

@@ -1,7 +1,7 @@
 import { gql } from "graphql-request";
 import { getPagedGql } from "../utils/gql";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 
 const subgraphUrl = "https://api.thegraph.com/subgraphs/name/traderjoe-xyz/lending";
 

liquidations/utils/binResults.ts

@@ -1,18 +1,8 @@
 import axios from "axios";
+import { Liq } from "./types";
 
 export const TOTAL_BINS = 20;
 
-export interface Liq {
-  owner: string;
-  liqPrice: number;
-  collateral: string;
-  collateralAmount: string;
-  extra?: {
-    displayName?: string;
-    url: string;
-  };
-}
-
 export interface Bins {
   [token: string]: {
     bins: {

liquidations/utils/compound-helpers.ts

@@ -2,6 +2,7 @@ import axios from "axios";
 import BigNumber from "bignumber.js";
 import { gql } from "graphql-request";
 import { getPagedGql } from "./gql";
+import { Prices } from "./types";
 
 export const bignum = (value: string | number) => new BigNumber(value);
 
@@ -32,9 +33,6 @@ export type Account = {
   hasBorrowed: boolean;
 };
 
-export type Price = { decimals: number; price: number; symbol: string; timestamp: number; confidence: number };
-export type Prices = { [address: string]: Price };
-
 export const getUnderlyingPrices = async (markets: Market[], chainPrefix: string): Promise<Prices> => {
   const tokens = markets.map((m) => m.underlyingAddress).map((a) => chainPrefix + a.toLowerCase());
   const prices = (await axios.get("https://coins.llama.fi/prices/current/" + tokens.join(","))).data.coins as Prices;

liquidations/utils/types.ts

@@ -0,0 +1,13 @@
+export type Price = { decimals: number; price: number; symbol: string; timestamp: number; confidence: number };
+export type Prices = { [address: string]: Price };
+
+export interface Liq {
+  owner: string;
+  liqPrice: number;
+  collateral: string;
+  collateralAmount: string;
+  extra?: {
+    displayName?: string;
+    url: string;
+  };
+}

liquidations/venus/index.ts

@@ -1,7 +1,7 @@
 import { gql } from "graphql-request";
 import { getPagedGql } from "../utils/gql";
 import BigNumber from "bignumber.js";
-import { Liq } from "../utils/binResults";
+import { Liq } from "../utils/types";
 import {
   Account,
   borrowBalanceUnderlying,