From d29326e376c7c20004e436a9d2d18d48fce0fc04 Mon Sep 17 00:00:00 2001 From: danilo neves cruz Date: Fri, 21 Jul 2023 14:53:22 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20package:=20rename=20`mainnet`=20?= =?UTF-8?q?to=20`ethereum`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/sweet-planets-own.md | 5 +++++ .changeset/twelve-countries-appear.md | 2 +- CHANGELOG.md | 4 ++-- deployments/{mainnet => ethereum}/.chainId | 0 deployments/{mainnet => ethereum}/Auditor.json | 0 .../Auditor_Implementation.json | 0 .../{mainnet => ethereum}/Auditor_Proxy.json | 0 .../{mainnet => ethereum}/BalancerVault.json | 0 deployments/{mainnet => ethereum}/DAI.json | 0 .../{mainnet => ethereum}/DebtManager.json | 0 .../DebtManager_Implementation.json | 0 .../{mainnet => ethereum}/DebtManager_Proxy.json | 0 .../{mainnet => ethereum}/DebtPreviewer.json | 0 .../DebtPreviewer_Implementation.json | 0 .../DebtPreviewer_Proxy.json | 0 .../InterestRateModelDAI.json | 0 .../InterestRateModelUSDC.json | 0 .../InterestRateModelWBTC.json | 0 .../InterestRateModelWETH.json | 0 .../InterestRateModelwstETH.json | 0 deployments/{mainnet => ethereum}/MarketDAI.json | 0 .../MarketDAI_Implementation.json | 0 .../{mainnet => ethereum}/MarketDAI_Proxy.json | 0 .../{mainnet => ethereum}/MarketETHRouter.json | 0 .../MarketETHRouter_Implementation.json | 0 .../MarketETHRouter_Proxy.json | 0 .../{mainnet => ethereum}/MarketUSDC.json | 0 .../MarketUSDC_Implementation.json | 0 .../{mainnet => ethereum}/MarketUSDC_Proxy.json | 0 .../{mainnet => ethereum}/MarketWBTC.json | 0 .../MarketWBTC_Implementation.json | 0 .../{mainnet => ethereum}/MarketWBTC_Proxy.json | 0 .../{mainnet => ethereum}/MarketWETH.json | 0 .../MarketWETH_Implementation.json | 0 .../{mainnet => ethereum}/MarketWETH_Proxy.json | 0 .../{mainnet => ethereum}/MarketwstETH.json | 0 .../MarketwstETH_Implementation.json | 0 .../MarketwstETH_Proxy.json | 0 .../{mainnet => ethereum}/Multicall3.json | 0 deployments/{mainnet => ethereum}/Permit2.json | 0 deployments/{mainnet => ethereum}/Previewer.json | 0 .../Previewer_Implementation.json | 0 .../{mainnet => ethereum}/Previewer_Proxy.json | 0 .../{mainnet => ethereum}/PriceFeedDAI.json | 0 .../{mainnet => ethereum}/PriceFeedETH.json | 0 .../{mainnet => ethereum}/PriceFeedUSDC.json | 0 .../{mainnet => ethereum}/PriceFeedWBTC.json | 0 .../{mainnet => ethereum}/PriceFeedWBTCOne.json | 0 .../{mainnet => ethereum}/PriceFeedWBTCTwo.json | 0 .../{mainnet => ethereum}/PriceFeedWETH.json | 0 .../{mainnet => ethereum}/PriceFeedwstETH.json | 0 .../PriceFeedwstETHMain.json | 0 .../{mainnet => ethereum}/ProxyAdmin.json | 0 .../TimelockController.json | 0 deployments/{mainnet => ethereum}/USDC.json | 0 .../{mainnet => ethereum}/UniswapV3Factory.json | 0 .../{mainnet => ethereum}/UniswapV3Quoter.json | 0 deployments/{mainnet => ethereum}/WBTC.json | 0 deployments/{mainnet => ethereum}/WETH.json | 0 deployments/{mainnet => ethereum}/stETH.json | 0 deployments/{mainnet => ethereum}/wstETH.json | 0 hardhat.config.ts | 16 ++++++++-------- package.json | 2 +- 63 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 .changeset/sweet-planets-own.md rename deployments/{mainnet => ethereum}/.chainId (100%) rename deployments/{mainnet => ethereum}/Auditor.json (100%) rename deployments/{mainnet => ethereum}/Auditor_Implementation.json (100%) rename deployments/{mainnet => ethereum}/Auditor_Proxy.json (100%) rename deployments/{mainnet => ethereum}/BalancerVault.json (100%) rename deployments/{mainnet => ethereum}/DAI.json (100%) rename deployments/{mainnet => ethereum}/DebtManager.json (100%) rename deployments/{mainnet => ethereum}/DebtManager_Implementation.json (100%) rename deployments/{mainnet => ethereum}/DebtManager_Proxy.json (100%) rename deployments/{mainnet => ethereum}/DebtPreviewer.json (100%) rename deployments/{mainnet => ethereum}/DebtPreviewer_Implementation.json (100%) rename deployments/{mainnet => ethereum}/DebtPreviewer_Proxy.json (100%) rename deployments/{mainnet => ethereum}/InterestRateModelDAI.json (100%) rename deployments/{mainnet => ethereum}/InterestRateModelUSDC.json (100%) rename deployments/{mainnet => ethereum}/InterestRateModelWBTC.json (100%) rename deployments/{mainnet => ethereum}/InterestRateModelWETH.json (100%) rename deployments/{mainnet => ethereum}/InterestRateModelwstETH.json (100%) rename deployments/{mainnet => ethereum}/MarketDAI.json (100%) rename deployments/{mainnet => ethereum}/MarketDAI_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketDAI_Proxy.json (100%) rename deployments/{mainnet => ethereum}/MarketETHRouter.json (100%) rename deployments/{mainnet => ethereum}/MarketETHRouter_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketETHRouter_Proxy.json (100%) rename deployments/{mainnet => ethereum}/MarketUSDC.json (100%) rename deployments/{mainnet => ethereum}/MarketUSDC_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketUSDC_Proxy.json (100%) rename deployments/{mainnet => ethereum}/MarketWBTC.json (100%) rename deployments/{mainnet => ethereum}/MarketWBTC_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketWBTC_Proxy.json (100%) rename deployments/{mainnet => ethereum}/MarketWETH.json (100%) rename deployments/{mainnet => ethereum}/MarketWETH_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketWETH_Proxy.json (100%) rename deployments/{mainnet => ethereum}/MarketwstETH.json (100%) rename deployments/{mainnet => ethereum}/MarketwstETH_Implementation.json (100%) rename deployments/{mainnet => ethereum}/MarketwstETH_Proxy.json (100%) rename deployments/{mainnet => ethereum}/Multicall3.json (100%) rename deployments/{mainnet => ethereum}/Permit2.json (100%) rename deployments/{mainnet => ethereum}/Previewer.json (100%) rename deployments/{mainnet => ethereum}/Previewer_Implementation.json (100%) rename deployments/{mainnet => ethereum}/Previewer_Proxy.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedDAI.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedETH.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedUSDC.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedWBTC.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedWBTCOne.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedWBTCTwo.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedWETH.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedwstETH.json (100%) rename deployments/{mainnet => ethereum}/PriceFeedwstETHMain.json (100%) rename deployments/{mainnet => ethereum}/ProxyAdmin.json (100%) rename deployments/{mainnet => ethereum}/TimelockController.json (100%) rename deployments/{mainnet => ethereum}/USDC.json (100%) rename deployments/{mainnet => ethereum}/UniswapV3Factory.json (100%) rename deployments/{mainnet => ethereum}/UniswapV3Quoter.json (100%) rename deployments/{mainnet => ethereum}/WBTC.json (100%) rename deployments/{mainnet => ethereum}/WETH.json (100%) rename deployments/{mainnet => ethereum}/stETH.json (100%) rename deployments/{mainnet => ethereum}/wstETH.json (100%) diff --git a/.changeset/sweet-planets-own.md b/.changeset/sweet-planets-own.md new file mode 100644 index 000000000..cbfa6ce36 --- /dev/null +++ b/.changeset/sweet-planets-own.md @@ -0,0 +1,5 @@ +--- +"@exactly/protocol": patch +--- + +🚚 package: rename `mainnet` to `ethereum` diff --git a/.changeset/twelve-countries-appear.md b/.changeset/twelve-countries-appear.md index 16feeb650..10b55a215 100644 --- a/.changeset/twelve-countries-appear.md +++ b/.changeset/twelve-countries-appear.md @@ -2,4 +2,4 @@ "@exactly/protocol": patch --- -🚀 mainnet: deploy new interest rate models +🚀 ethereum: deploy new interest rate models diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5cbe787..77b92ec75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Patch Changes -- e2a4b01: 🚀 mainnet: deploy new debt manager +- e2a4b01: 🚀 ethereum: deploy new debt manager - c4dc9d7: ✨ debt-manager: support `EIP-2612` permit - 56bf04f: 🚀 optimism: deploy new debt manager - 9803f19: 🐛 debt-manager: verify flashloan call origin @@ -13,7 +13,7 @@ ### Patch Changes -- d76c1a3: 🚀 mainnet: deploy debt manager +- d76c1a3: 🚀 ethereum: deploy debt manager ## 0.2.11 diff --git a/deployments/mainnet/.chainId b/deployments/ethereum/.chainId similarity index 100% rename from deployments/mainnet/.chainId rename to deployments/ethereum/.chainId diff --git a/deployments/mainnet/Auditor.json b/deployments/ethereum/Auditor.json similarity index 100% rename from deployments/mainnet/Auditor.json rename to deployments/ethereum/Auditor.json diff --git a/deployments/mainnet/Auditor_Implementation.json b/deployments/ethereum/Auditor_Implementation.json similarity index 100% rename from deployments/mainnet/Auditor_Implementation.json rename to deployments/ethereum/Auditor_Implementation.json diff --git a/deployments/mainnet/Auditor_Proxy.json b/deployments/ethereum/Auditor_Proxy.json similarity index 100% rename from deployments/mainnet/Auditor_Proxy.json rename to deployments/ethereum/Auditor_Proxy.json diff --git a/deployments/mainnet/BalancerVault.json b/deployments/ethereum/BalancerVault.json similarity index 100% rename from deployments/mainnet/BalancerVault.json rename to deployments/ethereum/BalancerVault.json diff --git a/deployments/mainnet/DAI.json b/deployments/ethereum/DAI.json similarity index 100% rename from deployments/mainnet/DAI.json rename to deployments/ethereum/DAI.json diff --git a/deployments/mainnet/DebtManager.json b/deployments/ethereum/DebtManager.json similarity index 100% rename from deployments/mainnet/DebtManager.json rename to deployments/ethereum/DebtManager.json diff --git a/deployments/mainnet/DebtManager_Implementation.json b/deployments/ethereum/DebtManager_Implementation.json similarity index 100% rename from deployments/mainnet/DebtManager_Implementation.json rename to deployments/ethereum/DebtManager_Implementation.json diff --git a/deployments/mainnet/DebtManager_Proxy.json b/deployments/ethereum/DebtManager_Proxy.json similarity index 100% rename from deployments/mainnet/DebtManager_Proxy.json rename to deployments/ethereum/DebtManager_Proxy.json diff --git a/deployments/mainnet/DebtPreviewer.json b/deployments/ethereum/DebtPreviewer.json similarity index 100% rename from deployments/mainnet/DebtPreviewer.json rename to deployments/ethereum/DebtPreviewer.json diff --git a/deployments/mainnet/DebtPreviewer_Implementation.json b/deployments/ethereum/DebtPreviewer_Implementation.json similarity index 100% rename from deployments/mainnet/DebtPreviewer_Implementation.json rename to deployments/ethereum/DebtPreviewer_Implementation.json diff --git a/deployments/mainnet/DebtPreviewer_Proxy.json b/deployments/ethereum/DebtPreviewer_Proxy.json similarity index 100% rename from deployments/mainnet/DebtPreviewer_Proxy.json rename to deployments/ethereum/DebtPreviewer_Proxy.json diff --git a/deployments/mainnet/InterestRateModelDAI.json b/deployments/ethereum/InterestRateModelDAI.json similarity index 100% rename from deployments/mainnet/InterestRateModelDAI.json rename to deployments/ethereum/InterestRateModelDAI.json diff --git a/deployments/mainnet/InterestRateModelUSDC.json b/deployments/ethereum/InterestRateModelUSDC.json similarity index 100% rename from deployments/mainnet/InterestRateModelUSDC.json rename to deployments/ethereum/InterestRateModelUSDC.json diff --git a/deployments/mainnet/InterestRateModelWBTC.json b/deployments/ethereum/InterestRateModelWBTC.json similarity index 100% rename from deployments/mainnet/InterestRateModelWBTC.json rename to deployments/ethereum/InterestRateModelWBTC.json diff --git a/deployments/mainnet/InterestRateModelWETH.json b/deployments/ethereum/InterestRateModelWETH.json similarity index 100% rename from deployments/mainnet/InterestRateModelWETH.json rename to deployments/ethereum/InterestRateModelWETH.json diff --git a/deployments/mainnet/InterestRateModelwstETH.json b/deployments/ethereum/InterestRateModelwstETH.json similarity index 100% rename from deployments/mainnet/InterestRateModelwstETH.json rename to deployments/ethereum/InterestRateModelwstETH.json diff --git a/deployments/mainnet/MarketDAI.json b/deployments/ethereum/MarketDAI.json similarity index 100% rename from deployments/mainnet/MarketDAI.json rename to deployments/ethereum/MarketDAI.json diff --git a/deployments/mainnet/MarketDAI_Implementation.json b/deployments/ethereum/MarketDAI_Implementation.json similarity index 100% rename from deployments/mainnet/MarketDAI_Implementation.json rename to deployments/ethereum/MarketDAI_Implementation.json diff --git a/deployments/mainnet/MarketDAI_Proxy.json b/deployments/ethereum/MarketDAI_Proxy.json similarity index 100% rename from deployments/mainnet/MarketDAI_Proxy.json rename to deployments/ethereum/MarketDAI_Proxy.json diff --git a/deployments/mainnet/MarketETHRouter.json b/deployments/ethereum/MarketETHRouter.json similarity index 100% rename from deployments/mainnet/MarketETHRouter.json rename to deployments/ethereum/MarketETHRouter.json diff --git a/deployments/mainnet/MarketETHRouter_Implementation.json b/deployments/ethereum/MarketETHRouter_Implementation.json similarity index 100% rename from deployments/mainnet/MarketETHRouter_Implementation.json rename to deployments/ethereum/MarketETHRouter_Implementation.json diff --git a/deployments/mainnet/MarketETHRouter_Proxy.json b/deployments/ethereum/MarketETHRouter_Proxy.json similarity index 100% rename from deployments/mainnet/MarketETHRouter_Proxy.json rename to deployments/ethereum/MarketETHRouter_Proxy.json diff --git a/deployments/mainnet/MarketUSDC.json b/deployments/ethereum/MarketUSDC.json similarity index 100% rename from deployments/mainnet/MarketUSDC.json rename to deployments/ethereum/MarketUSDC.json diff --git a/deployments/mainnet/MarketUSDC_Implementation.json b/deployments/ethereum/MarketUSDC_Implementation.json similarity index 100% rename from deployments/mainnet/MarketUSDC_Implementation.json rename to deployments/ethereum/MarketUSDC_Implementation.json diff --git a/deployments/mainnet/MarketUSDC_Proxy.json b/deployments/ethereum/MarketUSDC_Proxy.json similarity index 100% rename from deployments/mainnet/MarketUSDC_Proxy.json rename to deployments/ethereum/MarketUSDC_Proxy.json diff --git a/deployments/mainnet/MarketWBTC.json b/deployments/ethereum/MarketWBTC.json similarity index 100% rename from deployments/mainnet/MarketWBTC.json rename to deployments/ethereum/MarketWBTC.json diff --git a/deployments/mainnet/MarketWBTC_Implementation.json b/deployments/ethereum/MarketWBTC_Implementation.json similarity index 100% rename from deployments/mainnet/MarketWBTC_Implementation.json rename to deployments/ethereum/MarketWBTC_Implementation.json diff --git a/deployments/mainnet/MarketWBTC_Proxy.json b/deployments/ethereum/MarketWBTC_Proxy.json similarity index 100% rename from deployments/mainnet/MarketWBTC_Proxy.json rename to deployments/ethereum/MarketWBTC_Proxy.json diff --git a/deployments/mainnet/MarketWETH.json b/deployments/ethereum/MarketWETH.json similarity index 100% rename from deployments/mainnet/MarketWETH.json rename to deployments/ethereum/MarketWETH.json diff --git a/deployments/mainnet/MarketWETH_Implementation.json b/deployments/ethereum/MarketWETH_Implementation.json similarity index 100% rename from deployments/mainnet/MarketWETH_Implementation.json rename to deployments/ethereum/MarketWETH_Implementation.json diff --git a/deployments/mainnet/MarketWETH_Proxy.json b/deployments/ethereum/MarketWETH_Proxy.json similarity index 100% rename from deployments/mainnet/MarketWETH_Proxy.json rename to deployments/ethereum/MarketWETH_Proxy.json diff --git a/deployments/mainnet/MarketwstETH.json b/deployments/ethereum/MarketwstETH.json similarity index 100% rename from deployments/mainnet/MarketwstETH.json rename to deployments/ethereum/MarketwstETH.json diff --git a/deployments/mainnet/MarketwstETH_Implementation.json b/deployments/ethereum/MarketwstETH_Implementation.json similarity index 100% rename from deployments/mainnet/MarketwstETH_Implementation.json rename to deployments/ethereum/MarketwstETH_Implementation.json diff --git a/deployments/mainnet/MarketwstETH_Proxy.json b/deployments/ethereum/MarketwstETH_Proxy.json similarity index 100% rename from deployments/mainnet/MarketwstETH_Proxy.json rename to deployments/ethereum/MarketwstETH_Proxy.json diff --git a/deployments/mainnet/Multicall3.json b/deployments/ethereum/Multicall3.json similarity index 100% rename from deployments/mainnet/Multicall3.json rename to deployments/ethereum/Multicall3.json diff --git a/deployments/mainnet/Permit2.json b/deployments/ethereum/Permit2.json similarity index 100% rename from deployments/mainnet/Permit2.json rename to deployments/ethereum/Permit2.json diff --git a/deployments/mainnet/Previewer.json b/deployments/ethereum/Previewer.json similarity index 100% rename from deployments/mainnet/Previewer.json rename to deployments/ethereum/Previewer.json diff --git a/deployments/mainnet/Previewer_Implementation.json b/deployments/ethereum/Previewer_Implementation.json similarity index 100% rename from deployments/mainnet/Previewer_Implementation.json rename to deployments/ethereum/Previewer_Implementation.json diff --git a/deployments/mainnet/Previewer_Proxy.json b/deployments/ethereum/Previewer_Proxy.json similarity index 100% rename from deployments/mainnet/Previewer_Proxy.json rename to deployments/ethereum/Previewer_Proxy.json diff --git a/deployments/mainnet/PriceFeedDAI.json b/deployments/ethereum/PriceFeedDAI.json similarity index 100% rename from deployments/mainnet/PriceFeedDAI.json rename to deployments/ethereum/PriceFeedDAI.json diff --git a/deployments/mainnet/PriceFeedETH.json b/deployments/ethereum/PriceFeedETH.json similarity index 100% rename from deployments/mainnet/PriceFeedETH.json rename to deployments/ethereum/PriceFeedETH.json diff --git a/deployments/mainnet/PriceFeedUSDC.json b/deployments/ethereum/PriceFeedUSDC.json similarity index 100% rename from deployments/mainnet/PriceFeedUSDC.json rename to deployments/ethereum/PriceFeedUSDC.json diff --git a/deployments/mainnet/PriceFeedWBTC.json b/deployments/ethereum/PriceFeedWBTC.json similarity index 100% rename from deployments/mainnet/PriceFeedWBTC.json rename to deployments/ethereum/PriceFeedWBTC.json diff --git a/deployments/mainnet/PriceFeedWBTCOne.json b/deployments/ethereum/PriceFeedWBTCOne.json similarity index 100% rename from deployments/mainnet/PriceFeedWBTCOne.json rename to deployments/ethereum/PriceFeedWBTCOne.json diff --git a/deployments/mainnet/PriceFeedWBTCTwo.json b/deployments/ethereum/PriceFeedWBTCTwo.json similarity index 100% rename from deployments/mainnet/PriceFeedWBTCTwo.json rename to deployments/ethereum/PriceFeedWBTCTwo.json diff --git a/deployments/mainnet/PriceFeedWETH.json b/deployments/ethereum/PriceFeedWETH.json similarity index 100% rename from deployments/mainnet/PriceFeedWETH.json rename to deployments/ethereum/PriceFeedWETH.json diff --git a/deployments/mainnet/PriceFeedwstETH.json b/deployments/ethereum/PriceFeedwstETH.json similarity index 100% rename from deployments/mainnet/PriceFeedwstETH.json rename to deployments/ethereum/PriceFeedwstETH.json diff --git a/deployments/mainnet/PriceFeedwstETHMain.json b/deployments/ethereum/PriceFeedwstETHMain.json similarity index 100% rename from deployments/mainnet/PriceFeedwstETHMain.json rename to deployments/ethereum/PriceFeedwstETHMain.json diff --git a/deployments/mainnet/ProxyAdmin.json b/deployments/ethereum/ProxyAdmin.json similarity index 100% rename from deployments/mainnet/ProxyAdmin.json rename to deployments/ethereum/ProxyAdmin.json diff --git a/deployments/mainnet/TimelockController.json b/deployments/ethereum/TimelockController.json similarity index 100% rename from deployments/mainnet/TimelockController.json rename to deployments/ethereum/TimelockController.json diff --git a/deployments/mainnet/USDC.json b/deployments/ethereum/USDC.json similarity index 100% rename from deployments/mainnet/USDC.json rename to deployments/ethereum/USDC.json diff --git a/deployments/mainnet/UniswapV3Factory.json b/deployments/ethereum/UniswapV3Factory.json similarity index 100% rename from deployments/mainnet/UniswapV3Factory.json rename to deployments/ethereum/UniswapV3Factory.json diff --git a/deployments/mainnet/UniswapV3Quoter.json b/deployments/ethereum/UniswapV3Quoter.json similarity index 100% rename from deployments/mainnet/UniswapV3Quoter.json rename to deployments/ethereum/UniswapV3Quoter.json diff --git a/deployments/mainnet/WBTC.json b/deployments/ethereum/WBTC.json similarity index 100% rename from deployments/mainnet/WBTC.json rename to deployments/ethereum/WBTC.json diff --git a/deployments/mainnet/WETH.json b/deployments/ethereum/WETH.json similarity index 100% rename from deployments/mainnet/WETH.json rename to deployments/ethereum/WETH.json diff --git a/deployments/mainnet/stETH.json b/deployments/ethereum/stETH.json similarity index 100% rename from deployments/mainnet/stETH.json rename to deployments/ethereum/stETH.json diff --git a/deployments/mainnet/wstETH.json b/deployments/ethereum/wstETH.json similarity index 100% rename from deployments/mainnet/wstETH.json rename to deployments/ethereum/wstETH.json diff --git a/hardhat.config.ts b/hardhat.config.ts index 552c189eb..c4ec28b75 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -23,11 +23,11 @@ export default { settings: { optimizer: { enabled: true, runs: 200 }, debug: { revertStrings: "strip" } }, }, networks: { - mainnet: { + ethereum: { priceDecimals: 18, timelockDelay: 24 * 3_600, finance: { treasuryFeeRate: 0, futurePools: 3 }, - url: env.MAINNET_NODE ?? "", + url: env.ETHEREUM_NODE ?? "", }, optimism: { priceDecimals: 8, timelockDelay: 24 * 3_600, url: env.OPTIMISM_NODE ?? "" }, goerli: { priceDecimals: 8, url: env.GOERLI_NODE ?? "" }, @@ -35,13 +35,13 @@ export default { namedAccounts: { deployer: { default: 0, - mainnet: "0xe61Bdef3FFF4C3CF7A07996DCB8802b5C85B665a", + ethereum: "0xe61Bdef3FFF4C3CF7A07996DCB8802b5C85B665a", optimism: "0xe61Bdef3FFF4C3CF7A07996DCB8802b5C85B665a", goerli: "0xDb90CDB64CfF03f254e4015C4F705C3F3C834400", }, multisig: { default: 0, - mainnet: "0x7A65824d74B0C20730B6eE4929ABcc41Cbe843Aa", + ethereum: "0x7A65824d74B0C20730B6eE4929ABcc41Cbe843Aa", optimism: "0xC0d6Bc5d052d1e74523AD79dD5A954276c9286D3", goerli: "0x1801f5EAeAbA3fD02cBF4b7ED1A7b58AD84C0705", }, @@ -94,7 +94,7 @@ export default { }, }, DAI: { - networks: ["mainnet", "goerli"], + networks: ["ethereum", "goerli"], adjustFactor: 0.9, floatingCurve: { a: 1.7852e-2, b: -2.789e-3, maxUtilization: 1.003568501 }, fixedCurve: { a: 3.6909e-1, b: -3.3415e-1, maxUtilization: 1.02766986 }, @@ -113,12 +113,12 @@ export default { }, }, WBTC: { - networks: ["mainnet", "goerli"], + networks: ["ethereum", "goerli"], adjustFactor: 0.85, floatingCurve: { a: 3.6184e-2, b: -1.5925e-2, maxUtilization: 1.007213882 }, fixedCurve: { a: 3.697e-1, b: -3.497e-1, maxUtilization: 1.000007768 }, overrides: { - mainnet: { priceFeed: "double" }, + ethereum: { priceFeed: "double" }, goerli: { priceFeed: "double" }, }, }, @@ -174,7 +174,7 @@ export default { { assets: ["USDC", "wstETH"], fee: 0.05 }, ], }, - mainnet: { + ethereum: { uniswapFees: [ { assets: ["WETH", "DAI"], fee: 0.05 }, { assets: ["USDC", "DAI"], fee: 0.01 }, diff --git a/package.json b/package.json index ad5df0af0..1a560c2fd 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "coverage:hardhat": "hardhat coverage", "coverage:foundry:snapshot": "forge snapshot --no-match-test testFuzz --check", "coverage:foundry:fuzzer": "FOUNDRY_PROFILE=production forge test --match-test testFuzz", - "deploy:mainnet": "hardhat --network mainnet deploy", + "deploy:ethereum": "hardhat --network ethereum deploy", "deploy:goerli": "hardhat --network goerli deploy", "postinstall": "run-s --continue-on-error postinstall:** || cd .", "postinstall:foundry": "forge install",