feat: add 0x swap data

.github/workflows/publish.yml

@@ -33,7 +33,7 @@ jobs:
       - run: npm ci
       - run: npm run lint
       - run: npm run build --if-present
-      # - run: npm run hardhat:arbitrum & npm run test:arbitrum
+      - run: npm run hardhat:arbitrum & npm run test:arbitrum
       - run: npm run hardhat & npm run test:utils
       - run: npm run hardhat & npm run test:builders
       - run: npm run hardhat & npm run test:quote
@@ -45,4 +45,5 @@ jobs:
       - run: npm run hardhat & npm run test:iceth
       # - run: npm run hardhat & npm run test:icreth
       # run last - as it alters the block number
-      - run: npm run hardhat & npm run test:eth2xfli
+      # skip as it can't be minted or redeemed with 0x
+      # - run: npm run hardhat & npm run test:eth2xfli

src/quote/indexQuoteProvider.test.ts

@@ -2,19 +2,20 @@
 import { ChainId } from 'constants/chains'
 import { FlashMintZeroExMainnetAddress } from 'constants/contracts'
 import { IndexCoopEthereum2xIndex } from 'constants/tokens'
+import {
+  getFlashMintLeveragedContractForToken,
+  getFlashMintZeroExContractForToken,
+  wei,
+} from 'utils'
+
 import {
   IndexZeroExSwapQuoteProvider,
   IndexZeroExSwapQuoteProviderArbitrum,
   LocalhostProvider,
   LocalhostProviderArbitrum,
   QuoteTokens,
-  ZeroExApiSwapQuote,
 } from 'tests/utils'
-import {
-  getFlashMintLeveragedContractForToken,
-  getFlashMintZeroExContractForToken,
-  wei,
-} from 'utils'
+
 import {
   FlashMintContractType,
   FlashMintQuoteProvider,
@@ -24,7 +25,7 @@ import {
 const provider = LocalhostProvider
 const zeroexSwapQuoteProvider = IndexZeroExSwapQuoteProvider
 
-const { cdeti, dseth, eth, eth2x, iceth, mvi, usdc } = QuoteTokens
+const { cdeti, dseth, eth, eth2x, iceth, usdc } = QuoteTokens
 
 describe('FlashMintQuoteProvider()', () => {
   test('throws if token is unsupported', async () => {
@@ -41,7 +42,10 @@ describe('FlashMintQuoteProvider()', () => {
       indexTokenAmount: wei(1),
       slippage: 0.5,
     }
-    const quoteProvider = new FlashMintQuoteProvider(provider)
+    const quoteProvider = new FlashMintQuoteProvider(
+      provider,
+      zeroexSwapQuoteProvider
+    )
     await expect(quoteProvider.getQuote(request)).rejects.toThrow(
       'Index token not supported'
     )
@@ -146,7 +150,7 @@ describe('FlashMintQuoteProvider()', () => {
     expect(quote.tx.data?.length).toBeGreaterThan(0)
   })
 
-  test.skip('returns a quote for minting ETH2X', async () => {
+  test('returns a quote for minting ETH2X', async () => {
     const arbitrumProvider = LocalhostProviderArbitrum
     const inputToken = usdc
     const outputToken = {
@@ -187,7 +191,7 @@ describe('FlashMintQuoteProvider()', () => {
     expect(quote.tx.data?.length).toBeGreaterThan(0)
   })
 
-  test.skip('returns a quote for redeeming ETH2X', async () => {
+  test('returns a quote for redeeming ETH2X', async () => {
     const arbitrumProvider = LocalhostProviderArbitrum
     const inputToken = {
       address: IndexCoopEthereum2xIndex.addressArbitrum!,
@@ -245,8 +249,7 @@ describe('FlashMintQuoteProvider()', () => {
     }
     const quoteProvider = new FlashMintQuoteProvider(
       provider,
-      undefined,
-      ZeroExApiSwapQuote
+      zeroexSwapQuoteProvider
     )
     const quote = await quoteProvider.getQuote(request)
     if (!quote) fail()
@@ -264,36 +267,4 @@ describe('FlashMintQuoteProvider()', () => {
     expect(quote.tx.to).toBe(contract.address)
     expect(quote.tx.data?.length).toBeGreaterThan(0)
   })
-
-  test('should fail if zeroExApiV1 is undefined for contract type leveraged', async () => {
-    const inputToken = usdc
-    const outputToken = iceth
-    const request: FlashMintQuoteRequest = {
-      isMinting: true,
-      inputToken,
-      outputToken,
-      indexTokenAmount: wei(1),
-      slippage: 0.5,
-    }
-    const quoteProvider = new FlashMintQuoteProvider(provider)
-    await expect(quoteProvider.getQuote(request)).rejects.toThrow(
-      'Contract type requires ZeroExApiV1 to be defined'
-    )
-  })
-
-  test('should fail if swap quote provider is undefined for contract type zeroEx', async () => {
-    const inputToken = usdc
-    const outputToken = mvi
-    const request: FlashMintQuoteRequest = {
-      isMinting: true,
-      inputToken,
-      outputToken,
-      indexTokenAmount: wei(1),
-      slippage: 0.5,
-    }
-    const quoteProvider = new FlashMintQuoteProvider(provider)
-    await expect(quoteProvider.getQuote(request)).rejects.toThrow(
-      'Contract type requires SwapQuoteProvider to be defined'
-    )
-  })
 })

src/quote/indexQuoteProvider.ts

@@ -29,19 +29,18 @@ import {
   LeveragedTransactionBuilder,
   ZeroExTransactionBuilder,
 } from 'flashmint'
-import { ZeroExApi, wei } from 'utils'
+import { wei } from 'utils'
 
 import { LeveragedQuoteProvider } from './leveraged'
 import { LeveragedExtendedQuoteProvider } from './leveraged-extended'
 import { QuoteProvider } from './quoteProvider'
 import { QuoteToken } from './quoteToken'
+import { SwapQuoteProvider } from './swap'
 import { ZeroExQuoteProvider } from './zeroEx'
-import { SwapQuoteProvider } from 'quote/swap'
 
 export enum FlashMintContractType {
   leveraged,
   leveragedExtended,
-  erc4626,
   zeroEx,
 }
 
@@ -71,14 +70,13 @@ export class FlashMintQuoteProvider
 {
   constructor(
     private readonly provider: JsonRpcProvider,
-    private readonly swapQuoteProvider?: SwapQuoteProvider,
-    private readonly zeroExApiV1?: ZeroExApi
+    private readonly swapQuoteProvider: SwapQuoteProvider
   ) {}
 
   async getQuote(
     request: FlashMintQuoteRequest
   ): Promise<FlashMintQuote | null> {
-    const { provider, swapQuoteProvider, zeroExApiV1 } = this
+    const { provider, swapQuoteProvider } = this
     const { indexTokenAmount, inputToken, isMinting, outputToken, slippage } =
       request
     const indexToken = isMinting ? outputToken : inputToken
@@ -89,19 +87,11 @@ export class FlashMintQuoteProvider
     if (contractType === null) {
       throw new Error('Index token not supported')
     }
-    if (requiresZeroExV1(contractType)) {
-      if (!zeroExApiV1) {
-        throw new Error('Contract type requires ZeroExApiV1 to be defined')
-      }
-    }
     switch (contractType) {
       case FlashMintContractType.leveraged: {
-        if (!zeroExApiV1) {
-          throw new Error('Contract type requires ZeroExApiV1 to be defined')
-        }
         const leveragedQuoteProvider = new LeveragedQuoteProvider(
           provider,
-          zeroExApiV1
+          swapQuoteProvider
         )
         const leveragedQuote = await leveragedQuoteProvider.getQuote(request)
         if (!leveragedQuote) return null
@@ -134,11 +124,8 @@ export class FlashMintQuoteProvider
         }
       }
       case FlashMintContractType.leveragedExtended: {
-        if (!zeroExApiV1) {
-          throw new Error('Contract type requires ZeroExApiV1 to be defined')
-        }
         const leverageExtendedQuoteProvider =
-          new LeveragedExtendedQuoteProvider(provider, zeroExApiV1)
+          new LeveragedExtendedQuoteProvider(provider, swapQuoteProvider)
         const leveragedExtendedQuote =
           await leverageExtendedQuoteProvider.getQuote(request)
         if (!leveragedExtendedQuote) return null
@@ -175,11 +162,6 @@ export class FlashMintQuoteProvider
         }
       }
       case FlashMintContractType.zeroEx: {
-        if (!swapQuoteProvider) {
-          throw new Error(
-            'Contract type requires SwapQuoteProvider to be defined'
-          )
-        }
         const zeroExQuoteProvider = new ZeroExQuoteProvider(
           provider,
           swapQuoteProvider
@@ -255,9 +237,3 @@ function getContractType(
     return FlashMintContractType.leveraged
   return null
 }
-
-function requiresZeroExV1(contractType: FlashMintContractType): boolean {
-  if (contractType === FlashMintContractType.leveraged) return true
-  if (contractType === FlashMintContractType.leveragedExtended) return true
-  return false
-}

src/quote/leveraged-extended/provider.test.ts

@@ -3,16 +3,17 @@ import { noopSwapData } from 'constants/swapdata'
 import { IndexCoopEthereum2xIndex, USDC, WETH } from 'constants/tokens'
 import { Exchange } from 'utils'
 import { wei } from 'utils/numbers'
+
 import {
+  IndexZeroExSwapQuoteProviderArbitrum,
   LocalhostProviderArbitrum,
   QuoteTokens,
-  ZeroExApiArbitrumSwapQuote,
 } from 'tests/utils'
 
 import { LeveragedExtendedQuoteProvider } from './provider'
 
 const provider = LocalhostProviderArbitrum
-const zeroExApi = ZeroExApiArbitrumSwapQuote
+const zeroExApi = IndexZeroExSwapQuoteProviderArbitrum
 
 const { eth, usdc } = QuoteTokens