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

Commit

Permalink
fix: Fix linting and logo in wBAN (#249)
Browse files Browse the repository at this point in the history
  • Loading branch information
immasandwich committed Apr 25, 2022
1 parent 371841a commit b3a170f
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 26 deletions.
Binary file added src/apps/wban/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/apps/wban/binance-smart-chain/wban.balance-fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation/balance-fetcher-response.present';
import { BalanceFetcher } from '~balance/balance-fetcher.interface';
import { Network } from '~types/network.interface';

import { WbanFarmBalanceFetcherHelper } from '../helpers/wban.farm.balance-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { PositionFetcher } from '~position/position-fetcher.interface';
import { ContractPosition } from '~position/position.interface';
import { Network } from '~types/network.interface';

import { WbanFarmContractPositionFetcherHelper } from '../helpers/wban.farm.contract-position-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand All @@ -14,7 +16,9 @@ const BENIS = '0x1E30E12e82956540bf870A40FD1215fC083a3751';

@Register.ContractPositionFetcher({ appId, groupId, network })
export class BinanceSmartChainWbanFarmContractPositionFetcher implements PositionFetcher<ContractPosition> {
constructor(@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper) {}
constructor(
@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper,
) {}

async getPositions() {
return this.helper.getPools(network, appId, groupId, BENIS, [
Expand Down
2 changes: 2 additions & 0 deletions src/apps/wban/fantom/wban.balance-fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation/balance-fetcher-response.present';
import { BalanceFetcher } from '~balance/balance-fetcher.interface';
import { Network } from '~types/network.interface';

import { WbanFarmBalanceFetcherHelper } from '../helpers/wban.farm.balance-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand Down
10 changes: 6 additions & 4 deletions src/apps/wban/fantom/wban.farm.contract-position-fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { PositionFetcher } from '~position/position-fetcher.interface';
import { ContractPosition } from '~position/position.interface';
import { Network } from '~types/network.interface';

import { WbanFarmContractPositionFetcherHelper } from '../helpers/wban.farm.contract-position-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand All @@ -14,11 +16,11 @@ const BENIS = '0xD91f84D4E2d9f4fa508c61356A6CB81a306e5287';

@Register.ContractPositionFetcher({ appId, groupId, network })
export class FantomWbanFarmContractPositionFetcher implements PositionFetcher<ContractPosition> {
constructor(@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper) {}
constructor(
@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper,
) {}

async getPositions() {
return this.helper.getPools(network, appId, groupId, BENIS, [
{ appId: 'spookyswap', groupIds: ['pool'], network },
]);
return this.helper.getPools(network, appId, groupId, BENIS, [{ appId: 'spookyswap', groupIds: ['pool'], network }]);
}
}
11 changes: 8 additions & 3 deletions src/apps/wban/helpers/wban.farm.balance-fetcher-helper.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Inject, Injectable } from '@nestjs/common';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { Network } from '~types/network.interface';

import { Benis, WbanContractFactory } from '../contracts';

@Injectable()
Expand All @@ -17,14 +19,17 @@ export class WbanFarmBalanceFetcherHelper {
appId,
groupId,
resolveChefContract: ({ contractAddress }) =>
this.wbanContractFactory.benis({ address: contractAddress, network}),
this.wbanContractFactory.benis({ address: contractAddress, network }),
resolveStakedTokenBalance: this.appToolkit.helpers.masterChefDefaultStakedBalanceStrategy.build({
resolveStakedBalance: ({ contract, multicall, contractPosition }) =>
multicall.wrap(contract).userInfo(contractPosition.dataProps.poolIndex, address).then(userInfo => userInfo.amount)
multicall
.wrap(contract)
.userInfo(contractPosition.dataProps.poolIndex, address)
.then(userInfo => userInfo.amount),
}),
resolveClaimableTokenBalances: this.appToolkit.helpers.masterChefDefaultClaimableBalanceStrategy.build({
resolveClaimableBalance: ({ multicall, contract, contractPosition, address }) =>
multicall.wrap(contract).pendingWBAN(contractPosition.dataProps.poolIndex, address)
multicall.wrap(contract).pendingWBAN(contractPosition.dataProps.poolIndex, address),
}),
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { Inject, Injectable } from '@nestjs/common';
import { Network } from '~types/network.interface';

import { MasterChefContractPositionDataProps } from '~app-toolkit';
import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { ContractPosition } from '~position/position.interface';
import { AppGroupsDefinition } from '~position/position.service';
import { Network } from '~types/network.interface';

import { Benis, WbanContractFactory } from '../contracts';

@Injectable()
Expand All @@ -13,8 +15,13 @@ export class WbanFarmContractPositionFetcherHelper {
@Inject(WbanContractFactory) private readonly contractFactory: WbanContractFactory,
) {}

async getPools(network: Network, appId: string, groupId: string, benisAddress: string, dependencies: AppGroupsDefinition[])
: Promise<ContractPosition<MasterChefContractPositionDataProps>[]> {
async getPools(
network: Network,
appId: string,
groupId: string,
benisAddress: string,
dependencies: AppGroupsDefinition[],
): Promise<ContractPosition<MasterChefContractPositionDataProps>[]> {
return this.appToolkit.helpers.masterChefContractPositionHelper.getContractPositions<Benis>({
address: benisAddress,
appId,
Expand All @@ -24,13 +31,19 @@ export class WbanFarmContractPositionFetcherHelper {
resolveContract: ({ address, network }) => this.contractFactory.benis({ address, network }),
resolvePoolLength: ({ multicall, contract }) => multicall.wrap(contract).poolLength(),
resolveDepositTokenAddress: ({ poolIndex, contract, multicall }) =>
multicall.wrap(contract).poolInfo(poolIndex).then(poolInfo => poolInfo.stakingToken),
multicall
.wrap(contract)
.poolInfo(poolIndex)
.then(poolInfo => poolInfo.stakingToken),
resolveRewardTokenAddresses: ({ multicall, contract }) => multicall.wrap(contract).wban(),
resolveRewardRate: this.appToolkit.helpers.masterChefDefaultRewardsPerBlockStrategy.build({
resolvePoolAllocPoints: async ({ poolIndex, contract, multicall }) =>
multicall.wrap(contract).poolInfo(poolIndex).then(poolInfo => poolInfo.allocPoint),
multicall
.wrap(contract)
.poolInfo(poolIndex)
.then(poolInfo => poolInfo.allocPoint),
resolveTotalAllocPoints: ({ multicall, contract }) => multicall.wrap(contract).totalAllocPoint(),
resolveTotalRewardPerBlock: ({ multicall, contract }) => multicall.wrap(contract).wbanPerSecond(),
resolveTotalRewardRate: ({ multicall, contract }) => multicall.wrap(contract).wbanPerSecond(),
}),
});
}
Expand Down
3 changes: 2 additions & 1 deletion src/apps/wban/polygon/wban.balance-fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation/balance-fetcher-response.present';
import { BalanceFetcher } from '~balance/balance-fetcher.interface';
import { Network } from '~types/network.interface';

import { WbanFarmBalanceFetcherHelper } from '../helpers/wban.farm.balance-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand All @@ -23,5 +25,4 @@ export class PolygonWbanBalanceFetcher implements BalanceFetcher {
},
]);
}

}
10 changes: 6 additions & 4 deletions src/apps/wban/polygon/wban.farm.contract-position-fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Inject } from '@nestjs/common';

import { Register } from '~app-toolkit/decorators';
import { PositionFetcher } from '~position/position-fetcher.interface';
import { ContractPosition } from '~position/position.interface';
import { Network } from '~types/network.interface';

import { WbanFarmContractPositionFetcherHelper } from '../helpers/wban.farm.contract-position-fetcher-helper';
import { WBAN_DEFINITION } from '../wban.definition';

Expand All @@ -14,11 +16,11 @@ const BENIS = '0xefa4aED9Cf41A8A0FcdA4e88EfA2F60675bAeC9F';

@Register.ContractPositionFetcher({ appId, groupId, network })
export class PolygonWbanFarmContractPositionFetcher implements PositionFetcher<ContractPosition> {
constructor(@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper) {}
constructor(
@Inject(WbanFarmContractPositionFetcherHelper) private readonly helper: WbanFarmContractPositionFetcherHelper,
) {}

async getPositions() {
return this.helper.getPools(network, appId, groupId, BENIS, [
{ appId: 'sushiswap', groupIds: ['pool'], network },
]);
return this.helper.getPools(network, appId, groupId, BENIS, [{ appId: 'sushiswap', groupIds: ['pool'], network }]);
}
}
3 changes: 2 additions & 1 deletion src/apps/wban/wban.definition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Network } from '~types/network.interface';
export const WBAN_DEFINITION = {
id: 'wban',
name: 'wBAN',
description: 'Wrapped Banano',
description:
'Banano is a feeless, instant, rich in potassium cryptocurrency powered by DAG technology disrupting the meme economy.',
url: 'https://wrap.banano.cc',
groups: {
farm: { id: 'farm', type: GroupType.POSITION },
Expand Down
12 changes: 6 additions & 6 deletions src/apps/wban/wban.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { Module } from '@nestjs/common';
import { AbstractDynamicApp } from '~app/app.dynamic-module';
import { UniswapV2AppModule } from '~apps/uniswap-v2/uniswap-v2.module';

import { WbanAppDefinition } from './wban.definition';
import { WbanContractFactory } from './contracts';
import { WbanFarmContractPositionFetcherHelper } from './helpers/wban.farm.contract-position-fetcher-helper';
import { WbanFarmBalanceFetcherHelper } from './helpers/wban.farm.balance-fetcher-helper';
import { BinanceSmartChainWbanBalanceFetcher } from './binance-smart-chain/wban.balance-fetcher';
import { BinanceSmartChainWbanFarmContractPositionFetcher } from './binance-smart-chain/wban.farm.contract-position-fetcher';
import { PolygonWbanBalanceFetcher } from './polygon/wban.balance-fetcher';
import { PolygonWbanFarmContractPositionFetcher } from './polygon/wban.farm.contract-position-fetcher';
import { WbanContractFactory } from './contracts';
import { FantomWbanBalanceFetcher } from './fantom/wban.balance-fetcher';
import { FantomWbanFarmContractPositionFetcher } from './fantom/wban.farm.contract-position-fetcher';
import { WbanFarmBalanceFetcherHelper } from './helpers/wban.farm.balance-fetcher-helper';
import { WbanFarmContractPositionFetcherHelper } from './helpers/wban.farm.contract-position-fetcher-helper';
import { PolygonWbanBalanceFetcher } from './polygon/wban.balance-fetcher';
import { PolygonWbanFarmContractPositionFetcher } from './polygon/wban.farm.contract-position-fetcher';
import { WbanAppDefinition } from './wban.definition';

@Module({
imports: [UniswapV2AppModule.externallyConfigured(UniswapV2AppModule, 0)],
Expand Down

0 comments on commit b3a170f

Please sign in to comment.