Skip to content

Commit

Permalink
Cleaning up carbon and carbon-pool
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagofilipenunes committed Jul 6, 2023
1 parent 6cffd86 commit 1154409
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions src/dex/carbon/carbon-pool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import CarbonControllerABI from '../../abi/carbon/CarbonController.abi.json';
import { EncodedStrategy, EncodedOrder } from './sdk/';
import { ChainCache } from './sdk/chain-cache';
import { BigNumber } from './sdk/utils';
import { toPairKey } from './sdk/chain-cache/utils';
import { Contract } from 'web3-eth-contract';

export class CarbonEventPool extends StatefulEventSubscriber<PoolState> {
Expand Down Expand Up @@ -155,12 +154,12 @@ export class CarbonEventPool extends StatefulEventSubscriber<PoolState> {

const strategiesList = _.map(allStrategiesPerPair.pairs, pair => {
return {
id: pair.id.toLowerCase(),
id: pair.id,
token0: pair.token0.id.toLowerCase(),
token1: pair.token1.id.toLowerCase(),
strategies: _.map(pair.strategies, strategy => {
return {
id: strategy.id.toLowerCase(),
id: strategy.id,
token0: pair.token0.id.toLowerCase(),
token1: pair.token1.id.toLowerCase(),
order0: {
Expand Down Expand Up @@ -192,8 +191,6 @@ export class CarbonEventPool extends StatefulEventSubscriber<PoolState> {
.tradingFeePPM()
.call();

this.logger.info(`Read tradingFeePPM: ${newCache.tradingFeePPM}`);

const newState: PoolState = {
sdkCache: newCache,
};
Expand All @@ -209,21 +206,21 @@ export class CarbonEventPool extends StatefulEventSubscriber<PoolState> {
log: Readonly<Log>,
blockHeader: BlockHeader,
): PoolState {
let encodedOrder0: EncodedOrder = {
const encodedOrder0: EncodedOrder = {
y: BigNumber.from(event.args.order0.y),
z: BigNumber.from(event.args.order0.z),
A: BigNumber.from(event.args.order0.A),
B: BigNumber.from(event.args.order0.B),
};

let encodedOrder1: EncodedOrder = {
const encodedOrder1: EncodedOrder = {
y: BigNumber.from(event.args.order1.y),
z: BigNumber.from(event.args.order1.z),
A: BigNumber.from(event.args.order1.A),
B: BigNumber.from(event.args.order1.B),
};

let encodedStrategy: EncodedStrategy = {
const encodedStrategy: EncodedStrategy = {
id: BigNumber.from(event.args.id),
token0: event.args.token0.toLowerCase(),
token1: event.args.token1.toLowerCase(),
Expand Down
2 changes: 1 addition & 1 deletion src/dex/carbon/carbon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export class Carbon extends SimpleExchange implements IDex<CarbonData> {
: GAS_COST_SWAP_YINT_ETH_TKN
: GAS_COST_SWAP_YINT_TKN_TKN;

let decimalMap: { [tokenAddress: string]: number } = {
const decimalMap: { [tokenAddress: string]: number } = {
[srcToken.address.toLowerCase()]: srcToken.decimals,
[destToken.address.toLowerCase()]: destToken.decimals,
};
Expand Down

0 comments on commit 1154409

Please sign in to comment.