Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add flash mint wrapped #85

Merged
merged 60 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
483eb2f
feat: add wrap data
janndriessen Sep 4, 2024
9a90e28
test: add test for wrap data
janndriessen Sep 4, 2024
271abee
feat: add issuance
janndriessen Sep 4, 2024
0e3a2b2
build: export wrap data utils
janndriessen Sep 4, 2024
ae58da0
feat: add flash mint wrapped contract
janndriessen Sep 4, 2024
67938c5
fix: switch case
janndriessen Sep 4, 2024
c488503
feat: add empty component swap data
janndriessen Sep 5, 2024
9f71b44
feat: add get underlying erc20
janndriessen Sep 5, 2024
8d778cb
lint
janndriessen Sep 5, 2024
8de8c10
feat: add empty wrapped builder
janndriessen Sep 5, 2024
8b0ae18
refactor: use rpc url in constructor
janndriessen Sep 5, 2024
3f813a5
feat: add empty wrapped provider
janndriessen Sep 6, 2024
2efef08
chore: clean up
janndriessen Sep 10, 2024
2c611e1
chore: add export
janndriessen Sep 13, 2024
ac1b3db
feat: add contract type wrapped
janndriessen Sep 13, 2024
a9bb98f
test: remove obsolete dseth tests
janndriessen Sep 13, 2024
9178849
feat: integrate wrapped contract type into quote provider
janndriessen Sep 13, 2024
ff93732
test: skip test for now
janndriessen Sep 13, 2024
22f5b77
refactor: quote response
janndriessen Sep 16, 2024
d5fb71d
build: upgrade tokenlists
janndriessen Sep 16, 2024
a8d0c9b
chore: use usdcy symbol form index token
janndriessen Sep 16, 2024
c576a3d
chore: use index token
janndriessen Sep 16, 2024
e7cfff9
chore: use usdcy
janndriessen Sep 16, 2024
72103bb
feat: use wrap data in wrapped quote provider
janndriessen Sep 16, 2024
9bf688d
chore: remove fixme
janndriessen Sep 17, 2024
47b276f
feat: start assembling component swap data
janndriessen Sep 17, 2024
db6804b
add calling get issue/redeem exact set
janndriessen Sep 18, 2024
ff02fff
test: skip large amounts test
janndriessen Sep 18, 2024
9992167
feat: build component swap data for input token usdc
janndriessen Sep 20, 2024
8eab9ae
feat: add swap quote provider
janndriessen Sep 20, 2024
a0ca679
test: update flash mint wrapped tests to use chainId and swap quote p…
janndriessen Sep 20, 2024
9eaeaeb
feat: add create client util
janndriessen Sep 20, 2024
7d89343
lint
janndriessen Sep 20, 2024
606e319
feat: add amounts for erc4262
janndriessen Sep 24, 2024
2fc339a
build: upgrade tokenlists w/ updated token info
janndriessen Sep 30, 2024
ffa0c17
test: update component swap data tests
janndriessen Sep 30, 2024
8c0a0ef
test: update tests for presale token
janndriessen Sep 30, 2024
726f866
lint
janndriessen Sep 30, 2024
5144a00
update wrap data test
janndriessen Sep 30, 2024
c7c3ecb
test: add component swap data tests for weth
janndriessen Sep 30, 2024
adda212
test: prepare tests for icUSD
janndriessen Sep 30, 2024
aaa47af
Merge branch 'main' into feat/add-flashmint-wrapped
janndriessen Oct 17, 2024
a21e797
fixes after merging in main
janndriessen Oct 17, 2024
b87879c
feat: add flash mint wrapped
janndriessen Oct 17, 2024
16927c0
feat: add swap data v3
janndriessen Oct 17, 2024
2b758a0
update component swap data to use swapdatav3
janndriessen Oct 17, 2024
4fe07d1
test: update wrapped builder tests
janndriessen Oct 17, 2024
a9dc98d
feat: add debt issuance module v3
janndriessen Oct 17, 2024
961976e
update issuance module for icusd
janndriessen Oct 17, 2024
c15340e
test: turn on icUSD quote provider tests
janndriessen Oct 17, 2024
bdc7350
test: activate icUSD integration tests
janndriessen Oct 17, 2024
72a9fc4
fix component swap data
janndriessen Oct 17, 2024
ea75a81
test: fix redeem test
janndriessen Oct 17, 2024
6eeff32
test: temp skip component swap data
janndriessen Oct 17, 2024
e8d3b86
skip
janndriessen Oct 17, 2024
8972d42
readd component swap data tests
janndriessen Oct 17, 2024
5d2e4c1
Merge branch 'main' into feat/add-flashmint-wrapped
janndriessen Oct 18, 2024
a2c3464
remove fixme
janndriessen Oct 18, 2024
6b2b74b
add integration names
janndriessen Oct 18, 2024
f7f39e5
refactor: delete obsolete name
janndriessen Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@ethersproject/contracts": "^5.6.2",
"@ethersproject/providers": "^5.6.8",
"@ethersproject/units": "^5.6.1",
"@indexcoop/tokenlists": "1.48.0",
"@indexcoop/tokenlists": "^1.57.0",
"@lifi/sdk": "3.0.0-beta.1",
"@uniswap/sdk-core": "^5.3.1",
"@uniswap/v3-sdk": "^3.13.1",
Expand Down
1 change: 1 addition & 0 deletions src/constants/abis/FlashMintWrapped.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"inputs":[{"components":[{"internalType":"address","name":"quickRouter","type":"address"},{"internalType":"address","name":"sushiRouter","type":"address"},{"internalType":"address","name":"uniV3Router","type":"address"},{"internalType":"address","name":"uniV3Quoter","type":"address"},{"internalType":"address","name":"curveAddressProvider","type":"address"},{"internalType":"address","name":"curveCalculator","type":"address"},{"internalType":"address","name":"weth","type":"address"}],"internalType":"struct DEXAdapter.Addresses","name":"_dexAddresses","type":"tuple"},{"internalType":"contract IController","name":"_setController","type":"address"},{"internalType":"contract IDebtIssuanceModule","name":"_issuanceModule","type":"address"},{"internalType":"address","name":"_wrapModule","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"indexed":true,"internalType":"contract IERC20","name":"_inputToken","type":"address"},{"indexed":false,"internalType":"uint256","name":"_amountInputToken","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_amountSetIssued","type":"uint256"}],"name":"FlashMint","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"indexed":true,"internalType":"contract IERC20","name":"_outputToken","type":"address"},{"indexed":false,"internalType":"uint256","name":"_amountSetRedeemed","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_amountOutputToken","type":"uint256"}],"name":"FlashRedeem","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"}],"name":"approveSetToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"dexAdapter","outputs":[{"internalType":"address","name":"quickRouter","type":"address"},{"internalType":"address","name":"sushiRouter","type":"address"},{"internalType":"address","name":"uniV3Router","type":"address"},{"internalType":"address","name":"uniV3Quoter","type":"address"},{"internalType":"address","name":"curveAddressProvider","type":"address"},{"internalType":"address","name":"curveCalculator","type":"address"},{"internalType":"address","name":"weth","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"address","name":"_inputToken","type":"address"},{"internalType":"uint256","name":"_setAmount","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"}],"name":"getIssueExactSet","outputs":[{"internalType":"uint256","name":"amountInputNeeded","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"address","name":"_outputToken","type":"address"},{"internalType":"uint256","name":"_setAmount","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"}],"name":"getRedeemExactSet","outputs":[{"internalType":"uint256","name":"amountOutputReceived","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"issuanceModule","outputs":[{"internalType":"contract IDebtIssuanceModule","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"contract IERC20","name":"_inputToken","type":"address"},{"internalType":"uint256","name":"_amountSetToken","type":"uint256"},{"internalType":"uint256","name":"_maxAmountInputToken","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"},{"components":[{"internalType":"string","name":"integrationName","type":"string"},{"internalType":"bytes","name":"wrapData","type":"bytes"}],"internalType":"struct FlashMintWrapped.ComponentWrapData[]","name":"_wrapData","type":"tuple[]"}],"name":"issueExactSetFromERC20","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"uint256","name":"_amountSetToken","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"},{"components":[{"internalType":"string","name":"integrationName","type":"string"},{"internalType":"bytes","name":"wrapData","type":"bytes"}],"internalType":"struct FlashMintWrapped.ComponentWrapData[]","name":"_wrapData","type":"tuple[]"}],"name":"issueExactSetFromETH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"contract IERC20","name":"_outputToken","type":"address"},{"internalType":"uint256","name":"_amountSetToken","type":"uint256"},{"internalType":"uint256","name":"_minOutputReceive","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"},{"components":[{"internalType":"string","name":"integrationName","type":"string"},{"internalType":"bytes","name":"wrapData","type":"bytes"}],"internalType":"struct FlashMintWrapped.ComponentWrapData[]","name":"_unwrapData","type":"tuple[]"}],"name":"redeemExactSetForERC20","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract ISetToken","name":"_setToken","type":"address"},{"internalType":"uint256","name":"_amountSetToken","type":"uint256"},{"internalType":"uint256","name":"_minOutputReceive","type":"uint256"},{"components":[{"internalType":"address","name":"underlyingERC20","type":"address"},{"components":[{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"uint24[]","name":"fees","type":"uint24[]"},{"internalType":"address","name":"pool","type":"address"},{"internalType":"enum DEXAdapter.Exchange","name":"exchange","type":"uint8"}],"internalType":"struct DEXAdapter.SwapData","name":"dexData","type":"tuple"},{"internalType":"uint256","name":"buyUnderlyingAmount","type":"uint256"}],"internalType":"struct FlashMintWrapped.ComponentSwapData[]","name":"_swapData","type":"tuple[]"},{"components":[{"internalType":"string","name":"integrationName","type":"string"},{"internalType":"bytes","name":"wrapData","type":"bytes"}],"internalType":"struct FlashMintWrapped.ComponentWrapData[]","name":"_unwrapData","type":"tuple[]"}],"name":"redeemExactSetForETH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"setController","outputs":[{"internalType":"contract IController","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract IERC20[]","name":"_tokens","type":"address[]"},{"internalType":"address payable","name":"_to","type":"address"}],"name":"withdrawTokens","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"wrapModule","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"stateMutability":"payable","type":"receive"}]
3 changes: 3 additions & 0 deletions src/constants/contracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export const Contracts: { [key: number]: any } = {
DebtIssuanceModuleV3: '0xa30E87311407dDcF1741901A8F359b6005252F22',
FlashMintLeveragedExtended: '0xE6c18c4C9FC6909EDa546649EBE33A8159256CBE',
},
[ChainId.Mainnet]: {
FlashMintWrapped: '0x5C0D0a9a0c3A0a5B591496fF894686893b69FaA2',
},
}

// Index Protocol
Expand Down
2 changes: 1 addition & 1 deletion src/constants/swapdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { Exchange } from 'utils'
import { ETH, InterestCompoundingETHIndex, stETH } from './tokens'

Expand Down
7 changes: 7 additions & 0 deletions src/constants/tokens.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { getIndexTokenData } from '@indexcoop/tokenlists'

export interface Token {
symbol: string
address?: string
Expand Down Expand Up @@ -100,6 +103,10 @@ export const RealWorldAssetIndex: Token = {
symbol: 'RWA',
}

export const TheUSDCYieldIndex: Token = {
...getIndexTokenData('icUSD', 1)!,
}

// Other

export const DAI: Token = {
Expand Down
1 change: 1 addition & 0 deletions src/flashmint/builders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export * from './hyeth'
export * from './interface'
export * from './leveraged'
export * from './leveraged-extended'
export * from './wrapped'
export * from './zeroex'
Loading
Loading