Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
91ebb3c
feat: flywheel instant rewards
jourdanDunkley Jan 10, 2025
a864807
feat: permissioned minter for restricting morpho collateral mints
jourdanDunkley Jan 12, 2025
6c29094
fix: left placeholder for correct mint logic
jourdanDunkley Jan 12, 2025
824639e
update morpho market contract
antisaa Jan 21, 2025
8618e53
Merge branch 'development' into feat/morpho-collateral
rhlsthrm Jan 24, 2025
6ab2f49
feat: import
rhlsthrm Jan 27, 2025
2d2183b
feat: deploy
rhlsthrm Jan 27, 2025
2a3946c
fix: removed rewardsdelegate from inheritcance hierarcyh to fix sizin…
jourdanDunkley Jan 27, 2025
77e68f8
feat: deploy
rhlsthrm Jan 27, 2025
d17c905
fix: morpho collat deploy script
jourdanDunkley Jan 27, 2025
c7c8bc3
feat: deploy
rhlsthrm Jan 28, 2025
ef74508
pass morpho URD as param
jourdanDunkley Jan 29, 2025
2cbf875
feat: deploy
rhlsthrm Jan 29, 2025
bab70e9
Merge branch 'development' into feat/morpho-collateral
rhlsthrm Jan 29, 2025
e5ba697
delete
rhlsthrm Jan 29, 2025
509fe0c
feat: Morpho rewards distributor
jourdanDunkley Feb 3, 2025
760c2dd
Merge branch 'feat/morpho-collateral' of https://github.com/ionicprot…
jourdanDunkley Feb 3, 2025
a081def
made distributor dynamic
jourdanDunkley Feb 3, 2025
5a244f0
Merge branch 'development' of https://github.com/ionicprotocol/monore…
jourdanDunkley Feb 3, 2025
a1b95b1
new morpho deploy
jourdanDunkley Feb 3, 2025
9b0270d
checks for what markets are already added and what markets dont have …
jourdanDunkley Feb 3, 2025
b7470ea
deployment of mode staking strategies
jourdanDunkley Feb 3, 2025
663cb1e
finalized bribeRewards and rewardAccumulator deploys
jourdanDunkley Feb 4, 2025
83be7f9
bribe distributor deployments
jourdanDunkley Feb 4, 2025
88fa199
remove submodule
rhlsthrm Feb 4, 2025
f549997
fix: build
rhlsthrm Feb 4, 2025
d4c00de
fix: abi
rhlsthrm Feb 4, 2025
8d745bd
Merge branch 'development' into feat/morpho-collateral
rhlsthrm Apr 15, 2025
1002c24
Refactor and update ABI definitions in generated.ts
rhlsthrm Apr 15, 2025
ee2acd7
Add smUSDC asset and update market deployment for Seamless
rhlsthrm Apr 16, 2025
2476a8b
Merge branch 'development' into feat/morpho-collateral
rhlsthrm Apr 16, 2025
31d75d3
Add market setting task for Morpho Ionic and enhance market data hook
rhlsthrm Apr 17, 2025
759e163
Add smUSDC icon asset for UI
rhlsthrm Apr 17, 2025
2595289
Remove deprecated task for setting collateral factors in Morpho Ionic…
rhlsthrm Apr 17, 2025
a1ac887
Remove Morpho Ionic market definition from constants
rhlsthrm Apr 17, 2025
4268fcf
Update Node.js setup action in GitHub workflow
rhlsthrm Apr 17, 2025
3d3ae46
Update Yarn version from 4.7.0 to 4.9.1
rhlsthrm Apr 22, 2025
5fd2ebe
Refactor health factor hook usage in WithdrawTab component
rhlsthrm Apr 22, 2025
af68d66
Add new task for deploying Morpho market with enhanced parameters
jourdanDunkley Apr 27, 2025
db18973
Implement MorphoBribeDistributor deployment task and enhance market d…
jourdanDunkley Apr 27, 2025
42cdb14
Add Lisk network support in configuration and testing
jourdanDunkley May 1, 2025
86a7a4e
Merge branch 'development' into feat/morpho-collateral
rhlsthrm May 5, 2025
35c6863
Update remappings.txt to remove unused LayerZero Labs dependencies
rhlsthrm May 5, 2025
6193a50
Add new submodules for LayerZero Labs in .gitmodules
rhlsthrm May 5, 2025
0ae28a6
Refactor BorrowTab component to simplify health factor loading logic
rhlsthrm May 5, 2025
ff749f6
Update deployment configurations for Comptroller and related contracts
rhlsthrm May 6, 2025
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
935 changes: 0 additions & 935 deletions .yarn/releases/yarn-4.7.0.cjs

This file was deleted.

948 changes: 948 additions & 0 deletions .yarn/releases/yarn-4.9.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.7.0.cjs
yarnPath: .yarn/releases/yarn-4.9.1.cjs
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monorepo",
"packageManager": "yarn@4.7.0",
"packageManager": "yarn@4.9.1",
"private": true,
"workspaces": [
"packages/bots/liquidator",
Expand Down
22 changes: 20 additions & 2 deletions packages/chains/src/base/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const msUSD = "0x526728DBc96689597F85ae4cd716d4f7fCcBAE9d";
export const ionicUSDC = "0x23479229e52Ab6aaD312D0B03DF9F33B46753B5e";
export const ionicWETH = "0x5A32099837D89E3a794a44fb131CBbAD41f87a8C";
export const mBASIS = "0x1C2757c1FeF1038428b5bEF062495ce94BBe92b2";
export const smUSDC = "0x616a4E1db48e22028f6bbf20444Cd3b8e3273738";

export const assets: SupportedAsset[] = [
{
Expand All @@ -54,7 +55,10 @@ export const assets: SupportedAsset[] = [
name: "Wrapped Ether",
decimals: 18,
oracle: OracleTypes.FixedNativePriceOracle,
extraDocs: wrappedAssetDocs(SupportedChains.base)
extraDocs: wrappedAssetDocs(SupportedChains.base),
initialSupplyCap: parseEther(String(1_500)).toString(),
initialBorrowCap: parseEther(String(1_200)).toString(),
initialCf: "0.85"
},
{
symbol: assetSymbols.USDC,
Expand All @@ -66,7 +70,10 @@ export const assets: SupportedAsset[] = [
aggregator: "0x4ba73879B0C073Db595aBE9Ba27104D83f024286",
feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
},
extraDocs: defaultDocs("https://basescan.org", USDC)
extraDocs: defaultDocs("https://basescan.org", USDC),
initialSupplyCap: parseUnits(String(10_000_000_000), 6).toString(),
initialBorrowCap: parseUnits(String(8_000_000_000), 6).toString(),
initialCf: "0.85"
},
{
symbol: assetSymbols.wstETH,
Expand Down Expand Up @@ -480,6 +487,17 @@ export const assets: SupportedAsset[] = [
initialCf: "0.10",
initialSupplyCap: parseEther(String(99_000)).toString(),
initialBorrowCap: parseEther(String(99_000)).toString()
},
{
symbol: assetSymbols.smUSDC,
underlying: smUSDC,
name: "Seamless USDC Vault",
decimals: 18,
oracle: OracleTypes.ERC4626Oracle,
extraDocs: defaultDocs("https://basescan.org", smUSDC),
initialSupplyCap: parseEther(String(2_000)).toString(),
initialBorrowCap: "1",
initialCf: "0.80"
}
// DO NOT ADD TO MARKET UNLESS PROPER ORACLE IS DEPLOYED
// {
Expand Down
36 changes: 18 additions & 18 deletions packages/contracts/chainDeploy/mainnets/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,24 @@ export const deploy = async ({
publicClient
);

//// Pyth Oracle
await deployPythPriceOracle({
run,
viem,
getNamedAccounts,
deployments,
deployConfig,
pythAssets: base.assets
.filter((asset) => asset.oracle === OracleTypes.PythPriceOracle)
.map((asset) => ({
feed: (asset.oracleSpecificParams as PythSpecificParams).feed as Hex,
underlying: asset.underlying
})),
nativeTokenUsdFeed: "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
pythAddress: "0x8250f4aF4B972684F7b336503E2D6dFeDeB1487a",
usdToken: base.chainAddresses.STABLE_TOKEN as Address,
chainId
});
// //// Pyth Oracle
// await deployPythPriceOracle({
// run,
// viem,
// getNamedAccounts,
// deployments,
// deployConfig,
// pythAssets: base.assets
// .filter((asset) => asset.oracle === OracleTypes.PythPriceOracle)
// .map((asset) => ({
// feed: (asset.oracleSpecificParams as PythSpecificParams).feed as Hex,
// underlying: asset.underlying
// })),
// nativeTokenUsdFeed: "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
// pythAddress: "0x8250f4aF4B972684F7b336503E2D6dFeDeB1487a",
// usdToken: base.chainAddresses.STABLE_TOKEN as Address,
// chainId
// });

// //// ERC4626 Oracle
await deployErc4626PriceOracle({
Expand Down
17 changes: 10 additions & 7 deletions packages/contracts/chainDeploy/mainnets/mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@ export const deployConfig: ChainDeployConfig = {
},
wtoken: mode.chainAddresses.W_TOKEN as Address,
veION: {
lpTokens: ["0xC6A394952c097004F83d2dfB61715d245A38735a"],
lpStakingStrategies: [],
lpStakingWalletImplementations: [],
lpExternalStakingContracts: [],
lpTokenWhitelistStatuses: [true],
lpTokenTypes: [0],
minimumLockAmounts: [parseEther("0.01")],
lpTokens: ["0xC6A394952c097004F83d2dfB61715d245A38735a", "0x690A74d2eC0175a69C0962B309E03021C0b5002E"],
lpStakingStrategies: ["VeloAeroStakingStrategy", "VeloAeroStakingStrategy"],
lpStakingWalletImplementations: ["VeloAeroStakingWallet", "VeloAeroStakingWallet"],
lpExternalStakingContracts: [
"0x3f385FeDd141F57323dD91aA735C7243382831D8",
"0x8ff8b21a0736738b25597D32d8f7cf658f39f157"
],
lpTokenWhitelistStatuses: [true, true],
lpTokenTypes: [0, 1],
minimumLockAmounts: [parseEther("0.01"), parseEther("0.01")],
minimumLockDuration: 6 * 30 * 24 * 60 * 60,
maxEarlyWithdrawFee: parseEther("0.8"),
maxVotingNum: 20
Expand Down
232 changes: 0 additions & 232 deletions packages/contracts/contracts/bridge/xERC20LayerZero.sol

This file was deleted.

Loading