From 57b743994f8c78a1e39db85d3cd785d411a76cd6 Mon Sep 17 00:00:00 2001 From: Patrick Gallagher Date: Wed, 3 Jul 2024 21:59:59 -0700 Subject: [PATCH] add weth collateral --- README.md | 2 +- gov-input/anvil/new-AddCollateral.json | 39 +++++++++- gov-input/mainnet/AddCollateralWETH.json | 38 ++++++++++ gov-input/mainnet/new-AddCollateral.json | 4 +- gov-input/mainnet/new-AddGRT.json | 74 +++++++++---------- gov-input/mainnet/new-AddLINK.json | 74 +++++++++---------- gov-input/mainnet/new-AddWETH.json | 38 ---------- gov-input/sepolia/new-AddCollateral.json | 6 +- .../mainnet/114846423-updateTimeDelay.json | 20 ----- .../88375931-deploy-chainlink-relayer.json | 35 --------- .../mainnet/add-collateral-34858172.json | 70 ++++++++++++++++++ .../sepolia/105299539-add-collateral.json | 17 +---- .../GenerateAddCollateralProposal.s.sol | 4 +- 13 files changed, 232 insertions(+), 189 deletions(-) create mode 100644 gov-input/mainnet/AddCollateralWETH.json delete mode 100644 gov-input/mainnet/new-AddWETH.json delete mode 100644 gov-output/mainnet/114846423-updateTimeDelay.json delete mode 100644 gov-output/mainnet/88375931-deploy-chainlink-relayer.json create mode 100644 gov-output/mainnet/add-collateral-34858172.json diff --git a/README.md b/README.md index d03f25c..912cefb 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ Template: [`new-AddCollateral.json`](gov-input/anvil/new-AddCollateral.json) - delayedOracle: Usually a DelayedOracle that enforces delays to fresh price feeds. - safetyCRatio: RAY, CRatio used to compute the 'safePrice' - the price used when generating debt in SAFEEngine. - liquidationCRatio: RAY, CRatio used to compute the 'liquidationPrice' the price used when liquidating SAFEs. -- CollateralAuctionHouseParams: - maximumDiscount: WAD, Maximum discount at which collateral is being sold - minimumBid: WAD, Minimum acceptable bid - minimumDiscount: WAD, Minimum discount at which collateral is being sold - perSecondDiscountUpdateRate: RAY, Rate at which the discount will be updated in an auction. +- CollateralAuctionHouseParams: - maxDiscount: WAD, Maximum discount at which collateral is being sold - minimumBid: WAD, Minimum acceptable bid - minDiscount: WAD, Minimum discount at which collateral is being sold - perSecondDiscountUpdateRate: RAY, Rate at which the discount will be updated in an auction. This script proposes adding a new collateral to the system (deploys new contracts via the collateral join, collateral auction house factories and it adds the correct authorizations to the needed contracts). ### Modify Parameters diff --git a/gov-input/anvil/new-AddCollateral.json b/gov-input/anvil/new-AddCollateral.json index bf6444e..4006a2e 100644 --- a/gov-input/anvil/new-AddCollateral.json +++ b/gov-input/anvil/new-AddCollateral.json @@ -1 +1,38 @@ -{"chainid":"31337","description":"add NEWADDed as a collateral type","network":"anvil","newCollateralAddress":"0xa513E6E4b8f2a923D98304ec87F64353C4D5C853","newCollateralType":"NEWADD","proposalType":"AddCollateral","ProtocolToken_Address":"0xc6e7DF5E7b4f2A278906862b61205850344D4e7d","ODGovernor_Address":"0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f","SAFEEngine_Address":"0x67d269191c92Caf3cD7723F116c85e6E9bf55933","OracleRelayer_Address":"0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E","LiquidationEngine_Address":"0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9","TaxCollector_Address":"0x95401dc811bb5740090279Ba06cfA8fcF6113778","GlobalSettlement_Address":"0x5f3f1dBD7B74C6B46e8c44f98792A1dAf8d69154","SAFEEngineCollateralParams":{"collateralDebtCeiling":"500000000000000000000000000000000000000000000000","collateralDebtFloor":"100000000000000000000000000000000000000000000000"},"TaxCollectorCollateralParams":{"stabilityFee":"1000000000000000000000000000"},"LiquidationEngineCollateralParams":{"liquidationPenalty":"1000000000000000000","liquidationQuantity":"1000000000000000000000000000000000000000000000","newCAHChild":"0xf9b42E09Fd787d6864D6b2Cd8E1350fc93E6683D"},"OracleRelayerCollateralParams":{"delayedOracle":"0xa783CDc72e34a174CCa57a6d9a74904d0Bec05A9","safetyCRatio":"1000000000000000000000000000","liquidationCRatio":"1000000000000000000000000000"},"CollateralAuctionHouseParams":{"maximumDiscount":"1","minimumBid":"2","minimumDiscount":"3","perSecondDiscountUpdateRate":"999998607628240538157433861"}} \ No newline at end of file +{ + "chainid": "31337", + "description": "add NEWADDed as a collateral type", + "network": "anvil", + "newCollateralAddress": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853", + "newCollateralType": "NEWADD", + "proposalType": "AddCollateral", + "ProtocolToken_Address": "0xc6e7DF5E7b4f2A278906862b61205850344D4e7d", + "ODGovernor_Address": "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f", + "SAFEEngine_Address": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933", + "OracleRelayer_Address": "0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E", + "LiquidationEngine_Address": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9", + "TaxCollector_Address": "0x95401dc811bb5740090279Ba06cfA8fcF6113778", + "GlobalSettlement_Address": "0x5f3f1dBD7B74C6B46e8c44f98792A1dAf8d69154", + "SAFEEngineCollateralParams": { + "collateralDebtCeiling": "500000000000000000000000000000000000000000000000", + "collateralDebtFloor": "100000000000000000000000000000000000000000000000" + }, + "TaxCollectorCollateralParams": { + "stabilityFee": "1000000000000000000000000000" + }, + "LiquidationEngineCollateralParams": { + "liquidationPenalty": "1000000000000000000", + "liquidationQuantity": "1000000000000000000000000000000000000000000000", + "newCAHChild": "0xf9b42E09Fd787d6864D6b2Cd8E1350fc93E6683D" + }, + "OracleRelayerCollateralParams": { + "delayedOracle": "0xa783CDc72e34a174CCa57a6d9a74904d0Bec05A9", + "safetyCRatio": "1000000000000000000000000000", + "liquidationCRatio": "1000000000000000000000000000" + }, + "CollateralAuctionHouseParams": { + "maxDiscount": "1", + "minimumBid": "2", + "minDiscount": "3", + "perSecondDiscountUpdateRate": "999998607628240538157433861" + } +} diff --git a/gov-input/mainnet/AddCollateralWETH.json b/gov-input/mainnet/AddCollateralWETH.json new file mode 100644 index 0000000..c115cff --- /dev/null +++ b/gov-input/mainnet/AddCollateralWETH.json @@ -0,0 +1,38 @@ +{ + "chainid": "42161", + "description": "Add WETH collateral", + "network": "mainnet", + "newCollateralAddress": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", + "newCollateralType": "WETH", + "proposalType": "AddCollateral", + "ProtocolToken_Address": "", + "ODGovernor_Address": "", + "SAFEEngine_Address": "", + "OracleRelayer_Address": "", + "LiquidationEngine_Address": "", + "TaxCollector_Address": "", + "GlobalSettlement_Address": "", + "SAFEEngineCollateralParams": { + "collateralDebtCeiling": "10000000000000000000000000000000000000000000000000000", + "collateralDebtFloor": "200000000000000000000000000000000000000000000000" + }, + "TaxCollectorCollateralParams": { + "stabilityFee": "1000000000472114805215157978" + }, + "LiquidationEngineCollateralParams": { + "newCAHChild": "0x293b702362918e990Dd5f48a80fB139FeAd64263", + "liquidationPenalty": "1050000000000000000", + "liquidationQuantity": "50000000000000000000000000000000000000000000000000" + }, + "OracleRelayerCollateralParams": { + "delayedOracle": "0x562CCE2F4dc383862dC6A926AF10DeFf5fCd172F", + "safetyCRatio": "1200000000000000000000000000", + "liquidationCRatio": "1150000000000000000000000000" + }, + "CollateralAuctionHouseParams": { + "maxDiscount": "900000000000000000", + "minimumBid": "100000000000000000000", + "minDiscount": "1000000000000000000", + "perSecondDiscountUpdateRate": "999985752120000000000000000" + } +} \ No newline at end of file diff --git a/gov-input/mainnet/new-AddCollateral.json b/gov-input/mainnet/new-AddCollateral.json index eff06ba..4d80206 100644 --- a/gov-input/mainnet/new-AddCollateral.json +++ b/gov-input/mainnet/new-AddCollateral.json @@ -30,9 +30,9 @@ "liquidationCRatio": "1000000000000000000000000000" }, "CollateralAuctionHouseParams": { - "maximumDiscount": "1", + "maxDiscount": "1", "minimumBid": "2", - "minimumDiscount": "3", + "minDiscount": "3", "perSecondDiscountUpdateRate": "999998607628240538157433861" } } diff --git a/gov-input/mainnet/new-AddGRT.json b/gov-input/mainnet/new-AddGRT.json index c03f6ec..867feb7 100644 --- a/gov-input/mainnet/new-AddGRT.json +++ b/gov-input/mainnet/new-AddGRT.json @@ -1,38 +1,38 @@ { - "chainid": "42161", - "description": "add GRT as a collateral type", - "network": "mainnet", - "newCollateralAddress": "0x9623063377ad1b27544c965ccd7342f7ea7e88c7", - "newCollateralType": "GRT", - "proposalType": "AddCollateral", - "ProtocolToken_Address": "", - "ODGovernor_Address": "", - "SAFEEngine_Address": "", - "OracleRelayer_Address": "", - "LiquidationEngine_Address": "", - "TaxCollector_Address": "", - "GlobalSettlement_Address": "", - "SAFEEngineCollateralParams": { - "collateralDebtCeiling": "TBD", - "collateralDebtFloor": "TBD" - }, - "TaxCollectorCollateralParams": { - "stabilityFee": "TBD" - }, - "LiquidationEngineCollateralParams": { - "newCAHChild": "", - "liquidationPenalty": "TBD", - "liquidationQuantity": "TBD" - }, - "OracleRelayerCollateralParams": { - "delayedOracle": "TBD", - "safetyCRatio": "TBD", - "liquidationCRatio": "TBD" - }, - "CollateralAuctionHouseParams": { - "maximumDiscount": "TBD", - "minimumBid": "TBD", - "minimumDiscount": "TBD", - "perSecondDiscountUpdateRate": "999998607628240538157433861" - } -} \ No newline at end of file + "chainid": "42161", + "description": "add GRT as a collateral type", + "network": "mainnet", + "newCollateralAddress": "0x9623063377ad1b27544c965ccd7342f7ea7e88c7", + "newCollateralType": "GRT", + "proposalType": "AddCollateral", + "ProtocolToken_Address": "", + "ODGovernor_Address": "", + "SAFEEngine_Address": "", + "OracleRelayer_Address": "", + "LiquidationEngine_Address": "", + "TaxCollector_Address": "", + "GlobalSettlement_Address": "", + "SAFEEngineCollateralParams": { + "collateralDebtCeiling": "TBD", + "collateralDebtFloor": "TBD" + }, + "TaxCollectorCollateralParams": { + "stabilityFee": "TBD" + }, + "LiquidationEngineCollateralParams": { + "newCAHChild": "", + "liquidationPenalty": "TBD", + "liquidationQuantity": "TBD" + }, + "OracleRelayerCollateralParams": { + "delayedOracle": "TBD", + "safetyCRatio": "TBD", + "liquidationCRatio": "TBD" + }, + "CollateralAuctionHouseParams": { + "maxDiscount": "TBD", + "minimumBid": "TBD", + "minDiscount": "TBD", + "perSecondDiscountUpdateRate": "999998607628240538157433861" + } +} diff --git a/gov-input/mainnet/new-AddLINK.json b/gov-input/mainnet/new-AddLINK.json index 40ee99c..eaba2ae 100644 --- a/gov-input/mainnet/new-AddLINK.json +++ b/gov-input/mainnet/new-AddLINK.json @@ -1,38 +1,38 @@ { - "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": "TBD", - "collateralDebtFloor": "TBD" - }, - "TaxCollectorCollateralParams": { - "stabilityFee": "TBD" - }, - "LiquidationEngineCollateralParams": { - "newCAHChild": "", - "liquidationPenalty": "TBD", - "liquidationQuantity": "TBD" - }, - "OracleRelayerCollateralParams": { - "delayedOracle": "TBD", - "safetyCRatio": "TBD", - "liquidationCRatio": "TBD" - }, - "CollateralAuctionHouseParams": { - "maximumDiscount": "TBD", - "minimumBid": "TBD", - "minimumDiscount": "TBD", - "perSecondDiscountUpdateRate": "999998607628240538157433861" - } -} \ No newline at end of file + "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": "TBD", + "collateralDebtFloor": "TBD" + }, + "TaxCollectorCollateralParams": { + "stabilityFee": "TBD" + }, + "LiquidationEngineCollateralParams": { + "newCAHChild": "", + "liquidationPenalty": "TBD", + "liquidationQuantity": "TBD" + }, + "OracleRelayerCollateralParams": { + "delayedOracle": "TBD", + "safetyCRatio": "TBD", + "liquidationCRatio": "TBD" + }, + "CollateralAuctionHouseParams": { + "maxDiscount": "TBD", + "minimumBid": "TBD", + "minDiscount": "TBD", + "perSecondDiscountUpdateRate": "999998607628240538157433861" + } +} diff --git a/gov-input/mainnet/new-AddWETH.json b/gov-input/mainnet/new-AddWETH.json deleted file mode 100644 index 37aae05..0000000 --- a/gov-input/mainnet/new-AddWETH.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "chainid": "42161", - "description": "add WETH as a collateral type", - "network": "mainnet", - "newCollateralAddress": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", - "newCollateralType": "WETH", - "proposalType": "AddCollateral", - "ProtocolToken_Address": "", - "ODGovernor_Address": "", - "SAFEEngine_Address": "", - "OracleRelayer_Address": "", - "LiquidationEngine_Address": "", - "TaxCollector_Address": "", - "GlobalSettlement_Address": "", - "SAFEEngineCollateralParams": { - "collateralDebtCeiling": "TBD", - "collateralDebtFloor": "TBD" - }, - "TaxCollectorCollateralParams": { - "stabilityFee": "TBD" - }, - "LiquidationEngineCollateralParams": { - "newCAHChild": "", - "liquidationPenalty": "TBD", - "liquidationQuantity": "TBD" - }, - "OracleRelayerCollateralParams": { - "delayedOracle": "TBD", - "safetyCRatio": "TBD", - "liquidationCRatio": "TBD" - }, - "CollateralAuctionHouseParams": { - "maximumDiscount": "TBD", - "minimumBid": "TBD", - "minimumDiscount": "TBD", - "perSecondDiscountUpdateRate": "999998607628240538157433861" - } -} \ No newline at end of file diff --git a/gov-input/sepolia/new-AddCollateral.json b/gov-input/sepolia/new-AddCollateral.json index 4520ed5..c251548 100644 --- a/gov-input/sepolia/new-AddCollateral.json +++ b/gov-input/sepolia/new-AddCollateral.json @@ -30,9 +30,9 @@ "liquidationCRatio": "7" }, "CollateralAuctionHouseParams": { - "maximumDiscount": "8", + "maxDiscount": "8", "minimumBid": "9", - "minimumDiscount": "10", + "minDiscount": "10", "perSecondDiscountUpdateRate": "11" } -} \ No newline at end of file +} diff --git a/gov-output/mainnet/114846423-updateTimeDelay.json b/gov-output/mainnet/114846423-updateTimeDelay.json deleted file mode 100644 index 4436043..0000000 --- a/gov-output/mainnet/114846423-updateTimeDelay.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "calldatas": [ - "0x64d623530000000000000000000000000000000000000000000000000000000000015180" - ], - "chainid": 42161, - "description": "update timelock controller delay", - "descriptionHash": "0x0a8224aa026759c98064db26aab55d169c95ba5c77538d6d5f7cde322ee62c5c", - "network": "mainnet", - "newDelay": 86400, - "odGovernor": "0xf704735CE81165261156b41D33AB18a08803B86F", - "proposalId": 114846423288060955527969264021678363564579645850080730213251477921090766025329, - "proposalType": "UpdateDelay", - "targets": [ - "0x7A528eA3E06D85ED1C22219471Cf0b1851943903" - ], - "timelockController": "0x7A528eA3E06D85ED1C22219471Cf0b1851943903", - "values": [ - 0 - ] -} \ No newline at end of file diff --git a/gov-output/mainnet/88375931-deploy-chainlink-relayer.json b/gov-output/mainnet/88375931-deploy-chainlink-relayer.json deleted file mode 100644 index e7d03e5..0000000 --- a/gov-output/mainnet/88375931-deploy-chainlink-relayer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "ChainlinkRelayerFactory_Address": "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5", - "ODGovernor_Address": "0xf704735CE81165261156b41D33AB18a08803B86F", - "arrayLength": "2", - "calldatas": [ - "0x0e880baf00000000000000000000000086e53cf1b870786351da77a57575e79cb55812cb0000000000000000000000000000000000000000000000000000000000015180", - "0x0e880baf0000000000000000000000000f38d86fcef4955b705f35c9e41d1a16e0637c730000000000000000000000000000000000000000000000000000000000015180" - ], - "chainid": 42161, - "description": "Deploy Chainlink Relayer for LINK GRT", - "descriptionHash": "0x0dcd8875dcd2271d64aaa43b2ac0c492fdf6256457384dccf9704d624d0e143a", - "network": "mainnet", - "objectArray": [ - { - "symbol": "LINK/USD", - "chainlinkFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB", - "oracleInterval": "86400" - }, - { - "symbol": "GRT/USD", - "chainlinkFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73", - "oracleInterval": "86400" - } - ], - "proposalId": 88375931169537588183304528371882445074227413161870086449226158883419144926093, - "proposalType": "DeployChainlinkRelayers", - "targets": [ - "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5", - "0x06C32500489C28Bd57c551afd8311Fef20bFaBB5" - ], - "values": [ - 0, - 0 - ] -} \ No newline at end of file diff --git a/gov-output/mainnet/add-collateral-34858172.json b/gov-output/mainnet/add-collateral-34858172.json new file mode 100644 index 0000000..7cd7e09 --- /dev/null +++ b/gov-output/mainnet/add-collateral-34858172.json @@ -0,0 +1,70 @@ +{ + "CollateralAuctionHouseParams": { + "maxDiscount": "900000000000000000", + "minimumBid": "100000000000000000000", + "minDiscount": "1000000000000000000", + "perSecondDiscountUpdateRate": "999985752120000000000000000" + }, + "GlobalSettlement_Address": "0x1c6B7ab018be82ed6b5c63aE82D9f07bb7B231A2", + "LiquidationEngineCollateralParams": { + "newCAHChild": "0x293b702362918e990Dd5f48a80fB139FeAd64263", + "liquidationPenalty": "1050000000000000000", + "liquidationQuantity": "50000000000000000000000000000000000000000000000000" + }, + "LiquidationEngine_Address": "0x17e546dDCE2EA8A74Bd667269457A2e80b309965", + "ODGovernor_Address": "0xf704735CE81165261156b41D33AB18a08803B86F", + "OracleRelayerCollateralParams": { + "delayedOracle": "0x562CCE2F4dc383862dC6A926AF10DeFf5fCd172F", + "safetyCRatio": "1200000000000000000000000000", + "liquidationCRatio": "1150000000000000000000000000" + }, + "OracleRelayer_Address": "0x7404fc1F3796748FAE17011b57Fad9713185c1d6", + "ProtocolToken_Address": "0x000D636bD52BFc1B3a699165Ef5aa340BEA8939c", + "SAFEEngineCollateralParams": { + "collateralDebtCeiling": "10000000000000000000000000000000000000000000000000000", + "collateralDebtFloor": "200000000000000000000000000000000000000000000000" + }, + "SAFEEngine_Address": "0xEff45E8e2353893BD0558bD5892A42786E9142F1", + "TaxCollectorCollateralParams": { + "stabilityFee": "1000000000472114805215157978" + }, + "TaxCollector_Address": "0xc93F938A95488a03b976A15B20fAcFD52D087fB2", + "calldatas": [ + "0x26e16665574554480000000000000000000000000000000000000000000000000000000000000000000000000000000082af49447d8a07e3bd95bd0d56f35241523fbab1", + "0x34463c605745544800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000056bc75e2d631000000000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000c7d713b49da00000000000000000000000000000000000000000000033b2b383ec254bdcf6c0000", + "0x34463c60574554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000001aba4714957d300d0e549208b31adb1000000000000000000000000000000000000023084f676940b7915149bd08b30d000000000000", + "0x34463c605745544800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000033b2e3ca65dca26e20d5eda", + "0x34463c60574554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000293b702362918e990dd5f48a80fb139fead642630000000000000000000000000000000000000000000000000e92596fd6290000000000000000000000000022361d8afcc93343e962029a7edab2000000000000", + "0x34463c60574554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000562cce2f4dc383862dc6a926af10deff5fcd172f000000000000000000000000000000000000000003e09de2596099e2b0000000000000000000000000000000000000000000000003b741f8eafc93793e000000", + "0x35b2815300000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000293b702362918e990dd5f48a80fb139fead64263", + "0xd94d420800000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000293b702362918e990dd5f48a80fb139fead64263" + ], + "chainid": "42161", + "description": "Add WETH collateral", + "descriptionHash": "0xfd136854ab5ad7612b20257dbb15bbf69f738244d3f9eb544096a2bf7c8f04ef", + "network": "mainnet", + "newCollateralAddress": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", + "newCollateralType": "WETH", + "proposalId": 34858172628765133262997362556758347679155114160723424965616922864986482020293, + "proposalType": "AddCollateral", + "targets": [ + "0xa83c0f1e9eD8E383919Dde0fC90744ae370EB7B3", + "0x5dc1E86361faC018f24Ae0D1E5eB01D70AB32A82", + "0xEff45E8e2353893BD0558bD5892A42786E9142F1", + "0xc93F938A95488a03b976A15B20fAcFD52D087fB2", + "0x17e546dDCE2EA8A74Bd667269457A2e80b309965", + "0x7404fc1F3796748FAE17011b57Fad9713185c1d6", + "0xEff45E8e2353893BD0558bD5892A42786E9142F1", + "0xEff45E8e2353893BD0558bD5892A42786E9142F1" + ], + "values": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/gov-output/sepolia/105299539-add-collateral.json b/gov-output/sepolia/105299539-add-collateral.json index e804606..950dc15 100644 --- a/gov-output/sepolia/105299539-add-collateral.json +++ b/gov-output/sepolia/105299539-add-collateral.json @@ -1,8 +1,8 @@ { "CollateralAuctionHouseParams": { - "maximumDiscount": "8", + "maxDiscount": "8", "minimumBid": "9", - "minimumDiscount": "10", + "minDiscount": "10", "perSecondDiscountUpdateRate": "11" }, "GlobalSettlement_Address": "0xdb27222024d1AfcB826397d2542812bA5D427f6D", @@ -57,14 +57,5 @@ "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5", "0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5" ], - "values": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] -} \ No newline at end of file + "values": [0, 0, 0, 0, 0, 0, 0, 0] +} diff --git a/src/contracts/Generate/GenerateAddCollateralProposal.s.sol b/src/contracts/Generate/GenerateAddCollateralProposal.s.sol index fe12064..6fe0d9e 100644 --- a/src/contracts/Generate/GenerateAddCollateralProposal.s.sol +++ b/src/contracts/Generate/GenerateAddCollateralProposal.s.sol @@ -89,8 +89,8 @@ contract GenerateAddCollateralProposal is Generator, JSONScript { oracleRelayer = json.readAddress(string(abi.encodePacked('.OracleRelayer_Address:'))); _cahCParams.minimumBid = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.minimumBid'))); - _cahCParams.minDiscount = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.minimumDiscount'))); - _cahCParams.maxDiscount = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.maximumDiscount'))); + _cahCParams.minDiscount = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.minDiscount'))); + _cahCParams.maxDiscount = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.maxDiscount'))); _cahCParams.perSecondDiscountUpdateRate = json.readUint(string(abi.encodePacked('.CollateralAuctionHouseParams.perSecondDiscountUpdateRate')));