Skip to content

Commit

Permalink
feat: add convenience input/output amounts to flash mint quote
Browse files Browse the repository at this point in the history
  • Loading branch information
janndriessen committed May 27, 2024
1 parent 9507c2c commit 00855bf
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
12 changes: 12 additions & 0 deletions src/quote/provider/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(quote.inputOutputAmount)
expect(quote.outputAmount).toEqual(request.indexTokenAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down Expand Up @@ -110,6 +112,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(quote.inputOutputAmount)
expect(quote.outputAmount).toEqual(request.indexTokenAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down Expand Up @@ -145,6 +149,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(request.indexTokenAmount)
expect(quote.outputAmount).toEqual(quote.inputOutputAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down Expand Up @@ -186,6 +192,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(quote.inputOutputAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down Expand Up @@ -227,6 +235,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(request.indexTokenAmount)
expect(quote.outputAmount).toEqual(quote.inputOutputAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down Expand Up @@ -263,6 +273,8 @@ describe('FlashMintQuoteProvider()', () => {
expect(quote.isMinting).toEqual(request.isMinting)
expect(quote.inputToken).toEqual(request.inputToken)
expect(quote.outputToken).toEqual(request.outputToken)
expect(quote.inputAmount).toEqual(request.indexTokenAmount)
expect(quote.outputAmount).toEqual(quote.inputOutputAmount)
expect(quote.indexTokenAmount).toEqual(request.indexTokenAmount)
expect(quote.inputOutputAmount.gt(0)).toBe(true)
expect(quote.slippage).toEqual(request.slippage)
Expand Down
17 changes: 14 additions & 3 deletions src/quote/provider/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ export interface FlashMintQuote {
isMinting: boolean
inputToken: QuoteToken
outputToken: QuoteToken
inputAmount: BigNumber
outputAmount: BigNumber
indexTokenAmount: BigNumber
inputOutputAmount: BigNumber
slippage: number
Expand Down Expand Up @@ -92,6 +94,7 @@ export class FlashMintQuoteProvider
}
const tx = await builder.build(txRequest)
if (!tx) return null
const { inputOutputTokenAmount } = leveragedQuote
return {
chainId,
contractType,
Expand All @@ -100,8 +103,10 @@ export class FlashMintQuoteProvider
isMinting,
inputToken,
outputToken,
inputAmount: isMinting ? inputOutputTokenAmount : indexTokenAmount,
outputAmount: isMinting ? indexTokenAmount : inputOutputTokenAmount,
indexTokenAmount,
inputOutputAmount: leveragedQuote.inputOutputTokenAmount,
inputOutputAmount: inputOutputTokenAmount,
slippage,
tx,
}
Expand Down Expand Up @@ -130,6 +135,7 @@ export class FlashMintQuoteProvider
}
const tx = await builder.build(txRequest)
if (!tx) return null
const { inputOutputTokenAmount } = leveragedExtendedQuote
return {
chainId,
contractType,
Expand All @@ -138,8 +144,10 @@ export class FlashMintQuoteProvider
isMinting,
inputToken,
outputToken,
inputAmount: isMinting ? inputOutputTokenAmount : indexTokenAmount,
outputAmount: isMinting ? indexTokenAmount : inputOutputTokenAmount,
indexTokenAmount,
inputOutputAmount: leveragedExtendedQuote.inputOutputTokenAmount,
inputOutputAmount: inputOutputTokenAmount,
slippage,
tx,
}
Expand All @@ -164,6 +172,7 @@ export class FlashMintQuoteProvider
}
const tx = await builder.build(txRequest)
if (!tx) return null
const { inputOutputTokenAmount } = zeroExQuote
return {
chainId,
contractType,
Expand All @@ -172,8 +181,10 @@ export class FlashMintQuoteProvider
isMinting,
inputToken,
outputToken,
inputAmount: isMinting ? inputOutputTokenAmount : indexTokenAmount,
outputAmount: isMinting ? indexTokenAmount : inputOutputTokenAmount,
indexTokenAmount,
inputOutputAmount: zeroExQuote.inputOutputTokenAmount,
inputOutputAmount: inputOutputTokenAmount,
slippage,
tx,
}
Expand Down

0 comments on commit 00855bf

Please sign in to comment.