fix: eslint issues

dealer/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.5.8",
-    "@galoymoney/client": "^0.1.10",
+    "@galoymoney/client": "^0.1.32",
     "@grpc/grpc-js": "^1.5.3",
     "@opentelemetry/api": "^1.0.2",
     "@opentelemetry/core": "^1.0.0",

dealer/src/Dealer.ts

@@ -1,4 +1,5 @@
 import pino from "pino"
+
 import { yamlConfig } from "./config"
 import { Result } from "./Result"
 import { btc2sat, roundBtc } from "./utils"

dealer/src/DealerRemoteWallet.ts

@@ -1,5 +1,3 @@
-import { ErrorLevel, Result } from "./Result"
-import { GaloyWallet, WalletsBalances } from "./GaloyWalletTypes"
 import {
   ApolloClient,
   NormalizedCacheObject,
@@ -9,6 +7,9 @@ import {
 } from "@apollo/client/core"
 import fetch from "node-fetch"
 import { pino } from "pino"
+
+import { GaloyWallet, WalletsBalances } from "./GaloyWalletTypes"
+import { ErrorLevel, Result } from "./Result"
 import { cents2usd, sat2btc } from "./utils"
 import {
   addAttributesToCurrentSpan,

dealer/src/DealerSimulatedWallet.ts

@@ -1,5 +1,3 @@
-import { ErrorLevel, Result } from "./Result"
-import { GaloyWallet, WalletsBalances } from "./GaloyWalletTypes"
 import {
   ApolloClient,
   NormalizedCacheObject,
@@ -9,6 +7,9 @@ import {
 } from "@apollo/client/core"
 import fetch from "node-fetch"
 import { pino } from "pino"
+
+import { GaloyWallet, WalletsBalances } from "./GaloyWalletTypes"
+import { ErrorLevel, Result } from "./Result"
 import { cents2usd, sat2btc } from "./utils"
 import {
   addAttributesToCurrentSpan,

dealer/src/ExchangeBase.ts

@@ -1,3 +1,7 @@
+import ccxt, { ExchangeId } from "ccxt"
+
+import pino from "pino"
+
 import {
   FetchDepositAddressResult,
   WithdrawParameters,
@@ -33,9 +37,8 @@ import {
   GetFundingRateHistoryResult,
 } from "./ExchangeTradingType"
 import { ErrorLevel, Result } from "./Result"
-import ccxt, { ExchangeId } from "ccxt"
 import { ExchangeConfiguration, Headers } from "./ExchangeConfiguration"
-import pino from "pino"
+
 import {
   addAttributesToCurrentSpan,
   asyncRunInSpan,
@@ -161,7 +164,7 @@ export abstract class ExchangeBase {
   }
 
   private async fetchDepositsAllPages(args: FetchDepositsParameters) {
-    return await asyncRunInSpan(
+    return asyncRunInSpan(
       "app.exchangeBase.fetchDepositsAllPages",
       {
         [SemanticAttributes.CODE_FUNCTION]: "fetchDepositsAllPages",
@@ -342,7 +345,7 @@ export abstract class ExchangeBase {
   }
 
   private async fetchWithdrawalsAllPages(args: FetchWithdrawalsParameters) {
-    return await asyncRunInSpan(
+    return asyncRunInSpan(
       "app.exchangeBase.fetchWithdrawalsAllPages",
       {
         [SemanticAttributes.CODE_FUNCTION]: "fetchWithdrawalsAllPages",

dealer/src/ExchangeTradingType.ts

@@ -1,4 +1,5 @@
 import { Params } from "ccxt"
+
 import { FundingRate, Transaction } from "./database/models"
 
 export enum TradeCurrency {

dealer/src/OkexExchange.ts

@@ -1,3 +1,7 @@
+import assert from "assert"
+
+import pino from "pino"
+
 import {
   GetAccountAndPositionRiskResult,
   GetInstrumentDetailsResult,
@@ -16,7 +20,6 @@ import {
   GetFundingRateHistoryResult,
   GetFundingRateHistoryParameters,
 } from "./ExchangeTradingType"
-import assert from "assert"
 import { ExchangeBase } from "./ExchangeBase"
 import {
   ExchangeConfiguration,
@@ -25,7 +28,7 @@ import {
 } from "./ExchangeConfiguration"
 import { OkexExchangeConfiguration } from "./OkexExchangeConfiguration"
 import { ErrorLevel, Result } from "./Result"
-import pino from "pino"
+
 import { ExchangeNames, FundingRate, Transaction } from "./database/models"
 import { sleep } from "./utils"
 import {

dealer/src/OkexExchangeConfiguration.ts

@@ -1,3 +1,5 @@
+import assert from "assert"
+
 import {
   FetchDepositAddressResult,
   WithdrawParameters,
@@ -17,7 +19,6 @@ import {
   FetchWithdrawalsParameters,
   TransferParameters,
 } from "./ExchangeTradingType"
-import assert from "assert"
 import {
   ExchangeConfiguration,
   SupportedExchange,

dealer/src/OkexPerpetualSwapStrategy.ts

@@ -1,3 +1,5 @@
+import pino from "pino"
+
 import { floorBtc, roundBtc, sleep } from "./utils"
 import { yamlConfig } from "./config"
 import { ErrorLevel, Result } from "./Result"
@@ -32,7 +34,6 @@ import {
   DestinationAddressType,
 } from "./OkexExchangeConfiguration"
 import { AccountTypeToId, OkexExchange } from "./OkexExchange"
-import pino from "pino"
 
 import {
   ExternalTransfer,
@@ -149,17 +150,17 @@ export class OkexPerpetualSwapStrategy implements HedgingStrategy {
   }
 
   public async getDerivativeMarketInfo(): Promise<Result<FetchTickerResult>> {
-    return await this.exchange.fetchTicker(SupportedInstrument.OKEX_PERPETUAL_SWAP)
+    return this.exchange.fetchTicker(SupportedInstrument.OKEX_PERPETUAL_SWAP)
   }
 
   public async getFundingAccountBalance(): Promise<
     Result<FetchFundingAccountBalanceResult>
   > {
-    return await this.exchange.fetchFundingAccountBalance()
+    return this.exchange.fetchFundingAccountBalance()
   }
 
   public async fetchExchangeStatus(): Promise<Result<boolean>> {
-    return await this.exchange.fetchExchangeStatus()
+    return this.exchange.fetchExchangeStatus()
   }
 
   public async fetchTransactionHistory(
@@ -573,7 +574,11 @@ export class OkexPerpetualSwapStrategy implements HedgingStrategy {
                 withdrawArgs.quantity,
               )
               this.logger.debug(
-                { withdrawOnChainAddress, transferSizeInBtc: withdrawArgs.quantity, bookingResult },
+                {
+                  withdrawOnChainAddress,
+                  transferSizeInBtc: withdrawArgs.quantity,
+                  bookingResult,
+                },
                 "withdrawBookKeepingCallback() returned: {bookingResult}",
               )
               if (!bookingResult.ok) {

dealer/src/app/index.ts

@@ -1,11 +1,12 @@
 import { wrapAsyncToRunInSpan } from "../services/tracing"
 
 // import * as DealerMod from "../Dealer"
-import * as schedulerMod from "./scheduler"
 import * as exporterMod from "../servers/exporter/exporter"
 import * as priceServiceMod from "../servers/price"
 
 import { baseLogger } from "../services/logger"
+
+import * as schedulerMod from "./scheduler"
 const logger = baseLogger.child({ module: "wrapper" })
 
 const allFunctions = {

dealer/src/app/scheduler.ts

@@ -1,5 +1,6 @@
-import { baseLogger } from "../services/logger"
 import cron from "node-cron"
+
+import { baseLogger } from "../services/logger"
 import { Dealer } from "../Dealer"
 import { recordExceptionInCurrentSpan, wrapAsyncToRunInSpan } from "../services/tracing"
 import { ErrorLevel } from "../Result"

dealer/src/app/start.ts

@@ -7,14 +7,14 @@ import { baseLogger } from "../services/logger"
 // import { scheduler } from "./scheduler"
 // import { priceService } from "../servers/price"
 
-import { exporter, scheduler, priceService } from "."
-
 import {
   addAttributesToCurrentSpan,
   SemanticAttributes,
   wrapAsyncToRunInSpan,
 } from "../services/tracing"
 
+import { exporter, scheduler, priceService } from "."
+
 const logger = baseLogger.child({ module: "cron" })
 
 const options = {

dealer/src/config.ts

@@ -1,6 +1,8 @@
 import fs from "fs"
+
 import yaml from "js-yaml"
 import _ from "lodash"
+
 import { baseLogger } from "./services/logger"
 
 const defaultContent = fs.readFileSync("./default.yaml", "utf8")

dealer/src/database/index.ts

@@ -1,4 +1,10 @@
 import pgPromise, { IInitOptions, IDatabase, IMain } from "pg-promise"
+
+import humps from "humps"
+import dotenv from "dotenv"
+
+import { baseLogger } from "../services/logger"
+
 import {
   Extensions,
   InFlightTransfersRepository,
@@ -9,9 +15,6 @@ import {
   ExternalTransfersRepository,
   FundingRatesRepository,
 } from "./repositories"
-import { baseLogger } from "../services/logger"
-import humps from "humps"
-import dotenv from "dotenv"
 
 dotenv.config()
 

dealer/src/database/repositories/ExternalTransfersRepository.ts

@@ -1,9 +1,11 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
+import { Md5 } from "ts-md5/dist/md5"
+
 import { ExternalTransfer } from "../models"
 import { externalTransfersQueries as sql } from "../sql"
 import { Result } from "../../Result"
-import { Md5 } from "ts-md5/dist/md5"
 
 export class ExternalTransfersRepository {
   private logger: pino.Logger

dealer/src/database/repositories/FundingRatesRepository.ts

@@ -1,5 +1,6 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
 import { ExchangeNames, FundingRate } from "../models"
 import { fundingRatesQueries as sql } from "../sql"
 import { Result } from "../../Result"

dealer/src/database/repositories/GraphqlRepository.ts

@@ -1,5 +1,6 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
 import { Wallet, LastOnChainAddress, OnChainPay } from "../models"
 import { graphql as sql } from "../sql"
 import { Result } from "../../Result"

dealer/src/database/repositories/InFlightTransfersRepository.ts

@@ -1,6 +1,7 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
 import { IResult } from "pg-promise/typescript/pg-subset"
+
 import { InFlightTransfer, InFlightTransfersMetrics } from "../models"
 import { inFlightTransfersQueries as sql } from "../sql"
 import { Result } from "../../Result"
@@ -42,7 +43,7 @@ export class InFlightTransfersRepository {
   public async completed(address: string): Promise<Result<number>> {
     try {
       const rowCount = await this.db.tx("update-completed", async (t) => {
-        return await t.result(sql.complete, { address }, (r: IResult) => r.rowCount)
+        return t.result(sql.complete, { address }, (r: IResult) => r.rowCount)
       })
       if (rowCount !== 1) {
         throw new Error(`completedInFlightTransfer({address}) updated ${rowCount} rows.`)

dealer/src/database/repositories/InternalTransfersRepository.ts

@@ -1,5 +1,6 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
 import { InternalTransfer, InternalTransfersMetrics } from "../models"
 import { internalTransfersQueries as sql } from "../sql"
 import { Result } from "../../Result"

dealer/src/database/repositories/OrdersRepository.ts

@@ -1,5 +1,6 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
 import { Order } from "../models"
 import { ordersQueries as sql } from "../sql"
 import { Result } from "../../Result"

dealer/src/database/repositories/TransactionsRepository.ts

@@ -1,5 +1,6 @@
 import pino from "pino"
 import { IDatabase, IMain } from "pg-promise"
+
 import { FundingFeesMetrics, TradingFeesMetrics, Transaction } from "../models"
 import { transactionsQueries as sql } from "../sql"
 import { Result } from "../../Result"

dealer/src/database/sql/index.ts

@@ -1,5 +1,7 @@
-import { QueryFile, IQueryFileOptions } from "pg-promise"
 import { join as joinPath } from "path"
+
+import { QueryFile, IQueryFileOptions } from "pg-promise"
+
 import { baseLogger } from "../../services/logger"
 
 const logger = baseLogger.child({ module: "db/queries" })

dealer/src/servers/exporter/exporter.ts

@@ -1,6 +1,7 @@
 import dotenv from "dotenv"
 import express from "express"
 import client, { register } from "prom-client"
+
 import { baseLogger } from "../../services/logger"
 import { Dealer } from "../../Dealer"
 import { PositionSide } from "../../ExchangeTradingType"

dealer/src/servers/graphql/WalletGraphqlServer.ts

@@ -1,3 +1,5 @@
+import { AddressInfo } from "net"
+
 import dotenv from "dotenv"
 import {
   stringLength,
@@ -16,7 +18,6 @@ import { v4 as uuidv4 } from "uuid"
 import { db as database } from "../../database"
 
 import { baseLogger } from "../../services/logger"
-import { AddressInfo } from "net"
 
 const graphqlLogger = baseLogger.child({ module: "graphql" })
 

dealer/src/servers/price/client_service.ts

@@ -1,7 +1,12 @@
 import util from "util"
+
 import { credentials } from "@grpc/grpc-js"
-import { UnknownDealerPriceServiceError } from "./errors"
+
 import { baseLogger } from "../../services/logger"
+
+import { toCents, toCentsPerSatsRatio, toSats } from "../../utils"
+
+import { UnknownDealerPriceServiceError } from "./errors"
 import { PriceServiceClient } from "./proto/services/price/v1/price_service_grpc_pb"
 import {
   GetCentsFromSatsForImmediateBuyRequest,
@@ -23,7 +28,6 @@ import {
   GetCentsPerSatsExchangeMidRateRequest,
   GetCentsPerSatsExchangeMidRateResponse,
 } from "./proto/services/price/v1/price_service_pb"
-import { toCents, toCentsPerSatsRatio, toSats } from "../../utils"
 
 const serverPort = process.env.PRICE_SERVER_PORT ?? "50055"
 const client = new PriceServiceClient(