From ab1421b2ba7e309876f85b720b76956b547ed52c Mon Sep 17 00:00:00 2001 From: panukettu Date: Tue, 30 Jan 2024 23:37:31 +0200 Subject: [PATCH] chore: update deploy configs --- .../arbitrum-fork/assets-arbitrum-fork.json | 130 ++++++++-------- .../arbitrum-fork/params-arbitrum-fork.json | 13 +- .../arbitrum-fork/users-arbitrum-fork.json | 10 +- .../assets-arbitrum-sepolia.json | 67 +++++++-- .../params-arbitrum-sepolia.json | 13 +- .../deploy/localhost/assets-localhost.json | 142 +++++++++++------- .../deploy/localhost/params-localhost.json | 13 +- .../deploy/test/assets-test-audit.json | 142 +++++++++++------- .../foundry/deploy/test/assets-test-base.json | 137 ++++++++++------- .../deploy/test/assets-test-clean.json | 137 ++++++++++------- .../deploy/test/params-test-audit.json | 13 +- .../foundry/deploy/test/params-test-base.json | 13 +- .../deploy/test/params-test-clean.json | 13 +- src/contracts/test/Audit.t.sol | 2 +- src/contracts/test/Multicall.t.sol | 2 +- 15 files changed, 492 insertions(+), 355 deletions(-) diff --git a/configs/foundry/deploy/arbitrum-fork/assets-arbitrum-fork.json b/configs/foundry/deploy/arbitrum-fork/assets-arbitrum-fork.json index f976f9b7..1aa7e07e 100644 --- a/configs/foundry/deploy/arbitrum-fork/assets-arbitrum-fork.json +++ b/configs/foundry/deploy/arbitrum-fork/assets-arbitrum-fork.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "USDT", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -234,7 +234,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -278,7 +278,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -312,7 +312,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -346,7 +346,7 @@ "00_ticker": "EUR", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -380,7 +380,7 @@ "00_ticker": "JPY", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -414,41 +414,7 @@ "00_ticker": "XAU", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, - 2 - ], - "04_factor": 1e4, - "05_kFactor": 1.025e4, - "06_openFee": 0, - "07_closeFee": 50, - "08_liqIncentive": 1.075e4, - "09_maxDebtMinter": 340282366920938463463374607431768211455, - "10_maxDebtSCDP": 340282366920938463463374607431768211455, - "11_depositLimitSCDP": 0, - "12_swapInFeeSCDP": 25, - "13_swapOutFeeSCDP": 20, - "14_protocolFeeShareSCDP": 0.25e4, - "15_liqIncentiveSCDP": 1.035e4, - "16_decimals": 0, - "17_isMinterCollateral": true, - "18_isMinterMintable": true, - "19_isSharedCollateral": false, - "20_isSwapMintable": true, - "21_isSharedOrSwappedCollateral": true, - "22_isCoverAsset": false - } - }, - { - "00_name": "WTI", - "01_symbol": "krWTI", - "02_underlying": "", - "03_wrapFee": 0, - "04_unwrapFee": 0, - "05_config": { - "00_ticker": "WTI", - "02_anchor": "0x0000000000000000000000000000000000000000", - "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -512,7 +478,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 0, + "08_staleTimeAPI3": 0, + "09_staleTimeChainlink": 0, + "10_staleTimeRedstone": 0, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -521,7 +492,12 @@ "03_chainlink": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612", "04_api3": "0x26690F9f17FdC26D419371315bc17950a0FC90eD", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -530,7 +506,12 @@ "03_chainlink": "0x6ce185860a4963106506C203335A2910413708e9", "04_api3": "0xe5Cf15fED24942E656dBF75165aF1851C89F21B5", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "EUR", @@ -539,7 +520,12 @@ "03_chainlink": "0xA14d53bC1F1c0F31B4aA3BD109344E5009051a84", "04_api3": "0xA37F6f5a04b7D5eB8DF71799e09D683f8CeC22F3", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0xc1b12769f6633798d45adfd62bfc70114839232e2949b01fb3d3f927d2606154", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -548,7 +534,12 @@ "03_chainlink": "0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -557,7 +548,12 @@ "03_chainlink": "0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "XAU", @@ -566,16 +562,12 @@ "03_chainlink": "0x1F954Dc24a49708C26E0C1777f16750B5C6d5a2c", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false - }, - { - "00_ticker": "WTI", - "01_mockPrice": 0, - "02_priceDecimals": 8, - "03_chainlink": "0x594b919AD828e693B935705c3F816221729E7AE8", - "04_api3": "0x0000000000000000000000000000000000000000", - "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDT", @@ -584,7 +576,12 @@ "03_chainlink": "0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x1fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c1588", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "JPY", @@ -593,7 +590,12 @@ "03_chainlink": "0x3dD6e51CB9caE717d5a8778CF79A04029f9cFDF8", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x20a938f54b68f1f2ef18ea0328f6dd0747f8ea11486d22b021e83a900be89776", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ @@ -603,5 +605,5 @@ "02_enabled": false } ], - "08_redstoneMockString": "ETH:2183.7577:8,BTC:41000:8,EUR:1.0764:8,DAI:0.9998:8,USDC:1:8,XAU:2029:8,WTI:69.889:8,USDT:1:8,JPY:0.006797:8" + "08_redstoneMockString": "ETH:2183.7577:8,BTC:41000:8,EUR:1.0764:8,DAI:0.9998:8,USDC:1:8,XAU:2029:8,USDT:1:8,JPY:0.006797:8" } \ No newline at end of file diff --git a/configs/foundry/deploy/arbitrum-fork/params-arbitrum-fork.json b/configs/foundry/deploy/arbitrum-fork/params-arbitrum-fork.json index 1d8ff0b5..4e0a2541 100644 --- a/configs/foundry/deploy/arbitrum-fork/params-arbitrum-fork.json +++ b/configs/foundry/deploy/arbitrum-fork/params-arbitrum-fork.json @@ -1,7 +1,8 @@ { "00_configId": "arbitrum-fork", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x389297F0d8C489954D65e04ff0690FC54E57Dad6", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0xFdB631F5EE196F0ed6FAa767959853A9F217697D", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "02_coverThreshold": 160e2, "03_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0xAbDb949a18d27367118573A217E5353EDe5A0f1E", "01_questForKreskNFT": "0x1C04925779805f2dF7BbD0433ABE92Ea74829bF6", "02_V3SwapRouter02": "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45" }, - "06_gatingPhase": 0 -} + "07_gatingPhase": 0 +} \ No newline at end of file diff --git a/configs/foundry/deploy/arbitrum-fork/users-arbitrum-fork.json b/configs/foundry/deploy/arbitrum-fork/users-arbitrum-fork.json index cee8174b..d077ea36 100644 --- a/configs/foundry/deploy/arbitrum-fork/users-arbitrum-fork.json +++ b/configs/foundry/deploy/arbitrum-fork/users-arbitrum-fork.json @@ -124,14 +124,6 @@ "04_mint": "krBTC", "05_mintAmount": 0.2e18 }, - { - "00_user": 9999, - "01_deposit": "USDT", - "02_depositAmount": 75e6, - "03_assetsFrom": "0xB38e8c17e38363aF6EbdCb3dAE12e0243582891D", - "04_mint": "krWTI", - "05_mintAmount": 91e18 - }, { "00_user": 0, "01_deposit": "DAI", @@ -146,4 +138,4 @@ "01_nftsFrom": "0x99999A0B66AF30f6FEf832938a5038644a72180a", "02_userCount": 3 } -} +} \ No newline at end of file diff --git a/configs/foundry/deploy/arbitrum-sepolia/assets-arbitrum-sepolia.json b/configs/foundry/deploy/arbitrum-sepolia/assets-arbitrum-sepolia.json index c9d7ff82..383dcaeb 100644 --- a/configs/foundry/deploy/arbitrum-sepolia/assets-arbitrum-sepolia.json +++ b/configs/foundry/deploy/arbitrum-sepolia/assets-arbitrum-sepolia.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -236,7 +236,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -270,7 +270,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -304,7 +304,7 @@ "00_ticker": "ARB", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 0.95e4, @@ -338,7 +338,7 @@ "00_ticker": "SPY", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -402,7 +402,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 0, + "08_staleTimeAPI3": 0, + "09_staleTimeChainlink": 0, + "10_staleTimeRedstone": 0, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -411,7 +416,12 @@ "03_chainlink": "0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -420,7 +430,12 @@ "03_chainlink": "0x56a43EB56Da12C0dc1D972ACb089c06a5dEF8e69", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "ARB", @@ -429,7 +444,12 @@ "03_chainlink": "0xD1092a65338d049DB68D7Be6bD89d17a0929945e", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0x37f40d2898159e8f2e52b93cb78f47cc3829a31e525ab975c49cc5c5d9176378", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -438,7 +458,12 @@ "03_chainlink": "0xb113F5A928BCfF189C998ab20d753a47F9dE5A61", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -447,7 +472,12 @@ "03_chainlink": "0x0153002d20B96532C639313c2d54c3dA09109309", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "SPY", @@ -456,7 +486,12 @@ "03_chainlink": "0x4fB44FC4FA132d1a846Bd4143CcdC5a9f1870b06", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xcd69843b4eb5c5207dafbe82e2b08fb64107a56d2fa026cf260c6d5b8ae67a40", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ diff --git a/configs/foundry/deploy/arbitrum-sepolia/params-arbitrum-sepolia.json b/configs/foundry/deploy/arbitrum-sepolia/params-arbitrum-sepolia.json index 2a8d8d15..3837ba5f 100644 --- a/configs/foundry/deploy/arbitrum-sepolia/params-arbitrum-sepolia.json +++ b/configs/foundry/deploy/arbitrum-sepolia/params-arbitrum-sepolia.json @@ -1,7 +1,8 @@ { "00_configId": "arbitrum-sepolia", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0x4374e5a8b9C22271E9EB878A2AA31DE97DF15DAF", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x6cF4Fe1d046C26e3c2d9A1ED1Ee248aAda244ad2", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0x23ab08d87BBAe90e8BDe56F87ad6e53683E08279", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "02_coverThreshold": 160e2, "03_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0x74e573b3Dd705406Fd4048a20Ab5ac9EE76D0B9E", "01_questForKreskNFT": "0x200945e331Af88e1D854Cb9D3503F257B33Fe19F", "02_V3SwapRouter02": "0x021dAc9a7652A2C010AD4B4f412E2DEbBE76481a" }, - "06_gatingPhase": 1 -} + "07_gatingPhase": 1 +} \ No newline at end of file diff --git a/configs/foundry/deploy/localhost/assets-localhost.json b/configs/foundry/deploy/localhost/assets-localhost.json index a0648156..7e2498c4 100644 --- a/configs/foundry/deploy/localhost/assets-localhost.json +++ b/configs/foundry/deploy/localhost/assets-localhost.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "USDT", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -237,7 +237,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -284,7 +284,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -318,7 +318,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -352,7 +352,7 @@ "00_ticker": "EUR", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -386,7 +386,7 @@ "00_ticker": "JPY", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -420,41 +420,7 @@ "00_ticker": "XAU", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, - 2 - ], - "04_factor": 1e4, - "05_kFactor": 1.025e4, - "06_openFee": 0, - "07_closeFee": 50, - "08_liqIncetive": 1.075e4, - "09_maxDebtMinter": 340282366920938463463374607431768211455, - "10_maxDebtSCDP": 340282366920938463463374607431768211455, - "11_depositLimitSCDP": 0, - "12_swapInFeeSCDP": 25, - "13_swapOutFeeSCDP": 20, - "14_protocolFeeShareSCDP": 0.25e4, - "15_liqIncentiveSCDP": 1.035e4, - "16_decimals": 0, - "17_isMinterCollateral": true, - "18_isMinterMintable": true, - "19_isSharedCollateral": false, - "20_isSwapMintable": true, - "21_isSharedOrSwappedCollateral": true, - "22_isCoverAsset": false - } - }, - { - "00_name": "WTI", - "01_symbol": "krWTI", - "02_underlying": "", - "03_wrapFee": 0, - "04_unwrapFee": 0, - "05_config": { - "00_ticker": "WTI", - "02_anchor": "0x0000000000000000000000000000000000000000", - "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -518,7 +484,26 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x83801723D09c87EBa932F544B3cBecb43C591ceB", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 0, + "08_staleTimeAPI3": 0, + "09_staleTimeChainlink": 0, + "10_staleTimeRedstone": 0, + "11_useAdapter": false + }, + { + "00_ticker": "TSLA", + "01_mockPrice": 243.94e8, + "02_priceDecimals": 8, + "03_chainlink": "0x0000000000000000000000000000000000000000", + "04_api3": "0x0000000000000000000000000000000000000000", + "05_vault": "0x0000000000000000000000000000000000000000", + "06_pythId": "0x7dac7cafc583cc4e1ce5c6772c444b8cd7addeecd5bedb341dfa037c770ae71e", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -527,7 +512,12 @@ "03_chainlink": "0x046975952960eD266d4427ad677EBb204cA0b519", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -536,7 +526,12 @@ "03_chainlink": "0x8BAdd8BF6DBADca69485D2520d55bfc92838905A", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "EUR", @@ -545,7 +540,12 @@ "03_chainlink": "0x8f19cDA40A6841C87C42572946007bFa81ad6A6a", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0xc1b12769f6633798d45adfd62bfc70114839232e2949b01fb3d3f927d2606154", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -554,7 +554,12 @@ "03_chainlink": "0x19Bb1c22fDf5Af0020C25896cA0fACF66fC90998", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -563,7 +568,12 @@ "03_chainlink": "0xDEe62623B8d442D0a1b394629465f0a454BC66fc", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "XAU", @@ -572,7 +582,12 @@ "03_chainlink": "0x4110B120bb069Ecbc935410b292f9d5983bfA403", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "WTI", @@ -581,7 +596,12 @@ "03_chainlink": "0xe87A403fA0d3e1F330F5eC24b3fB140cC05d461b", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDT", @@ -590,7 +610,12 @@ "03_chainlink": "0xC60A2fC41328BDCd69D0D286eCfa334629cE2AE0", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x1fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c1588", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "JPY", @@ -599,7 +624,12 @@ "03_chainlink": "0x675992F22951ea43EDD675FB9789A8AC26f81D53", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x20a938f54b68f1f2ef18ea0328f6dd0747f8ea11486d22b021e83a900be89776", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ @@ -609,5 +639,5 @@ "02_enabled": false } ], - "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8" + "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8" } \ No newline at end of file diff --git a/configs/foundry/deploy/localhost/params-localhost.json b/configs/foundry/deploy/localhost/params-localhost.json index 15474dea..d7b4170d 100644 --- a/configs/foundry/deploy/localhost/params-localhost.json +++ b/configs/foundry/deploy/localhost/params-localhost.json @@ -1,7 +1,8 @@ { "00_configId": "localhost", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0x0000000000000000000000000000000000000000", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x6cF4Fe1d046C26e3c2d9A1ED1Ee248aAda244ad2", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0x0000000000000000000000000000000000000000", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "02_coverThreshold": 160e2, "03_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0x5CA81744a379c8E984b2E09d73F427E215615716", "01_questForKreskNFT": "0xDF01B2D0cBd99DbeECd1fE3f7F42C8307A0c3B5a", "02_V3SwapRouter02": "0x0000000000000000000000000000000000000000" }, - "06_gatingPhase": 0 -} + "07_gatingPhase": 0 +} \ No newline at end of file diff --git a/configs/foundry/deploy/test/assets-test-audit.json b/configs/foundry/deploy/test/assets-test-audit.json index af445fd7..fe7d9b7e 100644 --- a/configs/foundry/deploy/test/assets-test-audit.json +++ b/configs/foundry/deploy/test/assets-test-audit.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "USDT", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -237,7 +237,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -284,7 +284,7 @@ "00_ticker": "ETH", "02_anchor": "0x63879cEc8B7D323Ca7d035Afae686b2Bf0960120", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -318,7 +318,7 @@ "00_ticker": "BTC", "02_anchor": "0xc1F3662801d2765BdAe6f84003C949b7c31741f6", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -352,7 +352,7 @@ "00_ticker": "EUR", "02_anchor": "0x091A3DdA5fA99d57A407D8a95303edb6520c9412", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -386,7 +386,7 @@ "00_ticker": "JPY", "02_anchor": "0x0972068A7B7CF476CC5c306ee4e45297841289db", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -420,41 +420,7 @@ "00_ticker": "XAU", "02_anchor": "0x9636e49bffA8280836b9d2C42788aeE27bf1130a", "03_oracles": [ - 1, - 2 - ], - "04_factor": 1e4, - "05_kFactor": 1.025e4, - "06_openFee": 0, - "07_closeFee": 50, - "08_liqIncetive": 1.075e4, - "09_maxDebtMinter": 340282366920938463463374607431768211455, - "10_maxDebtSCDP": 340282366920938463463374607431768211455, - "11_depositLimitSCDP": 0, - "12_swapInFeeSCDP": 25, - "13_swapOutFeeSCDP": 20, - "14_protocolFeeShareSCDP": 0.25e4, - "15_liqIncentiveSCDP": 1.035e4, - "16_decimals": 0, - "17_isMinterCollateral": true, - "18_isMinterMintable": true, - "19_isSharedCollateral": false, - "20_isSwapMintable": true, - "21_isSharedOrSwappedCollateral": true, - "22_isCoverAsset": false - } - }, - { - "00_name": "WTI", - "01_symbol": "krWTI", - "02_underlying": "", - "03_wrapFee": 0, - "04_unwrapFee": 0, - "05_config": { - "00_ticker": "WTI", - "02_anchor": "0x14702D07d543B55f099E617AfE7609c8a49674a4", - "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -518,7 +484,26 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x83801723D09c87EBa932F544B3cBecb43C591ceB", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 0, + "08_staleTimeAPI3": 0, + "09_staleTimeChainlink": 0, + "10_staleTimeRedstone": 0, + "11_useAdapter": false + }, + { + "00_ticker": "TSLA", + "01_mockPrice": 243.94e8, + "02_priceDecimals": 8, + "03_chainlink": "0x0000000000000000000000000000000000000000", + "04_api3": "0x0000000000000000000000000000000000000000", + "05_vault": "0x0000000000000000000000000000000000000000", + "06_pythId": "0x7dac7cafc583cc4e1ce5c6772c444b8cd7addeecd5bedb341dfa037c770ae71e", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -527,7 +512,12 @@ "03_chainlink": "0x046975952960eD266d4427ad677EBb204cA0b519", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -536,7 +526,12 @@ "03_chainlink": "0x8BAdd8BF6DBADca69485D2520d55bfc92838905A", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "EUR", @@ -545,7 +540,12 @@ "03_chainlink": "0x8f19cDA40A6841C87C42572946007bFa81ad6A6a", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0xc1b12769f6633798d45adfd62bfc70114839232e2949b01fb3d3f927d2606154", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -554,7 +554,12 @@ "03_chainlink": "0x19Bb1c22fDf5Af0020C25896cA0fACF66fC90998", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -563,7 +568,12 @@ "03_chainlink": "0xDEe62623B8d442D0a1b394629465f0a454BC66fc", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "XAU", @@ -572,7 +582,12 @@ "03_chainlink": "0x4110B120bb069Ecbc935410b292f9d5983bfA403", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "WTI", @@ -581,7 +596,12 @@ "03_chainlink": "0xe87A403fA0d3e1F330F5eC24b3fB140cC05d461b", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDT", @@ -590,7 +610,12 @@ "03_chainlink": "0xC60A2fC41328BDCd69D0D286eCfa334629cE2AE0", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x1fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c1588", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "JPY", @@ -599,7 +624,12 @@ "03_chainlink": "0x675992F22951ea43EDD675FB9789A8AC26f81D53", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x20a938f54b68f1f2ef18ea0328f6dd0747f8ea11486d22b021e83a900be89776", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ @@ -609,5 +639,5 @@ "02_enabled": false } ], - "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8" + "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8" } \ No newline at end of file diff --git a/configs/foundry/deploy/test/assets-test-base.json b/configs/foundry/deploy/test/assets-test-base.json index be9838a8..f25ec1ce 100644 --- a/configs/foundry/deploy/test/assets-test-base.json +++ b/configs/foundry/deploy/test/assets-test-base.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "USDT", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -237,7 +237,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -284,7 +284,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -318,7 +318,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -352,7 +352,7 @@ "00_ticker": "EUR", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -386,7 +386,7 @@ "00_ticker": "JPY", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -420,7 +420,7 @@ "00_ticker": "TSLA", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -454,41 +454,7 @@ "00_ticker": "XAU", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, - 2 - ], - "04_factor": 1e4, - "05_kFactor": 1.025e4, - "06_openFee": 0, - "07_closeFee": 50, - "08_liqIncetive": 1.075e4, - "09_maxDebtMinter": 340282366920938463463374607431768211455, - "10_maxDebtSCDP": 340282366920938463463374607431768211455, - "11_depositLimitSCDP": 0, - "12_swapInFeeSCDP": 25, - "13_swapOutFeeSCDP": 20, - "14_protocolFeeShareSCDP": 0.25e4, - "15_liqIncentiveSCDP": 1.035e4, - "16_decimals": 0, - "17_isMinterCollateral": true, - "18_isMinterMintable": true, - "19_isSharedCollateral": false, - "20_isSwapMintable": true, - "21_isSharedOrSwappedCollateral": true, - "22_isCoverAsset": false - } - }, - { - "00_name": "WTI", - "01_symbol": "krWTI", - "02_underlying": "", - "03_wrapFee": 0, - "04_unwrapFee": 0, - "05_config": { - "00_ticker": "WTI", - "02_anchor": "0x0000000000000000000000000000000000000000", - "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -552,7 +518,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x83801723D09c87EBa932F544B3cBecb43C591ceB", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "TSLA", @@ -561,7 +532,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x7dac7cafc583cc4e1ce5c6772c444b8cd7addeecd5bedb341dfa037c770ae71e", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -570,7 +546,12 @@ "03_chainlink": "0x046975952960eD266d4427ad677EBb204cA0b519", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -579,7 +560,12 @@ "03_chainlink": "0x8BAdd8BF6DBADca69485D2520d55bfc92838905A", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "EUR", @@ -588,7 +574,12 @@ "03_chainlink": "0x8f19cDA40A6841C87C42572946007bFa81ad6A6a", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0xc1b12769f6633798d45adfd62bfc70114839232e2949b01fb3d3f927d2606154", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -597,7 +588,12 @@ "03_chainlink": "0x19Bb1c22fDf5Af0020C25896cA0fACF66fC90998", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -606,7 +602,12 @@ "03_chainlink": "0xDEe62623B8d442D0a1b394629465f0a454BC66fc", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "XAU", @@ -615,7 +616,12 @@ "03_chainlink": "0x4110B120bb069Ecbc935410b292f9d5983bfA403", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "WTI", @@ -624,7 +630,12 @@ "03_chainlink": "0xe87A403fA0d3e1F330F5eC24b3fB140cC05d461b", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDT", @@ -633,7 +644,12 @@ "03_chainlink": "0xC60A2fC41328BDCd69D0D286eCfa334629cE2AE0", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x1fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c1588", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "JPY", @@ -642,7 +658,12 @@ "03_chainlink": "0x675992F22951ea43EDD675FB9789A8AC26f81D53", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x20a938f54b68f1f2ef18ea0328f6dd0747f8ea11486d22b021e83a900be89776", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ @@ -652,5 +673,5 @@ "02_enabled": false } ], - "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,TSLA:243.94:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8" + "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,TSLA:243.94:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8" } \ No newline at end of file diff --git a/configs/foundry/deploy/test/assets-test-clean.json b/configs/foundry/deploy/test/assets-test-clean.json index 42d5037f..873a097b 100644 --- a/configs/foundry/deploy/test/assets-test-clean.json +++ b/configs/foundry/deploy/test/assets-test-clean.json @@ -18,7 +18,7 @@ "00_ticker": "ETH", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -60,7 +60,7 @@ "00_ticker": "BTC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -102,7 +102,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -147,7 +147,7 @@ "00_ticker": "USDC", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -192,7 +192,7 @@ "00_ticker": "USDT", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -237,7 +237,7 @@ "00_ticker": "DAI", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -284,7 +284,7 @@ "00_ticker": "ETH", "02_anchor": "0x63879cEc8B7D323Ca7d035Afae686b2Bf0960120", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -318,7 +318,7 @@ "00_ticker": "BTC", "02_anchor": "0xc1F3662801d2765BdAe6f84003C949b7c31741f6", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -352,7 +352,7 @@ "00_ticker": "EUR", "02_anchor": "0x091A3DdA5fA99d57A407D8a95303edb6520c9412", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -386,7 +386,7 @@ "00_ticker": "JPY", "02_anchor": "0x0972068A7B7CF476CC5c306ee4e45297841289db", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -420,7 +420,7 @@ "00_ticker": "TSLA", "02_anchor": "0x0000000000000000000000000000000000000000", "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -454,41 +454,7 @@ "00_ticker": "XAU", "02_anchor": "0x9636e49bffA8280836b9d2C42788aeE27bf1130a", "03_oracles": [ - 1, - 2 - ], - "04_factor": 1e4, - "05_kFactor": 1.025e4, - "06_openFee": 0, - "07_closeFee": 50, - "08_liqIncetive": 1.075e4, - "09_maxDebtMinter": 340282366920938463463374607431768211455, - "10_maxDebtSCDP": 340282366920938463463374607431768211455, - "11_depositLimitSCDP": 0, - "12_swapInFeeSCDP": 25, - "13_swapOutFeeSCDP": 20, - "14_protocolFeeShareSCDP": 0.25e4, - "15_liqIncentiveSCDP": 1.035e4, - "16_decimals": 0, - "17_isMinterCollateral": true, - "18_isMinterMintable": true, - "19_isSharedCollateral": false, - "20_isSwapMintable": true, - "21_isSharedOrSwappedCollateral": true, - "22_isCoverAsset": false - } - }, - { - "00_name": "WTI", - "01_symbol": "krWTI", - "02_underlying": "", - "03_wrapFee": 0, - "04_unwrapFee": 0, - "05_config": { - "00_ticker": "WTI", - "02_anchor": "0x14702D07d543B55f099E617AfE7609c8a49674a4", - "03_oracles": [ - 1, + 5, 2 ], "04_factor": 1e4, @@ -552,7 +518,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x83801723D09c87EBa932F544B3cBecb43C591ceB", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "TSLA", @@ -561,7 +532,12 @@ "03_chainlink": "0x0000000000000000000000000000000000000000", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x7dac7cafc583cc4e1ce5c6772c444b8cd7addeecd5bedb341dfa037c770ae71e", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "ETH", @@ -570,7 +546,12 @@ "03_chainlink": "0x046975952960eD266d4427ad677EBb204cA0b519", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "BTC", @@ -579,7 +560,12 @@ "03_chainlink": "0x8BAdd8BF6DBADca69485D2520d55bfc92838905A", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "EUR", @@ -588,7 +574,12 @@ "03_chainlink": "0x8f19cDA40A6841C87C42572946007bFa81ad6A6a", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "05_useAdapter": false + "06_pythId": "0xc1b12769f6633798d45adfd62bfc70114839232e2949b01fb3d3f927d2606154", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "DAI", @@ -597,7 +588,12 @@ "03_chainlink": "0x19Bb1c22fDf5Af0020C25896cA0fACF66fC90998", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x87a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de412", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDC", @@ -606,7 +602,12 @@ "03_chainlink": "0xDEe62623B8d442D0a1b394629465f0a454BC66fc", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "XAU", @@ -615,7 +616,12 @@ "03_chainlink": "0x4110B120bb069Ecbc935410b292f9d5983bfA403", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "WTI", @@ -624,7 +630,12 @@ "03_chainlink": "0xe87A403fA0d3e1F330F5eC24b3fB140cC05d461b", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x0000000000000000000000000000000000000000000000000000000000000000", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "USDT", @@ -633,7 +644,12 @@ "03_chainlink": "0xC60A2fC41328BDCd69D0D286eCfa334629cE2AE0", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x1fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c1588", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false }, { "00_ticker": "JPY", @@ -642,7 +658,12 @@ "03_chainlink": "0x675992F22951ea43EDD675FB9789A8AC26f81D53", "04_api3": "0x0000000000000000000000000000000000000000", "05_vault": "0x0000000000000000000000000000000000000000", - "06_useAdapter": false + "06_pythId": "0x20a938f54b68f1f2ef18ea0328f6dd0747f8ea11486d22b021e83a900be89776", + "07_staleTimePyth": 180, + "08_staleTimeAPI3": 86401, + "09_staleTimeChainlink": 86401, + "10_staleTimeRedstone": 300, + "11_useAdapter": false } ], "07_customTradeRoutes": [ @@ -652,5 +673,5 @@ "02_enabled": false } ], - "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,TSLA:243.94:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8" + "08_redstoneMockString": "ETH:1911:8,BTC:35159:8,EUR:1.07:8,TSLA:243.94:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8" } \ No newline at end of file diff --git a/configs/foundry/deploy/test/params-test-audit.json b/configs/foundry/deploy/test/params-test-audit.json index c8b959f1..510e0079 100644 --- a/configs/foundry/deploy/test/params-test-audit.json +++ b/configs/foundry/deploy/test/params-test-audit.json @@ -1,7 +1,8 @@ { "00_configId": "test-base", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0x0000000000000000000000000000000000000000", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x6cF4Fe1d046C26e3c2d9A1ED1Ee248aAda244ad2", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0x0000000000000000000000000000000000000000", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "02_coverThreshold": 160e2, "03_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0x5CA81744a379c8E984b2E09d73F427E215615716", "01_questForKreskNFT": "0xDF01B2D0cBd99DbeECd1fE3f7F42C8307A0c3B5a", "02_V3SwapRouter02": "0x0000000000000000000000000000000000000000" }, - "06_gatingPhase": 0 -} + "07_gatingPhase": 0 +} \ No newline at end of file diff --git a/configs/foundry/deploy/test/params-test-base.json b/configs/foundry/deploy/test/params-test-base.json index c8b959f1..510e0079 100644 --- a/configs/foundry/deploy/test/params-test-base.json +++ b/configs/foundry/deploy/test/params-test-base.json @@ -1,7 +1,8 @@ { "00_configId": "test-base", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0x0000000000000000000000000000000000000000", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x6cF4Fe1d046C26e3c2d9A1ED1Ee248aAda244ad2", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0x0000000000000000000000000000000000000000", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "02_coverThreshold": 160e2, "03_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0x5CA81744a379c8E984b2E09d73F427E215615716", "01_questForKreskNFT": "0xDF01B2D0cBd99DbeECd1fE3f7F42C8307A0c3B5a", "02_V3SwapRouter02": "0x0000000000000000000000000000000000000000" }, - "06_gatingPhase": 0 -} + "07_gatingPhase": 0 +} \ No newline at end of file diff --git a/configs/foundry/deploy/test/params-test-clean.json b/configs/foundry/deploy/test/params-test-clean.json index 5a862ee3..ae9d697e 100644 --- a/configs/foundry/deploy/test/params-test-clean.json +++ b/configs/foundry/deploy/test/params-test-clean.json @@ -1,7 +1,8 @@ { "00_configId": "test-base", "01_deploymentFactory": "0x0000000000000000000000000000000000000000", - "02_common": { + "02_pythEndpoint": "0x0000000000000000000000000000000000000000", + "03_common": { "00_admin": "0xFcbB93547B7C1936fEbfe56b4cEeD9Ab66dA1857", "01_council": "0x0000000000000000000000000000000000000000", "02_treasury": "0x6cF4Fe1d046C26e3c2d9A1ED1Ee248aAda244ad2", @@ -12,21 +13,21 @@ "07_sequencerUptimeFeed": "0x0000000000000000000000000000000000000000", "08_gatingManager": "0x0000000000000000000000000000000000000000" }, - "03_scdp": { + "04_scdp": { "00_minCollateralRatio": 250e2, "01_liquidationThreshold": 150e2, "03_coverThreshold": 160e2, "04_coverIncentive": 1.01e4 }, - "04_minter": { + "05_minter": { "00_liquidationThreshold": 140e2, "01_minCollateralRatio": 150e2, "02_minDebtValue": 10e8 }, - "05_periphery": { + "06_periphery": { "00_officiallyKreskianNFT": "0x5CA81744a379c8E984b2E09d73F427E215615716", "01_questForKreskNFT": "0xDF01B2D0cBd99DbeECd1fE3f7F42C8307A0c3B5a", "02_V3SwapRouter02": "0x0000000000000000000000000000000000000000" }, - "06_gatingPhase": 0 -} + "07_gatingPhase": 0 +} \ No newline at end of file diff --git a/src/contracts/test/Audit.t.sol b/src/contracts/test/Audit.t.sol index a885f4d9..dbfa3320 100644 --- a/src/contracts/test/Audit.t.sol +++ b/src/contracts/test/Audit.t.sol @@ -25,7 +25,7 @@ contract AuditTest is Deploy { IERC20 internal vaultShare; string internal rs_price_eth = "ETH:2000:8,"; - string internal rs_prices_rest = "BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8"; + string internal rs_prices_rest = "BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8"; KreskoAsset krETH; address krETHAddr; diff --git a/src/contracts/test/Multicall.t.sol b/src/contracts/test/Multicall.t.sol index 390e5209..bb237cd8 100644 --- a/src/contracts/test/Multicall.t.sol +++ b/src/contracts/test/Multicall.t.sol @@ -23,7 +23,7 @@ contract MulticallTest is Deploy { uint256 constant ETH_PRICE = 2000; string internal rs_price_eth = "ETH:2000:8,"; - string internal rs_prices_rest = "BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,WTI:77.5:8,USDT:1:8,JPY:0.0067:8"; + string internal rs_prices_rest = "BTC:35159:8,EUR:1.07:8,DAI:0.9998:8,USDC:1:8,XAU:1977:8,USDT:1:8,JPY:0.0067:8"; KreskoAsset krETH; KreskoAsset krJPY;