Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
fix(studio): Fix linting errors (#3041)
Browse files Browse the repository at this point in the history
  • Loading branch information
immasandwich committed Nov 14, 2023
1 parent cfad834 commit 7f743cb
Show file tree
Hide file tree
Showing 114 changed files with 173 additions and 268 deletions.
Expand Up @@ -13,8 +13,8 @@ import {
GetUnderlyingTokensParams,
} from '~position/template/app-token.template.types';

import { AaveAbpt } from '../contracts/viem';
import { AaveSafetyModuleViemContractFactory } from '../contracts';
import { AaveAbpt } from '../contracts/viem';

type AaveSafetyModuleAbptTokenDataProps = DefaultAppTokenDataProps & {
fee: number;
Expand Down
Expand Up @@ -21,10 +21,9 @@ import {
} from '~position/template/contract-position.template.types';

import { AbracadabraViemContractFactory } from '../contracts';
import { AbracadabraCauldron, AbracadabraMarketLens } from '../contracts/viem';
import { AbracadabraCauldron } from '../contracts/viem';

import { CAULDRON_V1_RISK_CONSTANTS, MARKET_LENS_ADDRESS } from './abracadabra.common.constants';
import { GetContractReturnType } from 'viem';

interface AbracadabraCommonCauldronContractPositionDefinition extends DefaultContractPositionDefinition {
type: 'REGULAR' | 'CONVEX' | 'GLP';
Expand Down
Expand Up @@ -2,7 +2,7 @@ import { Inject } from '@nestjs/common';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present';
import { Erc20, Erc4626 } from '~contract/contracts/viem';
import { Erc4626 } from '~contract/contracts/viem';
import {
DefaultAppTokenDataProps,
DefaultAppTokenDefinition,
Expand Down
@@ -1,8 +1,9 @@
import { Inject } from '@nestjs/common';
import { BigNumber } from 'ethers';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present';
import { Erc20, Erc4626 } from '~contract/contracts/viem';
import { Erc4626 } from '~contract/contracts/viem';
import { isAppToken } from '~position/position.interface';
import {
DefaultAppTokenDataProps,
Expand All @@ -14,7 +15,6 @@ import {
import { Erc4626VaultTemplateTokenFetcher } from '~position/template/erc4626-vault.template.token-fetcher';

import { AbracadabraViemContractFactory } from '../contracts';
import { BigNumber } from 'ethers';

const SECONDS_PER_YEAR = 31536000;
const BASIS_POINTS_DIVISOR = 10000;
Expand Down
2 changes: 1 addition & 1 deletion src/apps/across/common/across.pool-v2.token-fetcher.ts
@@ -1,4 +1,5 @@
import { Inject } from '@nestjs/common';
import { BigNumber } from 'ethers';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
Expand All @@ -13,7 +14,6 @@ import {

import { AcrossViemContractFactory } from '../contracts';
import { AcrossPoolV2 } from '../contracts/viem';
import { BigNumber } from 'ethers';

export type AcrossPoolV2TokenDefinition = {
address: string;
Expand Down
Expand Up @@ -8,8 +8,8 @@ import { VotingEscrowWithRewardsTemplateContractPositionFetcher } from '~positio
import { AngleApiHelper } from '../common/angle.api';
import { AngleViemContractFactory } from '../contracts';
import { AngleVeAngle, AngleLiquidityGauge } from '../contracts/viem';
import { AngleVeAngleContract } from '../contracts/viem/AngleVeAngle';
import { AngleLiquidityGaugeContract } from '../contracts/viem/AngleLiquidityGauge';
import { AngleVeAngleContract } from '../contracts/viem/AngleVeAngle';

@PositionTemplate()
export class EthereumAngleVeAngleContractPositionFetcher extends VotingEscrowWithRewardsTemplateContractPositionFetcher<
Expand Down
Expand Up @@ -5,6 +5,7 @@ import { ethers } from 'ethers';
import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
import { MakerViemContractFactory } from '~apps/maker/contracts';
import { MakerGemJoin } from '~apps/maker/contracts/viem';
import { MetaType } from '~position/position.interface';
import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
import {
Expand All @@ -16,7 +17,6 @@ import {
} from '~position/template/contract-position.template.types';

import { BProtocolViemContractFactory } from '../contracts';
import { MakerGemJoin } from '~apps/maker/contracts/viem';

export type BProtocolVaultDefinition = {
address: string;
Expand Down
Expand Up @@ -13,7 +13,7 @@ import {
} from '~position/template/app-token.template.types';

import { BancorV3ViemContractFactory } from '../contracts';
import { PoolCollection, PoolToken } from '../contracts/viem';
import { PoolToken } from '../contracts/viem';

@PositionTemplate()
export class EthereumBancorV3PoolTokenFetcher extends AppTokenTemplatePositionFetcher<PoolToken> {
Expand Down
@@ -1,4 +1,4 @@
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { ETH_ADDR_ALIAS, ZERO_ADDRESS } from '~app-toolkit/constants/address';
Expand Down
@@ -1,4 +1,4 @@
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
Expand Down
2 changes: 1 addition & 1 deletion src/apps/compound/common/compound.supply.token-fetcher.ts
@@ -1,4 +1,4 @@
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { ETH_ADDR_ALIAS, ZERO_ADDRESS } from '~app-toolkit/constants/address';
Expand Down
Expand Up @@ -3,7 +3,7 @@ import { BigNumberish } from 'ethers';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import {
GetMasterChefTokenBalancesParams,
MasterChefTemplateContractPositionFetcher,
Expand Down
Expand Up @@ -3,7 +3,7 @@ import { BigNumberish } from 'ethers';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import {
GetMasterChefTokenBalancesParams,
MasterChefTemplateContractPositionFetcher,
Expand Down
Expand Up @@ -3,7 +3,7 @@ import { BigNumberish } from 'ethers';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import {
GetMasterChefTokenBalancesParams,
MasterChefTemplateContractPositionFetcher,
Expand Down
2 changes: 1 addition & 1 deletion src/apps/curve/common/curve.crypto-pool.token-fetcher.ts
Expand Up @@ -4,6 +4,7 @@ import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';

import { CurveViemContractFactory } from '../contracts';
import { CurveCryptoRegistry } from '../contracts/viem';
import { CurveCryptoRegistryContract } from '../contracts/viem/CurveCryptoRegistry';

import {
CurvePoolDynamicTokenFetcher,
Expand All @@ -15,7 +16,6 @@ import {
ResolveTokenAddressParams,
} from './curve.pool-dynamic.token-fetcher';
import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { CurveCryptoRegistryContract } from '../contracts/viem/CurveCryptoRegistry';

export abstract class CurveCryptoPoolTokenFetcher extends CurvePoolDynamicTokenFetcher<CurveCryptoRegistry> {
constructor(
Expand Down
Expand Up @@ -5,6 +5,7 @@ import { isViemMulticallUnderlyingError } from '~multicall/errors';

import { CurveViemContractFactory } from '../contracts';
import { CurveCryptoFactory } from '../contracts/viem';
import { CurveCryptoFactoryContract } from '../contracts/viem/CurveCryptoFactory';

import {
CurvePoolDynamicTokenFetcher,
Expand All @@ -16,7 +17,6 @@ import {
ResolveTokenAddressParams,
} from './curve.pool-dynamic.token-fetcher';
import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { CurveCryptoFactoryContract } from '../contracts/viem/CurveCryptoFactory';

export abstract class CurveFactoryCryptoPoolTokenFetcher extends CurvePoolDynamicTokenFetcher<CurveCryptoFactory> {
constructor(
Expand Down
Expand Up @@ -4,6 +4,7 @@ import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';

import { CurveViemContractFactory } from '../contracts';
import { CurveTricryptoFactory } from '../contracts/viem';
import { CurveTricryptoFactoryContract } from '../contracts/viem/CurveTricryptoFactory';

import {
CurvePoolDynamicV2TokenFetcher,
Expand All @@ -13,7 +14,6 @@ import {
ResolveTokenAddressParams,
} from './curve.pool-dynamic-v2.token-fetcher';
import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { CurveTricryptoFactoryContract } from '../contracts/viem/CurveTricryptoFactory';

export abstract class CurveFactoryV2PoolTokenFetcher extends CurvePoolDynamicV2TokenFetcher<CurveTricryptoFactory> {
constructor(
Expand Down
Expand Up @@ -4,6 +4,7 @@ import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';

import { CurveViemContractFactory } from '../contracts';
import { CurveStableFactory } from '../contracts/viem';
import { CurveStableFactoryContract } from '../contracts/viem/CurveStableFactory';

import {
CurvePoolDynamicTokenFetcher,
Expand All @@ -15,7 +16,6 @@ import {
ResolveTokenAddressParams,
} from './curve.pool-dynamic.token-fetcher';
import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { CurveStableFactoryContract } from '../contracts/viem/CurveStableFactory';

export abstract class CurveFactoryStablePoolTokenFetcher extends CurvePoolDynamicTokenFetcher<CurveStableFactory> {
constructor(
Expand Down
6 changes: 3 additions & 3 deletions src/apps/curve/common/curve.pool-dynamic-v2.token-fetcher.ts
@@ -1,7 +1,8 @@
import { Inject } from '@nestjs/common';
import DataLoader from 'dataloader';
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { compact, range } from 'lodash';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { ETH_ADDR_ALIAS, ZERO_ADDRESS } from '~app-toolkit/constants/address';
Expand All @@ -10,7 +11,7 @@ import {
buildPercentageDisplayItem,
} from '~app-toolkit/helpers/presentation/display-item.present';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { AppTokenTemplatePositionFetcher } from '~position/template/app-token.template.position-fetcher';
import {
GetAddressesParams,
Expand All @@ -27,7 +28,6 @@ import { CurveViemContractFactory } from '../contracts';
import { CurveTricryptoPool } from '../contracts/viem';

import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

export type CurvePoolTokenDataProps = DefaultAppTokenDataProps & {
volume: number;
Expand Down
6 changes: 3 additions & 3 deletions src/apps/curve/common/curve.pool-dynamic.token-fetcher.ts
@@ -1,7 +1,8 @@
import { Inject } from '@nestjs/common';
import DataLoader from 'dataloader';
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { compact, range } from 'lodash';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { ETH_ADDR_ALIAS, ZERO_ADDRESS } from '~app-toolkit/constants/address';
Expand All @@ -11,7 +12,7 @@ import {
} from '~app-toolkit/helpers/presentation/display-item.present';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
import { Erc20 } from '~contract/contracts/viem';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { AppTokenTemplatePositionFetcher } from '~position/template/app-token.template.position-fetcher';
import {
GetAddressesParams,
Expand All @@ -27,7 +28,6 @@ import {
import { CurveViemContractFactory } from '../contracts';

import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

export type CurvePoolTokenDataProps = DefaultAppTokenDataProps & {
swapAddress: string;
Expand Down
@@ -1,12 +1,13 @@
import { Inject } from '@nestjs/common';
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import _, { range } from 'lodash';
import { duration } from 'moment';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { ZERO_ADDRESS } from '~app-toolkit/constants/address';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { MetaType } from '~position/position.interface';
import { isClaimable, isSupplied } from '~position/position.utils';
import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
Expand All @@ -20,7 +21,6 @@ import {

import { CurveViemContractFactory } from '../contracts';
import { CurveGaugeV6 } from '../contracts/viem/CurveGaugeV6';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

export type CurvePoolGaugeDataProps = {
liquidity: number;
Expand Down
@@ -1,12 +1,13 @@
import { Inject } from '@nestjs/common';
import { BigNumber, BigNumberish, Contract, ethers } from 'ethers';
import { BigNumber, BigNumberish, ethers } from 'ethers';
import { range } from 'lodash';
import moment from 'moment';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { ZERO_ADDRESS } from '~app-toolkit/constants/address';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { MetaType } from '~position/position.interface';
import { isClaimable, isSupplied } from '~position/position.utils';
import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
Expand All @@ -20,7 +21,6 @@ import {

import { CurveViemContractFactory } from '../contracts';
import { CurveGauge } from '../contracts/viem';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

export enum GaugeType {
SINGLE = 'single',
Expand Down
5 changes: 2 additions & 3 deletions src/apps/curve/common/curve.pool-static.token-fetcher.ts
@@ -1,5 +1,5 @@
import { Inject } from '@nestjs/common';
import { BigNumberish, Contract } from 'ethers';
import { BigNumberish } from 'ethers';
import { compact, range } from 'lodash';
import { Abi, GetContractReturnType, PublicClient } from 'viem';

Expand All @@ -10,9 +10,8 @@ import {
buildPercentageDisplayItem,
} from '~app-toolkit/helpers/presentation/display-item.present';
import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
import { ContractViemContractFactory } from '~contract/contracts';
import { Erc20 } from '~contract/contracts/viem';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { isViemMulticallUnderlyingError } from '~multicall/errors';
import { AppTokenTemplatePositionFetcher } from '~position/template/app-token.template.position-fetcher';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/apps/curve/common/curve.stable-pool.token-fetcher.ts
Expand Up @@ -4,6 +4,7 @@ import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';

import { CurveViemContractFactory } from '../contracts';
import { CurveStableRegistry } from '../contracts/viem';
import { CurveStableRegistryContract } from '../contracts/viem/CurveStableRegistry';

import {
CurvePoolDynamicTokenFetcher,
Expand All @@ -15,7 +16,6 @@ import {
ResolveTokenAddressParams,
} from './curve.pool-dynamic.token-fetcher';
import { CurveVolumeDataLoader } from './curve.volume.data-loader';
import { CurveStableRegistryContract } from '../contracts/viem/CurveStableRegistry';

export abstract class CurveStablePoolTokenFetcher extends CurvePoolDynamicTokenFetcher<CurveStableRegistry> {
constructor(
Expand Down
2 changes: 1 addition & 1 deletion src/apps/dolomite/arbitrum/dolomite.pools.token-fetcher.ts
Expand Up @@ -17,8 +17,8 @@ import { GetDisplayPropsParams } from '~position/template/app-token.template.typ
import { DOLOMITE_AMM_FACTORY_ADDRESSES } from '../common/utils';
import { DolomiteViemContractFactory } from '../contracts';
import { DolomiteAmmFactory, DolomiteAmmPair } from '../contracts/viem';
import { DolomiteAmmPairContract } from '../contracts/viem/DolomiteAmmPair';
import { DolomiteAmmFactoryContract } from '../contracts/viem/DolomiteAmmFactory';
import { DolomiteAmmPairContract } from '../contracts/viem/DolomiteAmmPair';

@PositionTemplate()
export class ArbitrumDolomitePoolsTokenFetcher extends UniswapV2PoolOnChainTemplateTokenFetcher<
Expand Down
Expand Up @@ -25,7 +25,7 @@ import {
DOLOMITE_MARGIN_ADDRESSES,
} from '~apps/dolomite/common/utils';
import { DolomiteViemContractFactory } from '~apps/dolomite/contracts';
import { IMulticallWrapper, ViemMulticallDataLoader } from '~multicall';
import { ViemMulticallDataLoader } from '~multicall';
import { ContractPositionBalance } from '~position/position-balance.interface';
import { MetaType } from '~position/position.interface';
import {
Expand All @@ -37,6 +37,7 @@ import {
UnderlyingTokenDefinition,
} from '~position/template/contract-position.template.types';
import { CustomContractPositionTemplatePositionFetcher } from '~position/template/custom-contract-position.template.position-fetcher';

import { DolomiteMargin } from '../contracts/viem';

type MarginAccountsResponseType = {
Expand Down
4 changes: 2 additions & 2 deletions src/apps/dolomite/common/utils.ts
@@ -1,7 +1,6 @@
import { BigNumber, BigNumberish, ethers } from 'ethers';
import { BigNumber, BigNumberish } from 'ethers';

import { DolomiteMargin } from '~apps/dolomite/contracts/viem';
import { Multicall } from '~contract/contracts/viem';
import { ViemMulticallDataLoader } from '~multicall';
import { DefaultDataProps } from '~position/display.interface';
import { ContractPosition, MetaType } from '~position/position.interface';
Expand All @@ -13,6 +12,7 @@ import {
UnderlyingTokenDefinition,
} from '~position/template/contract-position.template.types';
import { Network } from '~types';

import { DolomiteViemContractFactory } from '../contracts';

export interface AccountStruct {
Expand Down

0 comments on commit 7f743cb

Please sign in to comment.