v1.6.5

open-dollar · Apr 10, 2024 · 5715669 · 5715669
1 parent 29c5879
commit 5715669
Show file tree

Hide file tree

Showing 8 changed files with 15,381 additions and 5,296 deletions.
diff --git a/deployments/sepolia/run-1698886508.json → deployments/sepolia/run-11-2-23.json b/deployments/sepolia/run-1698886508.json → deployments/sepolia/run-11-2-23.json
diff --git a/deployments/sepolia/run-2-2-24.json b/deployments/sepolia/run-2-2-24.json
diff --git a/deployments/sepolia/run-latest.json b/deployments/sepolia/run-latest.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "deploy:anvil": "bash -c 'source .env && forge script DeployAnvil --with-gas-price 2000000000 -vvvvv --rpc-url $ANVIL_RPC --private-key $ANVIL_ONE --broadcast --ffi' && mkdir -p deployments/anvil/ && cp broadcast/Deploy.s.sol/31337/run-latest.json deployments/anvil/ && node tasks/parseAnvilDeployments.js",
     "deploy:mainnet": "bash -c 'source .env && forge script DeployMainnet --rpc-url $ARB_MAINNET_RPC --broadcast --private-key $ARB_MAINNET_DEPLOYER_PK --verify --etherscan-api-key $ARB_ETHERSCAN_API_KEY'",
     "deploy:mainnet:ffi": "bash -c 'source .env && forge script DeployMainnet --rpc-url $ARB_MAINNET_RPC --broadcast --private-key $ARB_MAINNET_DEPLOYER_PK --verify --etherscan-api-key $ARB_ETHERSCAN_API_KEY --ffi'",
-    "deploy:sepolia:ffi": "bash -c 'source .env && forge script DeploySepolia --with-gas-price 2000000000 -vvvvv --chain-id 461614 --rpc-url $ARB_SEPOLIA_RPC --private-key $ARB_SEPOLIA_DEPLOYER_PK --broadcast --verify --etherscan-api-key $ARB_ETHERSCAN_API_KEY --ffi'",
+    "deploy:sepolia:ffi": "bash -c 'source .env && forge script DeploySepolia --with-gas-price 2000000000 -vvvvv --rpc-url $ARB_SEPOLIA_RPC --private-key $ARB_SEPOLIA_DEPLOYER_PK --broadcast --verify --etherscan-api-key $ARB_ETHERSCAN_API_KEY --ffi'",
     "postinstall": "forge install",
     "lint:check": "yarn lint:sol && forge fmt --check",
     "lint:fix": "sort-package-json && forge fmt && yarn lint:sol --fix",

diff --git a/script/SepoliaContracts.s.sol b/script/SepoliaContracts.s.sol
@@ -2,71 +2,71 @@
 pragma solidity 0.8.20;
 
 abstract contract SepoliaContracts {
-  address public SystemCoin_Address = 0x0006d00Ae8375BDb0b10fBb100490CD5504fD802;
-  address public ProtocolToken_Address = 0x000e59706a2d1151721F5ef09ad311985d4267f9;
-  address public ChainlinkRelayerFactory_Address = 0x4aEC83896c73238d9Cbc4A31c9155123Ca18217D;
-  address public DenominatedOracleFactory_Address = 0x6C64026E3262550754da734Cf62251fcdE3d38c1;
-  address public DelayedOracleFactory_Address = 0x41350d74d0c1809f36e0a7ef72c25a7DdB8Cc2Ba;
-  address public MintableVoteERC20_Address = 0x53865560cfA2d952F255Dd7d5c61C49C350a25Fd;
-  address public MintableERC20_WSTETH_Address = 0x28708a74510BB214B685FfB371d593c51F597fC3;
-  address public MintableERC20_CBETH_Address = 0xD2079b64b5858A4981675916a0d96B1e4A1495Ea;
-  address public MintableERC20_RETH_Address = 0x9b1f544DCE4692A0B157bE6B9F20f1909899fFDB;
-  address public ChainlinkRelayerChild_8_Address = 0x065Be96A46AE20946C405F02B6640b4def032b81;
-  address public DenominatedOracleChild_10_Address = 0xCB59bC24949AFf7F2CDcDf14b3c3ecb3De01bF5e;
-  address public DenominatedOracleChild_12_Address = 0x1f4E4480c9D80474FB181111F32ba778152A20Ab;
-  address public DelayedOracleChild_ARB_Address = 0x1a0Ecc72daC5D15B1Ba001D3bE76f083aF2EFfA7;
-  address public DelayedOracleChild_WSTETH_Address = 0xf9CbA6CD1b846fec6a971a2E017D8EfD8bF975A1;
-  address public DelayedOracleChild_CBETH_Address = 0x2C13451a49c0F8506bEe5f421182683604efb55c;
-  address public DelayedOracleChild_RETH_Address = 0xb564af73D71b7a0C7422b0D42F3d789b433e377B;
-  address public TimelockController_Address = 0xB052d23F4Ffb146e48318b97fe9903b9e6D0ddC3;
-  address public ODGovernor_Address = 0xA5DC5C86212cF22167c52b756363B0FeA7B6e591;
-  address public SAFEEngine_Address = 0x1f5a89FD455FD216B34C406a643B963fe5ceA590;
-  address public OracleRelayer_Address = 0xf4dcD9000922b42854E7fE54F3E2a2DC22Cc6Ed5;
-  address public SurplusAuctionHouse_Address = 0x59F7e0B28A9a5F1c19c186Db696d4D7ADCac806F;
-  address public DebtAuctionHouse_Address = 0x0905014Fe6C74e691c2cd00e0f1F8c4561D629C8;
-  address public AccountingEngine_Address = 0xCcb14A69Eae9eA51F16D7C602c621303Af1Fbc22;
-  address public LiquidationEngine_Address = 0xd744ba2BAd75FC1674b99D40c0A2B5fBDDB835D4;
-  address public CollateralAuctionHouseFactory_Address = 0x45C9D97AcA464162C4499527AD20683dE47a3dE9;
-  address public CoinJoin_Address = 0xc72E00bbce6E76bb48e44B0F1BC92D5f15a5af73;
-  address public CollateralJoinFactory_Address = 0x0B1F7a0d2F71452a21E2805042E56Ae28ce755aC;
-  address public TaxCollector_Address = 0x6CB85048caaA1d670Ad4AFa18d3c3de1C45b0C74;
-  address public StabilityFeeTreasury_Address = 0xa385Eb5603FD0d8223a66520EEfA366cD987ff40;
-  address public GlobalSettlement_Address = 0x8B777768Eba27f1161b1573d8A5e7334f4714a5A;
-  address public PostSettlementSurplusAuctionHouse_Address = 0x2e83b2836766479d1E0Fe56B42A5988e85E0C4d7;
-  address public SettlementSurplusAuctioneer_Address = 0x4120291384d23dC591Df57a591AB7055923BfAf0;
-  address public PIDController_Address = 0x2241ed6EA90FFd6fad2e586FF630A52c4020E340;
-  address public PIDRateSetter_Address = 0xAa39DD9cFfB9984A8ab5Ae3daeE1770Ef07Afd98;
-  address public AccountingJob_Address = 0xfbC2F8ff792B924644CFE88cf75E6373c93c0186;
-  address public LiquidationJob_Address = 0x8E1Ce955669121ac719107660EA17505AD1Dba34;
-  address public OracleJob_Address = 0xF1c6949E650b3b644e9B297A7f8472A23f52803B;
+  address public SystemCoin_Address = 0x62CB71630E86c739206fa8c41E74Cf3292A56FBD;
+  address public Vault721_Address = 0x05AC7e3ac152012B980407dEff2655c209667E4c;
+  address public ProtocolToken_Address = 0xbbB4f37c787C6ecb0b6b5Fb3F73221aA22fabA70;
+  address public TimelockController_Address = 0xC1b1A32Cb29E441A1a16cC1120aF47f2787D5000;
+  address public ODGovernor_Address = 0xA98b762fE463477B05AC13c7af3384BbA81D5CF3;
+  address public ChainlinkRelayerFactory_Address = 0x555691C860015a5CE8748296fbbAa624410F55A4;
+  address public DenominatedOracleFactory_Address = 0xD18Ce4d87Bf1E8a959F9F9eC2dB5A8D639408580;
+  address public DelayedOracleFactory_Address = 0x500E234652Ee1a8b06F99599Ae7d5299527270fB;
+  address public MintableVoteERC20_ARB_Address = 0x3018EC2AD556f28d2c0665d10b55ebfa469fD749;
+  address public MintableERC20_WSTETH_Address = 0x8c12A21C8D62d794f78E02aE9e377Abee4750E87;
+  address public MintableERC20_CBETH_Address = 0x738f310D6a2E963BddCad7B94cF47F4238641f8e;
+  address public MintableERC20_RETH_Address = 0x10f09B7d671378a5E85C64B49213F50513FA7343;
+  address public ChainlinkRelayerChild_8_Address = 0x781Ce75aC5307E460280281113Fb842CE8f44dD8;
+  address public DenominatedOracleChild_ARB_Address = 0x7f65502c518a75faDDF58981899F60023192aE1c;
+  address public DenominatedOracleChild_RETH_Address = 0x0Ba27Dd96330A763Bd538e45Df58eD0F2CcF30f6;
+  address public DelayedOracleChild_ARB_Address = 0x4A7e58f0Ee271189eb6eea37049f539890e5ec3f;
+  address public DelayedOracleChild_WSTETH_Address = 0xD87806BE73a410A4c4CF6b1639d6E97b9403AB18;
+  address public DelayedOracleChild_CBETH_Address = 0x62c1551060DEC04216d40cd1A2c70B27b18D3841;
+  address public DelayedOracleChild_RETH_Address = 0x648E36ede1B8315c4f0e9d02FBE521B5be7c1dBd;
+  address public SAFEEngine_Address = 0x2C3C51Eed16F6eAe6CF2607fFF5753dE6cc48Aa5;
+  address public OracleRelayer_Address = 0xf52b9fC4e4A16cc1142d3aC7eA985Aa57DA4d9B3;
+  address public SurplusAuctionHouse_Address = 0xB9fCb46313A76718b20b07C03b76cc606841ea9f;
+  address public DebtAuctionHouse_Address = 0x72C97B46036Eea6c1Bf019a945E776e9e9021a09;
+  address public AccountingEngine_Address = 0x3cEA7089C4A4a30084f735673F0b14F5699D70a5;
+  address public LiquidationEngine_Address = 0xBac6C44596EB176205BCf5149ea87D430515B828;
+  address public CollateralAuctionHouseFactory_Address = 0x5C95C7aebB8A84869EA0E8528C35BCb0725A3024;
+  address public CoinJoin_Address = 0x5afdAd856c7CE87c1dE029aA8f68eeD1bC960e79;
+  address public CollateralJoinFactory_Address = 0x174C33ED9CCA1F2a27Af7B6B6f2d3246a75eB8be;
+  address public TaxCollector_Address = 0x69f01E76365B28eB3eb4B6e7134BF8dCb1057F21;
+  address public StabilityFeeTreasury_Address = 0x40d322030606fEa2bEB177c6d72d85c96744CBc6;
+  address public GlobalSettlement_Address = 0xdb27222024d1AfcB826397d2542812bA5D427f6D;
+  address public PostSettlementSurplusAuctionHouse_Address = 0x265FDFE7e8673218B35DD35DEd44140931109572;
+  address public SettlementSurplusAuctioneer_Address = 0x723eF642790d81cF74848550A610e4799CAa902f;
+  address public PIDController_Address = 0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a;
+  address public PIDRateSetter_Address = 0x9FdAc43F459d79A947C47E834e9b50633eB836Ab;
+  address public AccountingJob_Address = 0x128F762a6Ed975D13E4862Aa43184A600f87f093;
+  address public LiquidationJob_Address = 0x25Ab28fF1CDaC3e6d5Ab1BdE0474c36c2b85e4bf;
+  address public OracleJob_Address = 0xA8335E371c392B3d4AEA3761AEEC3C6bED5Ce736;
   address public CollateralJoinChild_0x4152420000000000000000000000000000000000000000000000000000000000_Address =
-    0xAf8F2CE440509279645e8747c0DBc2700ce0559F;
+    0x9BFdc8b1203D68555805Ee876b5Ac7C12194f07a;
   address public
     CollateralAuctionHouseChild_0x4152420000000000000000000000000000000000000000000000000000000000_Address =
-      0x1C788DD757060ee01aF63C772aA2eB58b60152aE;
+      0xa9666259123536e9f48c3E3902Cc6BB60581F135;
   address public CollateralJoinChild_0x5753544554480000000000000000000000000000000000000000000000000000_Address =
-    0x64d50121A7CC5E5FC7D7A3b8a989882b3a130a14;
+    0x47AB26bd297ee35E7f24E25a23BD9115fd08dbFA;
   address public
     CollateralAuctionHouseChild_0x5753544554480000000000000000000000000000000000000000000000000000_Address =
-      0xfF5C82f097ec061AEb381987E55c0789e079EaD5;
+      0xEFc43eB2ad013fcc45b6d838F58005BdB861B72b;
   address public CollateralJoinChild_0x4342455448000000000000000000000000000000000000000000000000000000_Address =
-    0x1163D5a95AdBCe8b790A6e2a3de1737bE3C101CC;
+    0xfED5d80C383632eD86A728597818418C32B96760;
   address public
     CollateralAuctionHouseChild_0x4342455448000000000000000000000000000000000000000000000000000000_Address =
-      0x802e5bdd6A55F9aF350d3CbF5468Ee5232fD4736;
+      0x754CaEa5a5863a9ee644Ee236662F0D7dD6F4Ed3;
   address public CollateralJoinChild_0x5245544800000000000000000000000000000000000000000000000000000000_Address =
-    0x8fF16f9f510f699fe1D9ae9778185557c59378e8;
+    0xEAEd61cDA9a1F6eCF2d71b1554172DC64B757B30;
   address public
     CollateralAuctionHouseChild_0x5245544800000000000000000000000000000000000000000000000000000000_Address =
-      0x5ff631684f3dcF6430764C002b7184b9757C814c;
-  address public Vault721_Address = 0x00024F3c588d9a1c11Be800637b43E0C88befF1A;
-  address public ODSafeManager_Address = 0xea1bF408bF3f29C4787712E67390552163a465f3;
-  address public NFTRenderer_Address = 0xAbAfb6e349354A1897E385A46DF01eC6c945730D;
-  address public BasicActions_Address = 0x4e8a80c3A8bDD1BD1e7a85ad31b7adfC347cBF12;
-  address public DebtBidActions_Address = 0x51905778Af208271a6Cb817617C21ACa961C3B20;
-  address public SurplusBidActions_Address = 0x3DE22DE876C56011c3Ffa6139f089138e34bB538;
-  address public CollateralBidActions_Address = 0x696C34Dfcc907e93cbAb4924126664E79b0b155c;
-  address public PostSettlementSurplusBidActions_Address = 0x8c6A844c3adCe310B7502C137eb1Ad4B9B0dDced;
-  address public GlobalSettlementActions_Address = 0x555b26c14eB5Fbc6483E1A749DAF470520de1991;
-  address public RewardedActions_Address = 0xc9c31849a7f32885A0f1BDE98ec9181F06198CfD;
+      0x8c8C4ECF299F3f737EECA58c4479469B83473244;
+  address public ODSafeManager_Address = 0x518108913eE727745c3cF103fc451F9C39267FC0;
+  address public NFTRenderer_Address = 0x8eCdCF2e917E5D380820b6f8D49782B51630fE8F;
+  address public BasicActions_Address = 0xf22bB5BF9CD210Ff20dF43Bda1A26221DE872AC4;
+  address public DebtBidActions_Address = 0x26fAfdDcCF893a3a24a9E06D7ba5E62d3bbAE1Be;
+  address public SurplusBidActions_Address = 0x94B4046BE898a53A9ea97EbB83C3954BA0d70A3A;
+  address public CollateralBidActions_Address = 0x75Eb82c9DF4EE6a99E7ca8967C0B1f7D6594c54E;
+  address public PostSettlementSurplusBidActions_Address = 0xd7da4ED8f22A138417D16228FB432579AD00f2A0;
+  address public GlobalSettlementActions_Address = 0x97a140f7b81B1cB87a47582562c43b54461a6484;
+  address public RewardedActions_Address = 0x7b34c557C7b2f56471071AbED88893b1fB04A140;
 }
diff --git a/script/SepoliaDeployment.s.sol b/script/SepoliaDeployment.s.sol
@@ -22,7 +22,7 @@ abstract contract SepoliaDeployment is Contracts, SepoliaParams, SepoliaContract
     delegatee[ARB] = governor;
 
     // --- ERC20s ---
-    collateral[ARB] = IERC20Metadata(address(MintableVoteERC20_Address));
+    collateral[ARB] = IERC20Metadata(address(MintableVoteERC20_ARB_Address));
     collateral[WSTETH] = IERC20Metadata(MintableERC20_WSTETH_Address);
     collateral[CBETH] = IERC20Metadata(MintableERC20_CBETH_Address);
     collateral[RETH] = IERC20Metadata(MintableERC20_RETH_Address);

diff --git a/tasks/parseAnvilDeployments.js b/tasks/parseAnvilDeployments.js
@@ -45,9 +45,9 @@ fs.readFile(filePath, "utf8", (err, data) => {
             curr.contractName.includes("DelayedOracleFactory")
           ) {
             name = "DelayedOracleChild" + "_" + index;
-          } else if (  curr.contractName.includes("DenominatedOracleFactory") ){
+          } else if (curr.contractName.includes("DenominatedOracleFactory")) {
             name = "DenominatedOracleChild" + "_" + index;
-          } else if( curr.contractName.includes("RelayerFactory") ){
+          } else if (curr.contractName.includes("RelayerFactory")) {
             name = "RelayerChild" + "_" + index;
           }
 
@@ -66,14 +66,14 @@ const createAnvilDeploymentsFile = (contracts) => {
   const addressText = Object.keys(contracts).reduce((acc, curr) => {
     acc += `  address public ${curr}_Address = ${contracts[curr]};\n`;
     return acc;
-  }, ""); 
+  }, "");
 
   const outputPath = path.join(
     __dirname,
     "../script/anvil/deployment/AnvilContracts.t.sol"
   );
   const content = `// SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.19;
+pragma solidity 0.8.20;
 
 abstract contract AnvilContracts {
 ${addressText}}

diff --git a/tasks/parseSepoliaDeployments.js b/tasks/parseSepoliaDeployments.js
@@ -14,7 +14,7 @@ fs.readFile(filePath, "utf8", (err, data) => {
     if (contractAddress && contractName && transactionType === "CREATE") {
       // Protocol contracts
       let name = contractName;
-      if (contractName === "MintableERC20") {
+      if (["MintableERC20", "MintableVoteERC20"].includes(contractName)) {
         const tokenSymbolArg = curr.arguments[1].toUpperCase();
         name = name + "_" + tokenSymbolArg.replaceAll('"', "");
       }
@@ -60,7 +60,7 @@ const createSepoliaDeploymentsFile = (contracts) => {
 
   const outputPath = path.join(__dirname, "../script/SepoliaContracts.s.sol");
   const content = `// SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.19;
+pragma solidity 0.8.20;
 
 abstract contract SepoliaContracts {
 ${addressText}}