From c4f9154df89bc7616726f81506f52e9c743b96a5 Mon Sep 17 00:00:00 2001 From: MrDeadCe11 Date: Sun, 7 Jul 2024 18:56:28 -0500 Subject: [PATCH 1/2] filled in required data according to gov prop. still need delayed relayer addresses to finish. --- gov-input/mainnet/new-AddGRT.json | 40 +++++++++++++++--------------- gov-input/mainnet/new-AddLINK.json | 24 +++++++++--------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gov-input/mainnet/new-AddGRT.json b/gov-input/mainnet/new-AddGRT.json index 867feb7..d63ba14 100644 --- a/gov-input/mainnet/new-AddGRT.json +++ b/gov-input/mainnet/new-AddGRT.json @@ -5,34 +5,34 @@ "newCollateralAddress": "0x9623063377ad1b27544c965ccd7342f7ea7e88c7", "newCollateralType": "GRT", "proposalType": "AddCollateral", - "ProtocolToken_Address": "", - "ODGovernor_Address": "", - "SAFEEngine_Address": "", - "OracleRelayer_Address": "", - "LiquidationEngine_Address": "", - "TaxCollector_Address": "", - "GlobalSettlement_Address": "", + "ProtocolToken_Address": "0x000D636bD52BFc1B3a699165Ef5aa340BEA8939c", + "ODGovernor_Address": "0xf704735CE81165261156b41D33AB18a08803B86F", + "SAFEEngine_Address": "0xEff45E8e2353893BD0558bD5892A42786E9142F1", + "OracleRelayer_Address": "0x7404fc1F3796748FAE17011b57Fad9713185c1d6", + "LiquidationEngine_Address": "0x17e546dDCE2EA8A74Bd667269457A2e80b309965", + "TaxCollector_Address": "0xc93F938A95488a03b976A15B20fAcFD52D087fB2", + "GlobalSettlement_Address": "0x1c6B7ab018be82ed6b5c63aE82D9f07bb7B231A2", "SAFEEngineCollateralParams": { - "collateralDebtCeiling": "TBD", - "collateralDebtFloor": "TBD" + "collateralDebtCeiling": "100000000000000000000000000000000000000000000000000", + "collateralDebtFloor": "200000000000000000000000000000000000000000000000" }, "TaxCollectorCollateralParams": { - "stabilityFee": "TBD" + "stabilityFee": "5000000000472114805215157978" }, "LiquidationEngineCollateralParams": { - "newCAHChild": "", - "liquidationPenalty": "TBD", - "liquidationQuantity": "TBD" + "newCAHChild": "0x293b702362918e990Dd5f48a80fB139FeAd64263", + "liquidationPenalty": "15000000000000000000", + "liquidationQuantity": "50000000000000000000000000000" }, "OracleRelayerCollateralParams": { - "delayedOracle": "TBD", - "safetyCRatio": "TBD", - "liquidationCRatio": "TBD" + "delayedOracle": "", + "safetyCRatio": "2000000000000000000000000000", + "liquidationCRatio": "1900000000000000000000000000" }, "CollateralAuctionHouseParams": { - "maxDiscount": "TBD", - "minimumBid": "TBD", - "minDiscount": "TBD", + "maxDiscount": "1500000000000000000", + "minimumBid": "100000000000000000000", + "minDiscount": "1000000000000000000", "perSecondDiscountUpdateRate": "999998607628240538157433861" } -} +} \ No newline at end of file diff --git a/gov-input/mainnet/new-AddLINK.json b/gov-input/mainnet/new-AddLINK.json index eaba2ae..65f8c85 100644 --- a/gov-input/mainnet/new-AddLINK.json +++ b/gov-input/mainnet/new-AddLINK.json @@ -13,26 +13,26 @@ "TaxCollector_Address": "", "GlobalSettlement_Address": "", "SAFEEngineCollateralParams": { - "collateralDebtCeiling": "TBD", - "collateralDebtFloor": "TBD" + "collateralDebtCeiling": "250000000000000000000000000000000000000000000000000", + "collateralDebtFloor": "200000000000000000000000000000000000000000000000" }, "TaxCollectorCollateralParams": { - "stabilityFee": "TBD" + "stabilityFee": "5000000000472114805215157978" }, "LiquidationEngineCollateralParams": { "newCAHChild": "", - "liquidationPenalty": "TBD", - "liquidationQuantity": "TBD" + "liquidationPenalty": "15000000000000000000", + "liquidationQuantity": "50000000000000000000000000000" }, "OracleRelayerCollateralParams": { - "delayedOracle": "TBD", - "safetyCRatio": "TBD", - "liquidationCRatio": "TBD" + "delayedOracle": "", + "safetyCRatio": "2000000000000000000000000000", + "liquidationCRatio": "1900000000000000000000000000" }, "CollateralAuctionHouseParams": { - "maxDiscount": "TBD", - "minimumBid": "TBD", - "minDiscount": "TBD", + "maxDiscount": "1500000000000000000", + "minimumBid": "100000000000000000000", + "minDiscount": "1000000000000000000", "perSecondDiscountUpdateRate": "999998607628240538157433861" } -} +} \ No newline at end of file From a853bc360e7406e4df63aff4beaa2569c75f9fb7 Mon Sep 17 00:00:00 2001 From: MrDeadCe11 Date: Mon, 8 Jul 2024 11:15:02 -0500 Subject: [PATCH 2/2] added grt input in mainnet inputs --- gov-input/mainnet/new-AddLINK.json | 38 ---------- .../deploy-chainlink-relayer-24801519.json | 61 ++++++++++++++++ .../sepolia/add-collateral-112257779.json | 70 +++++++++++++++++++ 3 files changed, 131 insertions(+), 38 deletions(-) delete mode 100644 gov-input/mainnet/new-AddLINK.json create mode 100644 gov-output/mainnet/deploy-chainlink-relayer-24801519.json create mode 100644 gov-output/sepolia/add-collateral-112257779.json diff --git a/gov-input/mainnet/new-AddLINK.json b/gov-input/mainnet/new-AddLINK.json deleted file mode 100644 index 65f8c85..0000000 --- a/gov-input/mainnet/new-AddLINK.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "chainid": "42161", - "description": "add LINK as a collateral type", - "network": "mainnet", - "newCollateralAddress": "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4", - "newCollateralType": "LINK", - "proposalType": "AddCollateral", - "ProtocolToken_Address": "", - "ODGovernor_Address": "", - "SAFEEngine_Address": "", - "OracleRelayer_Address": "", - "LiquidationEngine_Address": "", - "TaxCollector_Address": "", - "GlobalSettlement_Address": "", - "SAFEEngineCollateralParams": { - "collateralDebtCeiling": "250000000000000000000000000000000000000000000000000", - "collateralDebtFloor": "200000000000000000000000000000000000000000000000" - }, - "TaxCollectorCollateralParams": { - "stabilityFee": "5000000000472114805215157978" - }, - "LiquidationEngineCollateralParams": { - "newCAHChild": "", - "liquidationPenalty": "15000000000000000000", - "liquidationQuantity": "50000000000000000000000000000" - }, - "OracleRelayerCollateralParams": { - "delayedOracle": "", - "safetyCRatio": "2000000000000000000000000000", - "liquidationCRatio": "1900000000000000000000000000" - }, - "CollateralAuctionHouseParams": { - "maxDiscount": "1500000000000000000", - "minimumBid": "100000000000000000000", - "minDiscount": "1000000000000000000", - "perSecondDiscountUpdateRate": "999998607628240538157433861" - } -} \ No newline at end of file diff --git a/gov-output/mainnet/deploy-chainlink-relayer-24801519.json b/gov-output/mainnet/deploy-chainlink-relayer-24801519.json new file mode 100644 index 0000000..a9bee9e --- /dev/null +++ b/gov-output/mainnet/deploy-chainlink-relayer-24801519.json @@ -0,0 +1,61 @@ +{ + "ChainlinkRelayerFactory_Address": "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5", + "ChainlinkSequencerFeed": "0xFdB631F5EE196F0ed6FAa767959853A9F217697D", + "ODGovernor_Address": "0xf704735CE81165261156b41D33AB18a08803B86F", + "PredictedRelayerAddresses": [ + { + "symbol": "LINK/USD", + "address": "0x4617Feb8B72167c3b8253a1327CddE44e54670Ce" + }, + { + "symbol": "GRT/USD", + "address": "0xd56d1478F2AC1dFAdEd56CFe8CFEecFf95659147" + }, + { + "symbol": "ETH/USD", + "address": "0xf46caF001A26f0039e2994709eD9D4154FCc5e6c" + } + ], + "arrayLength": "3", + "calldatas": [ + "0x251ad9a500000000000000000000000086e53cf1b870786351da77a57575e79cb55812cb000000000000000000000000fdb631f5ee196f0ed6faa767959853a9f217697d00000000000000000000000000000000000000000000000000000000000151800000000000000000000000000000000000000000000000000000000000000e10", + "0x251ad9a50000000000000000000000000f38d86fcef4955b705f35c9e41d1a16e0637c73000000000000000000000000fdb631f5ee196f0ed6faa767959853a9f217697d00000000000000000000000000000000000000000000000000000000000151800000000000000000000000000000000000000000000000000000000000000e10", + "0x251ad9a5000000000000000000000000639fe6ab55c921f74e7fac1ee960c0b6293ba612000000000000000000000000fdb631f5ee196f0ed6faa767959853a9f217697d00000000000000000000000000000000000000000000000000000000000151800000000000000000000000000000000000000000000000000000000000000e10" + ], + "chainid": 42161, + "description": "Deploy Chainlink Relayer for LINK GRT", + "descriptionHash": "0x0dcd8875dcd2271d64aaa43b2ac0c492fdf6256457384dccf9704d624d0e143a", + "network": "mainnet", + "objectArray": [ + { + "symbol": "LINK/USD", + "chainlinkPriceFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB", + "staleThreshold": "86400", + "gracePeriod": "3600" + }, + { + "symbol": "GRT/USD", + "chainlinkPriceFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73", + "staleThreshold": "86400", + "gracePeriod": "3600" + }, + { + "symbol": "ETH/USD", + "chainlinkPriceFeed": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612", + "staleThreshold": "86400", + "gracePeriod": "3600" + } + ], + "proposalId": 24801519012582943543548558377966805082728844328645270367356835759820269593606, + "proposalType": "DeployChainlinkRelayers", + "targets": [ + "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5", + "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5", + "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5" + ], + "values": [ + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/gov-output/sepolia/add-collateral-112257779.json b/gov-output/sepolia/add-collateral-112257779.json new file mode 100644 index 0000000..61534c9 --- /dev/null +++ b/gov-output/sepolia/add-collateral-112257779.json @@ -0,0 +1,70 @@ +{ + "CollateralAuctionHouseParams": { + "maximumDiscount": "8", + "minimumBid": "9", + "minimumDiscount": "10", + "perSecondDiscountUpdateRate": "11" + }, + "GlobalSettlement_Address": "0xdb27222024d1AfcB826397d2542812bA5D427f6D", + "LiquidationEngineCollateralParams": { + "newCAHChild": "0x1ebFA3a5074f74C1dE3d1bfd1e981ab89475Ef14", + "liquidationPenalty": "4", + "liquidationQuantity": "5" + }, + "LiquidationEngine_Address": "0xBac6C44596EB176205BCf5149ea87D430515B828", + "ODGovernor_Address": "0x69ae232E574352232aB8678869eAA3BEBd885211", + "OracleRelayerCollateralParams": { + "delayedOracle": "0x1ebFA3a5074f74C1dE3d1bfd1e981ab89475Ef14", + "safetyCRatio": "6", + "liquidationCRatio": "7" + }, + "OracleRelayer_Address": "0xf52b9fC4e4A16cc1142d3aC7eA985Aa57DA4d9B3", + "ProtocolToken_Address": "0xbbB4f37c787C6ecb0b6b5Fb3F73221aA22fabA70", + "SAFEEngineCollateralParams": { + "collateralDebtCeiling": "1", + "collateralDebtFloor": "2" + }, + "SAFEEngine_Address": "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5", + "TaxCollectorCollateralParams": { + "stabilityFee": "3" + }, + "TaxCollector_Address": "0x69f01E76365B28eB3eb4B6e7134BF8dCb1057F21", + "calldatas": [ + "0x26e166654e455745590000000000000000000000000000000000000000000000000000000000000000000000000000001ebfa3a5074f74c1de3d1bfd1e981ab89475ef14", + "0x34463c604e45574559000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000b", + "0x34463c604e455745590000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002", + "0x34463c604e45574559000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003", + "0x34463c604e45574559000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000600000000000000000000000001ebfa3a5074f74c1de3d1bfd1e981ab89475ef1400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005", + "0x34463c604e45574559000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000600000000000000000000000001ebfa3a5074f74c1de3d1bfd1e981ab89475ef1400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000007", + "0x35b281530000000000000000000000001ebfa3a5074f74c1de3d1bfd1e981ab89475ef14", + "0xd94d42080000000000000000000000001ebfa3a5074f74c1de3d1bfd1e981ab89475ef14" + ], + "chainid": "421614", + "description": "it's a new collateratl!", + "descriptionHash": "0xbdd96e7dd2dcd1e6ea590b76b260694990b8601925aa4e72d3b1d7d2f5705139", + "network": "sepolia", + "newCollateralAddress": "0x1ebFA3a5074f74C1dE3d1bfd1e981ab89475Ef14", + "newCollateralType": "NEWEY", + "proposalId": 112257779582917992632318877683838444739293189915875144557675515179577003686822, + "proposalType": "AddCollateral", + "targets": [ + "0x174C33ED9CCA1F2a27Af7B6B6f2d3246a75eB8be", + "0x5C95C7aebB8A84869EA0E8528C35BCb0725A3024", + "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5", + "0x69f01E76365B28eB3eb4B6e7134BF8dCb1057F21", + "0xBac6C44596EB176205BCf5149ea87D430515B828", + "0xf52b9fC4e4A16cc1142d3aC7eA985Aa57DA4d9B3", + "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5", + "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5" + ], + "values": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file