From 115440968fa35035c66b9d86e95078f09af02211 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Thu, 6 Jul 2023 22:58:08 +0100 Subject: [PATCH] Cleaning up carbon and carbon-pool --- src/dex/carbon/carbon-pool.ts | 13 +++++-------- src/dex/carbon/carbon.ts | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/dex/carbon/carbon-pool.ts b/src/dex/carbon/carbon-pool.ts index cc585a06f..e910cb72d 100644 --- a/src/dex/carbon/carbon-pool.ts +++ b/src/dex/carbon/carbon-pool.ts @@ -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 { @@ -155,12 +154,12 @@ export class CarbonEventPool extends StatefulEventSubscriber { 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: { @@ -192,8 +191,6 @@ export class CarbonEventPool extends StatefulEventSubscriber { .tradingFeePPM() .call(); - this.logger.info(`Read tradingFeePPM: ${newCache.tradingFeePPM}`); - const newState: PoolState = { sdkCache: newCache, }; @@ -209,21 +206,21 @@ export class CarbonEventPool extends StatefulEventSubscriber { log: Readonly, 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(), diff --git a/src/dex/carbon/carbon.ts b/src/dex/carbon/carbon.ts index 4c5437750..a6feaabc9 100644 --- a/src/dex/carbon/carbon.ts +++ b/src/dex/carbon/carbon.ts @@ -192,7 +192,7 @@ export class Carbon extends SimpleExchange implements IDex { : 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, };