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

Commit

Permalink
fix(apps): Linting (#2612)
Browse files Browse the repository at this point in the history
  • Loading branch information
wpoulin authored Apr 24, 2023
1 parent 791a45d commit 9b74085
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions src/apps/polynomial/common/polynomial.account-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { Inject, Injectable } from '@nestjs/common';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { PolynomialContractFactory } from '../contracts';
import { ZERO_ADDRESS } from '~app-toolkit/constants/address';
import { Network } from '~types';

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

@Injectable()
export class PolynomialAccountResolver {
polynomialAccountResolverAddress = '0x4a0b3986cb7e23df85a64100bf222cf69f9787aa';
network = Network.OPTIMISM_MAINNET;

constructor(
@Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
@Inject(PolynomialContractFactory) protected readonly polynomialContractFactory: PolynomialContractFactory
) {
}
@Inject(PolynomialContractFactory) protected readonly polynomialContractFactory: PolynomialContractFactory,
) {}

async getSmartWalletAddress(address: string): Promise<string> {
const multicall = this.appToolkit.getMulticall(this.network);
Expand All @@ -35,4 +35,4 @@ export class PolynomialAccountResolver {
}
return smartAccountAddress;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
GetTokenBalancesParams,
} from '~position/template/contract-position.template.types';

import { PolynomialContractFactory, PolynomialCoveredCall } from '../contracts';
import { isUnderlyingDenominated } from '../common/formatters';
import { PolynomialApiHelper } from '../common/polynomial.api';
import { PolynomialContractFactory, PolynomialCoveredCall } from '../contracts';

@PositionTemplate()
export class OptimismPolynomialCallSellingVaultQueueContractPositionFetcher extends ContractPositionTemplatePositionFetcher<PolynomialCoveredCall> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
GetUnderlyingTokensParams,
} from '~position/template/app-token.template.types';

import { PolynomialContractFactory, PolynomialVaultToken } from '../contracts';
import { isUnderlyingDenominated } from '../common/formatters';
import { PolynomialApiHelper } from '../common/polynomial.api';
import { PolynomialContractFactory, PolynomialVaultToken } from '../contracts';

type PolynomialCallSellingVaultTokenDefinition = {
address: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { PositionTemplate } from '~app-toolkit/decorators/position-template.deco

import { SynthetixContractFactory } from '../../synthetix/contracts';
import { OptimismSynthetixPerpV2ContractPositionFetcher } from '../../synthetix/optimism/synthetix.perp-v2.contract-position-fetcher';
import { PolynomialContractFactory } from '../contracts';
import { PolynomialAccountResolver } from '../common/polynomial.account-resolver';
import { PolynomialContractFactory } from '../contracts';

@PositionTemplate()
export class OptimismPolynomialPerpContractPositionFetcher extends OptimismSynthetixPerpV2ContractPositionFetcher {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
GetTokenBalancesParams,
} from '~position/template/contract-position.template.types';

import { PolynomialContractFactory, PolynomialPutSelling } from '../contracts';
import { isUnderlyingDenominated } from '../common/formatters';
import { PolynomialApiHelper } from '../common/polynomial.api';
import { PolynomialContractFactory, PolynomialPutSelling } from '../contracts';

@PositionTemplate()
export class OptimismPolynomialPutSellingVaultQueueContractPositionFetcher extends ContractPositionTemplatePositionFetcher<PolynomialPutSelling> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
GetUnderlyingTokensParams,
} from '~position/template/app-token.template.types';

import { PolynomialContractFactory, PolynomialVaultToken } from '../contracts';
import { isUnderlyingDenominated } from '../common/formatters';
import { PolynomialApiHelper } from '../common/polynomial.api';
import { PolynomialContractFactory, PolynomialVaultToken } from '../contracts';

type PolynomialPutSellingVaultTokenDefinition = {
address: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import Axios from 'axios';
import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
import { Erc20 } from '~contract/contracts';

import { MetaType } from '~position/position.interface';
import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
import {
DefaultContractPositionDefinition,
GetTokenBalancesParams,
} from '~position/template/contract-position.template.types';
import { MetaType } from '~position/position.interface';

import { PolynomialAccountResolver } from '../common/polynomial.account-resolver';

export type PolynomialSmartWalletDataProp = {
liquidity: number;
};

@PositionTemplate()
export class OptimismPolynomialSmartWalletContractPositionFetcher extends ContractPositionTemplatePositionFetcher<Erc20>{
export class OptimismPolynomialSmartWalletContractPositionFetcher extends ContractPositionTemplatePositionFetcher<Erc20> {
sUSD = '0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9';
groupLabel = 'Smart Wallet';

Expand Down Expand Up @@ -62,8 +62,7 @@ export class OptimismPolynomialSmartWalletContractPositionFetcher extends Contra
async getDataProps(): Promise<PolynomialSmartWalletDataProp> {
const { data } = await Axios.get<{ tvl: number }>('https://perps-api-experimental.polynomial.fi/snx-perps/tvl');
return {
liquidity: data.tvl
liquidity: data.tvl,
};
}

}
}
8 changes: 4 additions & 4 deletions src/apps/polynomial/polynomial.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { AbstractApp } from '~app/app.dynamic-module';

import { SynthetixContractFactory } from '../synthetix/contracts';

import { PolynomialContractFactory } from './contracts';
import { PolynomialApiHelper } from './common/polynomial.api';
import { PolynomialAccountResolver } from './common/polynomial.account-resolver';
import { PolynomialApiHelper } from './common/polynomial.api';
import { PolynomialContractFactory } from './contracts';
import { OptimismPolynomialCallSellingVaultQueueContractPositionFetcher } from './optimism/polynomial.call-selling-vault-queue.contract-position-fetcher';
import { OptimismPolynomialCallSellingVaultTokenFetcher } from './optimism/polynomial.call-selling-vault.token-fetcher';
import { OptimismPolynomialPerpContractPositionFetcher } from './optimism/polynomial.perp.contract-position-fetcher';
import { OptimismPolynomialSmartWalletContractPositionFetcher } from './optimism/polynomial.smart-wallet.contract-position-fetcher';
import { OptimismPolynomialPutSellingVaultQueueContractPositionFetcher } from './optimism/polynomial.put-selling-vault-queue.contract-position-fetcher';
import { OptimismPolynomialPutSellingVaultTokenFetcher } from './optimism/polynomial.put-selling-vault.token-fetcher';
import { OptimismPolynomialSmartWalletContractPositionFetcher } from './optimism/polynomial.smart-wallet.contract-position-fetcher';

@Module({
providers: [
Expand All @@ -28,4 +28,4 @@ import { OptimismPolynomialPutSellingVaultTokenFetcher } from './optimism/polyno
OptimismPolynomialSmartWalletContractPositionFetcher,
],
})
export class PolynomialAppModule extends AbstractApp() { }
export class PolynomialAppModule extends AbstractApp() {}
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';

import { OptimismSynthetixPerpContractPositionFetcher } from './synthetix.perp.contract-position-fetcher';

@PositionTemplate()
export class OptimismSynthetixPerpV1ContractPositionFetcher extends OptimismSynthetixPerpContractPositionFetcher {
groupLabel = 'PerpV1';
extraLabel = '(v1)'
extraLabel = '(v1)';

marketFilter(market) {
return !this.isV2Market(market);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';

import { OptimismSynthetixPerpContractPositionFetcher } from './synthetix.perp.contract-position-fetcher';

@PositionTemplate()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import { Inject } from '@nestjs/common';
import { parseBytes32String } from 'ethers/lib/utils';
import { gql } from 'graphql-request';
import { gqlFetch } from '~app-toolkit/helpers/the-graph.helper';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { getAppAssetImage } from '~app-toolkit/helpers/presentation/image.present';
import { gqlFetch } from '~app-toolkit/helpers/the-graph.helper';
import { DefaultDataProps } from '~position/display.interface';
import { MetaType } from '~position/position.interface';
import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
import { DefaultDataProps } from '~position/display.interface';
import {
GetDisplayPropsParams,
GetTokenBalancesParams,
} from '~position/template/contract-position.template.types';
import { GetDisplayPropsParams, GetTokenBalancesParams } from '~position/template/contract-position.template.types';

import { SynthetixContractFactory, SynthetixPerp } from '../contracts';

Expand Down Expand Up @@ -63,8 +60,7 @@ export abstract class OptimismSynthetixPerpContractPositionFetcher extends Contr
query: getContractsQuery,
});

const markets = contractsFromSubgraph.futuresMarkets
.filter(market => this.marketFilter(market));
const markets = contractsFromSubgraph.futuresMarkets.filter(market => this.marketFilter(market));

const longMarkets = this.getMarketsDefinitions(markets, 'LONG');
const shortMarkets = this.getMarketsDefinitions(markets, 'SHORT');
Expand Down Expand Up @@ -99,7 +95,10 @@ export abstract class OptimismSynthetixPerpContractPositionFetcher extends Contr
return baseAsset;
}

async getLabel({ contractPosition, definition }: GetDisplayPropsParams<SynthetixPerp, DefaultDataProps, PerpPositionDefinition>): Promise<string> {
async getLabel({
contractPosition,
definition,
}: GetDisplayPropsParams<SynthetixPerp, DefaultDataProps, PerpPositionDefinition>): Promise<string> {
const baseAsset = await this.getBaseAsset({ contractPosition });
return `${baseAsset}-PERP ${definition.side} ${this.extraLabel}`;
}
Expand All @@ -124,7 +123,8 @@ export abstract class OptimismSynthetixPerpContractPositionFetcher extends Contr
const isLong = Number(position.size) > 0;
const isShort = Number(position.size) < 0;
const isNeutral = !isLong && !isShort;
const matchesSide = (isLong && side === 'LONG') || (isShort && side === 'SHORT') || (isNeutral && side === 'NEUTRAL');
const matchesSide =
(isLong && side === 'LONG') || (isShort && side === 'SHORT') || (isNeutral && side === 'NEUTRAL');
return matchesSide ? [marginRemaining] : [];
}
}

0 comments on commit 9b74085

Please sign in to comment.