From 7b9ddc63068fbe4e6f1ea738e0f16ff9a38d1e93 Mon Sep 17 00:00:00 2001 From: JD Date: Tue, 23 Jul 2024 09:26:08 +0200 Subject: [PATCH] refactor: remove icreth --- .github/workflows/publish.yml | 1 - package.json | 1 - src/constants/tokens.ts | 5 - src/flashmint/builders/leveraged.test.ts | 39 +-- src/quote/provider/utils.test.ts | 9 - src/quote/provider/utils.ts | 4 +- src/tests/icreth/index.test.ts | 152 ------------ src/tests/icreth/quotes.ts | 303 ----------------------- src/tests/utils/quoteTokens.ts | 8 - src/utils/contracts.test.ts | 16 -- src/utils/contracts.ts | 2 - src/utils/issuanceModules.test.ts | 8 - src/utils/issuanceModules.ts | 2 - 13 files changed, 3 insertions(+), 547 deletions(-) delete mode 100644 src/tests/icreth/index.test.ts delete mode 100644 src/tests/icreth/quotes.ts diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8dc4b368..26cfd094 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -47,7 +47,6 @@ jobs: # - run: npm run test:eth2x # - run: npm run test:gtceth # - run: npm run test:iceth - # - run: npm run test:icreth # run last - as it alters the block number # skip as it can't be minted or redeemed with 0x # - run: npm run test:eth2xfli diff --git a/package.json b/package.json index a328e56b..560b25ef 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "test:gtceth": "npm test src/tests/gtceth", "test:hyeth": "npm test src/tests/hyeth.test.ts", "test:iceth": "npm test src/tests/iceth", - "test:icreth": "npm test src/tests/icreth", "test:watch": "jest --watch" }, "keywords": [ diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index 88b1c2e9..e2447cba 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -86,11 +86,6 @@ export const InterestCompoundingETHIndex: Token = { address: '0x7C07F7aBe10CE8e33DC6C5aD68FE033085256A84', } -export const LeveragedrEthStakingYield: Token = { - symbol: 'icRETH', - address: '0xcCdAE12162566E3f29fEfA7Bf7F5b24C644493b5', -} - export const MetaverseIndex: Token = { address: '0x72e364F2ABdC788b7E918bc238B21f109Cd634D7', addressPolygon: '0xfe712251173A2cd5F5bE2B46Bb528328EA3565E1', diff --git a/src/flashmint/builders/leveraged.test.ts b/src/flashmint/builders/leveraged.test.ts index 2cd4310b..c1fad765 100644 --- a/src/flashmint/builders/leveraged.test.ts +++ b/src/flashmint/builders/leveraged.test.ts @@ -1,9 +1,6 @@ import { BigNumber } from '@ethersproject/bignumber' -import { - ExchangeIssuanceLeveragedMainnetAddress, - FlashMintLeveragedAddress, -} from 'constants/contracts' +import { ExchangeIssuanceLeveragedMainnetAddress } from 'constants/contracts' import { collateralDebtSwapData, debtCollateralSwapData, @@ -26,7 +23,7 @@ const chainId = 1 const provider = LocalhostProvider const rpcUrl = LocalhostProviderUrl -const { iceth, icreth, reth, usdc } = QuoteTokens +const { iceth, usdc } = QuoteTokens const eth = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE' const indexToken = iceth @@ -175,38 +172,6 @@ describe('LeveragedTransactionBuilder()', () => { expect(tx.value).toEqual(buildRequest.inputOutputTokenAmount) }) - test('returns a tx for minting icRETH (rETH)', async () => { - const isMinting = true - const buildRequest = { - isMinting, - indexToken: icreth.address, - indexTokenSymbol: icreth.symbol, - inputOutputToken: reth.address, - inputOutputTokenSymbol: reth.symbol, - indexTokenAmount: wei(1), - inputOutputTokenAmount: BigNumber.from(194235680), - swapDataDebtCollateral: isMinting - ? collateralDebtSwapData['icETH'] - : debtCollateralSwapData['icETH'], - swapDataPaymentToken: isMinting - ? inputSwapData[indexToken.symbol]['ETH'] - : outputSwapData[indexToken.symbol]['ETH'], - } - const refTx = await contract.populateTransaction.issueExactSetFromERC20( - buildRequest.indexToken, - buildRequest.indexTokenAmount, - buildRequest.inputOutputToken, - buildRequest.inputOutputTokenAmount, - buildRequest.swapDataDebtCollateral, - buildRequest.swapDataPaymentToken - ) - const builder = new LeveragedTransactionBuilder(rpcUrl) - const tx = await builder.build(buildRequest) - if (!tx) fail() - expect(tx.to).toBe(FlashMintLeveragedAddress) - expect(tx.data).toEqual(refTx.data) - }) - test('returns a tx for redeeming dsETH (ERC20)', async () => { const buildRequest = createBuildRequest(false) const refTx = await contract.populateTransaction.redeemExactSetForERC20( diff --git a/src/quote/provider/utils.test.ts b/src/quote/provider/utils.test.ts index 441ac246..0d662303 100644 --- a/src/quote/provider/utils.test.ts +++ b/src/quote/provider/utils.test.ts @@ -14,7 +14,6 @@ import { IndexCoopInverseBitcoinIndex, IndexCoopInverseEthereumIndex, InterestCompoundingETHIndex, - LeveragedrEthStakingYield, MetaverseIndex, } from 'constants/tokens' @@ -136,12 +135,4 @@ describe('getContractType()', () => { ) expect(contractType).toBe(FlashMintContractType.leveraged) }) - - test('returns correct contract type for icRETH', async () => { - const contractType = getContractType( - LeveragedrEthStakingYield.symbol, - ChainId.Mainnet - ) - expect(contractType).toBe(FlashMintContractType.leveraged) - }) }) diff --git a/src/quote/provider/utils.ts b/src/quote/provider/utils.ts index b3f413c1..a8f0d9b7 100644 --- a/src/quote/provider/utils.ts +++ b/src/quote/provider/utils.ts @@ -15,7 +15,6 @@ import { IndexCoopInverseBitcoinIndex, IndexCoopInverseEthereumIndex, InterestCompoundingETHIndex, - LeveragedrEthStakingYield, MetaverseIndex, RealWorldAssetIndex, } from 'constants/tokens' @@ -56,8 +55,7 @@ export function getContractType( token === ETH2xFlexibleLeverageIndex.symbol || token === IndexCoopBitcoin2xIndex.symbol || token === IndexCoopEthereum2xIndex.symbol || - token === InterestCompoundingETHIndex.symbol || - token === LeveragedrEthStakingYield.symbol + token === InterestCompoundingETHIndex.symbol ) return FlashMintContractType.leveraged return null diff --git a/src/tests/icreth/index.test.ts b/src/tests/icreth/index.test.ts deleted file mode 100644 index 0f3c1d46..00000000 --- a/src/tests/icreth/index.test.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { - IndexZeroExSwapQuoteProvider, - LocalhostProvider, - QuoteTokens, - SignerAccount2, - TestFactory, - transferFromWhale, - wei, - wrapETH, -} from '../utils' - -const { eth, icreth, reth, usdc, weth } = QuoteTokens - -const signer = SignerAccount2 -const swapQuoteProvider = IndexZeroExSwapQuoteProvider - -describe('icRETH (mainnet) - ETH', () => { - let factory: TestFactory - beforeAll(async () => { - const provider = LocalhostProvider - factory = new TestFactory(provider, signer, swapQuoteProvider) - }) - - test('can mint icRETH', async () => { - await factory.fetchQuote({ - isMinting: true, - inputToken: eth, - outputToken: icreth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await factory.executeTx() - }) - - test('can redeem icRETH for ETH', async () => { - await factory.fetchQuote({ - isMinting: false, - inputToken: icreth, - outputToken: eth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await factory.executeTx() - }) -}) - -describe.skip('icRETH (mainnet) - rETH', () => { - let factory: TestFactory - beforeAll(async () => { - const provider = LocalhostProvider - factory = new TestFactory(provider, signer, swapQuoteProvider) - }) - - test('can mint icRETH', async () => { - const rethWhale = '0x7d6149aD9A573A6E2Ca6eBf7D4897c1B766841B4' - const quote = await factory.fetchQuote({ - isMinting: true, - inputToken: reth, - outputToken: icreth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await transferFromWhale( - rethWhale, - factory.getSigner().address, - wei(100), - quote.inputToken.address, - factory.getProvider() - ) - await factory.executeTx() - }) - - test('can redeem icRETH for rETH', async () => { - await factory.fetchQuote({ - isMinting: false, - inputToken: icreth, - outputToken: reth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await factory.executeTx() - }) -}) - -describe.skip('icRETH (mainnet) - USDC', () => { - let factory: TestFactory - beforeAll(async () => { - const provider = LocalhostProvider - factory = new TestFactory(provider, signer, swapQuoteProvider) - }) - - test('can mint icRETH', async () => { - const usdcWhale = '0x7713974908Be4BEd47172370115e8b1219F4A5f0' - const quote = await factory.fetchQuote({ - isMinting: true, - inputToken: usdc, - outputToken: icreth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await transferFromWhale( - usdcWhale, - factory.getSigner().address, - wei(5000, 6), - quote.inputToken.address, - factory.getProvider() - ) - await factory.executeTx() - }) - - test('can redeem icRETH for USDC', async () => { - await factory.fetchQuote({ - isMinting: false, - inputToken: icreth, - outputToken: usdc, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await factory.executeTx() - }) -}) - -describe('icRETH (mainnet) - WETH', () => { - let factory: TestFactory - beforeAll(async () => { - const provider = LocalhostProvider - factory = new TestFactory(provider, signer, swapQuoteProvider) - }) - - test('can mint icRETH', async () => { - const quote = await factory.fetchQuote({ - isMinting: true, - inputToken: weth, - outputToken: icreth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await wrapETH(quote.inputOutputAmount, factory.getSigner()) - await factory.executeTx() - }) - - test('can redeem icRETH for WETH', async () => { - await factory.fetchQuote({ - isMinting: false, - inputToken: icreth, - outputToken: weth, - indexTokenAmount: wei('0.1'), - slippage: 1, - }) - await factory.executeTx() - }) -}) diff --git a/src/tests/icreth/quotes.ts b/src/tests/icreth/quotes.ts deleted file mode 100644 index 649fd2f8..00000000 --- a/src/tests/icreth/quotes.ts +++ /dev/null @@ -1,303 +0,0 @@ -export const mintQuoteUsdc1 = { - chainId: 1, - price: '0.914944134587763751', - guaranteedPrice: '0.905794693241886113', - estimatedPriceImpact: '0.0016', - to: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - data: '0x6af479b200000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000a05e0dbc562813a000000000000000000000000000000000000000000000000091428b3f713274d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002bc02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4ae78736cd615f374d3085123a210448e74fc6393000000000000000000000000000000000000000000869584cd00000000000000000000000000736923aeba891f67f041a27a6db8ab7a437d6c00000000000000000000000000000000592bd11a839e89fea25d4612f1064d71', - value: '0', - gas: '145154', - estimatedGas: '145154', - gasPrice: '27500000000', - protocolFee: '0', - minimumProtocolFee: '0', - buyTokenAddress: '0xae78736cd615f374d3085123a210448e74fc6393', - sellTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - buyAmount: '660800605338433500', - sellAmount: '722230549776859450', - sources: [ - { name: '0x', proportion: '0' }, - { name: 'Uniswap', proportion: '0' }, - { name: 'Uniswap_V2', proportion: '0' }, - { name: 'Curve', proportion: '0' }, - { name: 'Balancer', proportion: '0' }, - { name: 'Balancer_V2', proportion: '0' }, - { name: 'BancorV3', proportion: '0' }, - { name: 'SushiSwap', proportion: '0' }, - { name: 'DODO', proportion: '0' }, - { name: 'DODO_V2', proportion: '0' }, - { name: 'CryptoCom', proportion: '0' }, - { name: 'Lido', proportion: '0' }, - { name: 'MakerPsm', proportion: '0' }, - { name: 'KyberDMM', proportion: '0' }, - { name: 'Saddle', proportion: '0' }, - { name: 'Uniswap_V3', proportion: '1' }, - { name: 'Curve_V2', proportion: '0' }, - { name: 'ShibaSwap', proportion: '0' }, - { name: 'Synapse', proportion: '0' }, - { name: 'Synthetix', proportion: '0' }, - { name: 'Aave_V2', proportion: '0' }, - { name: 'Compound', proportion: '0' }, - { name: 'KyberElastic', proportion: '0' }, - ], - orders: [ - { - type: 0, - source: 'Uniswap_V3', - makerToken: '0xae78736cd615f374d3085123a210448e74fc6393', - takerToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - makerAmount: '660800605338433500', - takerAmount: '722230549776859450', - fillData: { - router: '0xe592427a0aece92de3edee1f18e0157c05861564', - path: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4ae78736cd615f374d3085123a210448e74fc6393', - gasUsed: 9577, - routerVersion: 1, - }, - fill: { - input: '722230549776859450', - output: '660800605338433500', - adjustedOutput: '657802076813112313', - gas: 119172, - }, - }, - ], - allowanceTarget: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - decodedUniqueId: '0x592bd11a839e89fea25d4612f1064d71', - sellTokenToEthRate: '1', - buyTokenToEthRate: '0.91495821938685616', - fees: { zeroExFee: null }, - grossPrice: '0.914944134587763751', - grossBuyAmount: '660800605338433500', - grossSellAmount: '722230549776859450', - auxiliaryChainData: {}, - expectedSlippage: null, -} - -export const mintQuoteUsdc2 = { - chainId: 1, - price: '1847.90097', - guaranteedPrice: '1866.379981', - estimatedPriceImpact: '0.2205', - to: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - data: '0x6af479b20000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000b87e1f500000000000000000000000000000000000000000000000001703f3825360e4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4ae78736cd615f374d3085123a210448e74fc6393000000000000000000000000000000000000000000000000000000000000869584cd00000000000000000000000000736923aeba891f67f041a27a6db8ab7a437d6c0000000000000000000000000000000021f49c0394f3156e80f860d83d1d722e', - value: '0', - gas: '165304', - estimatedGas: '165304', - gasPrice: '27500000000', - protocolFee: '0', - minimumProtocolFee: '0', - buyTokenAddress: '0xae78736cd615f374d3085123a210448e74fc6393', - sellTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - buyAmount: '103652301804539457', - sellAmount: '191539189', - sources: [ - { name: '0x', proportion: '0' }, - { name: 'Uniswap', proportion: '0' }, - { name: 'Uniswap_V2', proportion: '0' }, - { name: 'Curve', proportion: '0' }, - { name: 'Balancer', proportion: '0' }, - { name: 'Balancer_V2', proportion: '0' }, - { name: 'BancorV3', proportion: '0' }, - { name: 'SushiSwap', proportion: '0' }, - { name: 'DODO', proportion: '0' }, - { name: 'DODO_V2', proportion: '0' }, - { name: 'CryptoCom', proportion: '0' }, - { name: 'Lido', proportion: '0' }, - { name: 'MakerPsm', proportion: '0' }, - { name: 'KyberDMM', proportion: '0' }, - { name: 'Saddle', proportion: '0' }, - { name: 'Uniswap_V3', proportion: '1' }, - { name: 'Curve_V2', proportion: '0' }, - { name: 'ShibaSwap', proportion: '0' }, - { name: 'Synapse', proportion: '0' }, - { name: 'Synthetix', proportion: '0' }, - { name: 'Aave_V2', proportion: '0' }, - { name: 'Compound', proportion: '0' }, - { name: 'KyberElastic', proportion: '0' }, - ], - orders: [ - { - type: 0, - source: 'Uniswap_V3', - makerToken: '0xae78736cd615f374d3085123a210448e74fc6393', - takerToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - makerAmount: '103652301804539457', - takerAmount: '191539189', - fillData: { - router: '0xe592427a0aece92de3edee1f18e0157c05861564', - path: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb480001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4ae78736cd615f374d3085123a210448e74fc6393', - gasUsed: 19652, - routerVersion: 1, - }, - fill: { - input: '103652301804539457', - output: '191539189', - adjustedOutput: '191539189', - gas: 139296, - }, - }, - ], - allowanceTarget: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - decodedUniqueId: '0x21f49c0394f3156e80f860d83d1d722e', - sellTokenToEthRate: '1687.02568', - buyTokenToEthRate: '0.91495821938685616', - fees: { zeroExFee: null }, - grossPrice: '1847.90097', - grossBuyAmount: '103652301804539457', - grossSellAmount: '191539189', - auxiliaryChainData: {}, - expectedSlippage: null, -} - -export const redeemQuoteUsdc1 = { - chainId: 1, - price: '0.915892504636705813', - guaranteedPrice: '0.925051429683072871', - estimatedPriceImpact: '0.1021', - to: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - data: '0x6af479b200000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000945b26eb798959d0000000000000000000000000000000000000000000000000a0604290c90f50d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002bae78736cd615f374d3085123a210448e74fc63930001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000869584cd00000000000000000000000000736923aeba891f67f041a27a6db8ab7a437d6c0000000000000000000000000000000055605366b0bac8c01627f4ced4769d77', - value: '0', - gas: '144634', - estimatedGas: '144634', - gasPrice: '26500000000', - protocolFee: '0', - minimumProtocolFee: '0', - buyTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - sellTokenAddress: '0xae78736cd615f374d3085123a210448e74fc6393', - buyAmount: '722269364590540045', - sellAmount: '661521097357191759', - sources: [ - { name: '0x', proportion: '0' }, - { name: 'Uniswap', proportion: '0' }, - { name: 'Uniswap_V2', proportion: '0' }, - { name: 'Curve', proportion: '0' }, - { name: 'Balancer', proportion: '0' }, - { name: 'Balancer_V2', proportion: '0' }, - { name: 'BancorV3', proportion: '0' }, - { name: 'SushiSwap', proportion: '0' }, - { name: 'DODO', proportion: '0' }, - { name: 'DODO_V2', proportion: '0' }, - { name: 'CryptoCom', proportion: '0' }, - { name: 'Lido', proportion: '0' }, - { name: 'MakerPsm', proportion: '0' }, - { name: 'KyberDMM', proportion: '0' }, - { name: 'Saddle', proportion: '0' }, - { name: 'Uniswap_V3', proportion: '1' }, - { name: 'Curve_V2', proportion: '0' }, - { name: 'ShibaSwap', proportion: '0' }, - { name: 'Synapse', proportion: '0' }, - { name: 'Synthetix', proportion: '0' }, - { name: 'Aave_V2', proportion: '0' }, - { name: 'Compound', proportion: '0' }, - { name: 'KyberElastic', proportion: '0' }, - ], - orders: [ - { - type: 0, - source: 'Uniswap_V3', - makerToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - takerToken: '0xae78736cd615f374d3085123a210448e74fc6393', - makerAmount: '722269364590540045', - takerAmount: '661521097357191759', - fillData: { - router: '0xe592427a0aece92de3edee1f18e0157c05861564', - path: '0xae78736cd615f374d3085123a210448e74fc63930001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - gasUsed: 9317, - routerVersion: 1, - }, - fill: { - input: '722269364590540045', - output: '661521097357191759', - adjustedOutput: '661521097357191759', - gas: 118632, - }, - }, - ], - allowanceTarget: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - decodedUniqueId: '0x55605366b0bac8c01627f4ced4769d77', - sellTokenToEthRate: '0.91495821938685616', - buyTokenToEthRate: '1', - fees: { zeroExFee: null }, - grossPrice: '0.915892504636705813', - grossBuyAmount: '722269364590540045', - grossSellAmount: '661521097357191759', - auxiliaryChainData: {}, - expectedSlippage: null, -} - -export const redeemQuoteUsdc2 = { - chainId: 1, - price: '1844.195674', - guaranteedPrice: '1825.753717', - estimatedPriceImpact: '0', - to: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - data: '0x6af479b20000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000016dafef9c30acf6000000000000000000000000000000000000000000000000000000000b338e4700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042ae78736cd615f374d3085123a210448e74fc63930001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000000000869584cd00000000000000000000000000736923aeba891f67f041a27a6db8ab7a437d6c000000000000000000000000000000001fd95a3c4511e274ecf2104436f24737', - value: '0', - gas: '165410', - estimatedGas: '165410', - gasPrice: '26500000000', - protocolFee: '0', - minimumProtocolFee: '0', - buyTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - sellTokenAddress: '0xae78736cd615f374d3085123a210448e74fc6393', - buyAmount: '189826399', - sellAmount: '102931810151869686', - sources: [ - { name: '0x', proportion: '0' }, - { name: 'Uniswap', proportion: '0' }, - { name: 'Uniswap_V2', proportion: '0' }, - { name: 'Curve', proportion: '0' }, - { name: 'Balancer', proportion: '0' }, - { name: 'Balancer_V2', proportion: '0' }, - { name: 'BancorV3', proportion: '0' }, - { name: 'SushiSwap', proportion: '0' }, - { name: 'DODO', proportion: '0' }, - { name: 'DODO_V2', proportion: '0' }, - { name: 'CryptoCom', proportion: '0' }, - { name: 'Lido', proportion: '0' }, - { name: 'MakerPsm', proportion: '0' }, - { name: 'KyberDMM', proportion: '0' }, - { name: 'Saddle', proportion: '0' }, - { name: 'Uniswap_V3', proportion: '1' }, - { name: 'Curve_V2', proportion: '0' }, - { name: 'ShibaSwap', proportion: '0' }, - { name: 'Synapse', proportion: '0' }, - { name: 'Synthetix', proportion: '0' }, - { name: 'Aave_V2', proportion: '0' }, - { name: 'Compound', proportion: '0' }, - { name: 'KyberElastic', proportion: '0' }, - ], - orders: [ - { - type: 0, - source: 'Uniswap_V3', - makerToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - takerToken: '0xae78736cd615f374d3085123a210448e74fc6393', - makerAmount: '189826399', - takerAmount: '102931810151869686', - fillData: { - router: '0xe592427a0aece92de3edee1f18e0157c05861564', - path: '0xae78736cd615f374d3085123a210448e74fc63930001f4c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20001f4a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - gasUsed: 19705, - routerVersion: 1, - }, - fill: { - input: '102931810151869686', - output: '189826399', - adjustedOutput: '183594268', - gas: 139402, - }, - }, - ], - allowanceTarget: '0xdef1c0ded9bec7f1a1670819833240f027b25eff', - decodedUniqueId: '0x1fd95a3c4511e274ecf2104436f24737', - sellTokenToEthRate: '0.91495821938685616', - buyTokenToEthRate: '1687.02568', - fees: { zeroExFee: null }, - grossPrice: '1844.195674', - grossBuyAmount: '189826399', - grossSellAmount: '102931810151869686', - auxiliaryChainData: {}, - expectedSlippage: null, -} diff --git a/src/tests/utils/quoteTokens.ts b/src/tests/utils/quoteTokens.ts index 57e81675..af8ea2cf 100644 --- a/src/tests/utils/quoteTokens.ts +++ b/src/tests/utils/quoteTokens.ts @@ -11,7 +11,6 @@ import { IndexCoopBitcoin2xIndex, IndexCoopEthereum2xIndex, InterestCompoundingETHIndex, - LeveragedrEthStakingYield, MetaverseIndex, RETH, USDC, @@ -89,12 +88,6 @@ const iceth: QuoteToken = { address: InterestCompoundingETHIndex.address!, } -const icreth: QuoteToken = { - symbol: LeveragedrEthStakingYield.symbol, - decimals: 18, - address: LeveragedrEthStakingYield.address!, -} - const mvi: QuoteToken = { address: MetaverseIndex.address!, decimals: 18, @@ -155,7 +148,6 @@ export const QuoteTokens = { gtcETH, hyeth, iceth, - icreth, mvi, reth, seth2, diff --git a/src/utils/contracts.test.ts b/src/utils/contracts.test.ts index d3a92021..2bc947b6 100644 --- a/src/utils/contracts.test.ts +++ b/src/utils/contracts.test.ts @@ -17,7 +17,6 @@ import { InterestCompoundingETHIndex, wsETH2, GitcoinStakedETHIndex, - LeveragedrEthStakingYield, IndexCoopEthereum2xIndex, IndexCoopBitcoin2xIndex, IndexCoopEthereum3xIndex, @@ -127,21 +126,6 @@ describe('getFlashMintLeveragedContractForToken()', () => { expect(contract.functions.redeemExactSetForETH).toBeDefined() }) - test('returns FlashMintLeveraged contract for icRETH (mainnet)', async () => { - const expectedAddress = FlashMintLeveragedAddress - const contract = getFlashMintLeveragedContractForToken( - LeveragedrEthStakingYield.symbol, - undefined, - 1 - ) - expect(contract.address).toEqual(expectedAddress) - expect(contract.functions.getLeveragedTokenData).toBeDefined() - expect(contract.functions.issueExactSetFromERC20).toBeDefined() - expect(contract.functions.issueExactSetFromETH).toBeDefined() - expect(contract.functions.redeemExactSetForERC20).toBeDefined() - expect(contract.functions.redeemExactSetForETH).toBeDefined() - }) - test('returns the old FlashMintLeveraged contract (mainnet)', async () => { const expectedAddress = ExchangeIssuanceLeveragedMainnetAddress const contract = getFlashMintLeveragedContractForToken( diff --git a/src/utils/contracts.ts b/src/utils/contracts.ts index e81ef05a..ea55f232 100644 --- a/src/utils/contracts.ts +++ b/src/utils/contracts.ts @@ -27,7 +27,6 @@ import { DiversifiedStakedETHIndex, wsETH2, GitcoinStakedETHIndex, - LeveragedrEthStakingYield, CoinDeskEthTrendIndex, IndexCoopEthereum2xIndex, IndexCoopBitcoin2xIndex, @@ -164,7 +163,6 @@ export const getFlashMintLeveragedContractForToken = ( return getFlashMintLeveragedForCompoundContract(signerOrProvider) case IndexCoopBitcoin2xIndex.symbol: case IndexCoopEthereum2xIndex.symbol: - case LeveragedrEthStakingYield.symbol: return getIndexFlashMintLeveragedContract(signerOrProvider) default: return getFlashMintLeveragedContract(signerOrProvider, chainId) diff --git a/src/utils/issuanceModules.test.ts b/src/utils/issuanceModules.test.ts index 911c3da1..cefd6a9d 100644 --- a/src/utils/issuanceModules.test.ts +++ b/src/utils/issuanceModules.test.ts @@ -18,7 +18,6 @@ import { InterestCompoundingETHIndex, MetaverseIndex, wsETH2, - LeveragedrEthStakingYield, IndexCoopEthereum2xIndex, IndexCoopBitcoin2xIndex, IndexCoopBitcoin3xIndex, @@ -63,13 +62,6 @@ describe('getIssuanceModule() - Mainnet - IndexProtocol', () => { expect(issuanceModule.isDebtIssuance).toBe(true) }) - test('returns debt issuance module v2 for icRETH', async () => { - const expectedModule = IndexDebtIssuanceModuleV2Address_v2 - const issuanceModule = getIssuanceModule(LeveragedrEthStakingYield.symbol) - expect(issuanceModule.address).toEqual(expectedModule) - expect(issuanceModule.isDebtIssuance).toBe(true) - }) - test('returns debt issuance module v2 for wsETH2', async () => { const expectedModule = IndexDebtIssuanceModuleV2Address const issuanceModule = getIssuanceModule(wsETH2.symbol) diff --git a/src/utils/issuanceModules.ts b/src/utils/issuanceModules.ts index 44b62f8b..a3a0083f 100644 --- a/src/utils/issuanceModules.ts +++ b/src/utils/issuanceModules.ts @@ -15,7 +15,6 @@ import { InterestCompoundingETHIndex, wsETH2, GitcoinStakedETHIndex, - LeveragedrEthStakingYield, CoinDeskEthTrendIndex, IndexCoopEthereum2xIndex, IndexCoopBitcoin2xIndex, @@ -53,7 +52,6 @@ export function getIssuanceModule( case HighYieldETHIndex.symbol: case IndexCoopBitcoin2xIndex.symbol: case IndexCoopEthereum2xIndex.symbol: - case LeveragedrEthStakingYield.symbol: case RealWorldAssetIndex.symbol: return { address: IndexDebtIssuanceModuleV2Address_v2,