Merge remote-tracking branch 'origin/feat/sr-1.5' into feat/sr-1.5-de…

…velop-sync # Conflicts: # deployed-holesky.json # deployed-mainnet.json # test/0.8.9/oracle/hashConsensus.setQuorum.test.ts
lidofinance · Nov 7, 2024 · a9eacbd · a9eacbd
2 parents 4169110 + 737b675
commit a9eacbd
Show file tree

Hide file tree

Showing 5 changed files with 772 additions and 65 deletions.
diff --git a/deployed-holesky.json b/deployed-holesky.json
@@ -14,7 +14,7 @@
     },
     "implementation": {
       "contract": "contracts/0.8.9/oracle/AccountingOracle.sol",
-      "address": "0x6AcA050709469F1f98d8f40f68b1C83B533cd2b2",
+      "address": "0x748CE008ac6b15634ceD5a6083796f75695052a2",
       "constructorArgs": [
         "0x28FAB2059C713A7F9D8c86Db49f9bb0e96Af1ef8",
         "0x3F1c547b21f65e10480dE3ad8E19fAAC46C95034",
@@ -133,7 +133,7 @@
   "app:node-operators-registry": {
     "implementation": {
       "contract": "contracts/0.4.24/nos/NodeOperatorsRegistry.sol",
-      "address": "0xE0270CF2564d81E02284e16539F59C1B5a4718fE",
+      "address": "0x605A3AFadF35A8a8fa4f4Cd4fe34a09Bbcea7718",
       "constructorArgs": []
     },
     "aragonApp": {
@@ -175,22 +175,22 @@
   "app:simple-dvt": {
     "stakingRouterModuleParams": {
       "moduleName": "SimpleDVT",
-      "moduleType": "curated-onchain-v1",
+      "moduleType": "simple-dvt-onchain-v1",
       "targetShare": 50,
       "moduleFee": 800,
       "treasuryFee": 200,
       "penaltyDelay": 86400,
-      "easyTrackTrustedCaller": "0xD76001b33b23452243E2FDa833B6e7B8E3D43198",
       "easyTrackAddress": "0x1763b9ED3586B08AE796c7787811a2E1bc16163a",
+      "easyTrackEVMScriptExecutor": "0x2819B65021E13CEEB9AC33E77DB32c7e64e7520D",
       "easyTrackFactories": {
-        "AddNodeOperators": "0xeF5233A5bbF243149E35B353A73FFa8931FDA02b",
-        "ActivateNodeOperators": "0x5b4A9048176D5bA182ceec8e673D8aA6927A40D6",
-        "DeactivateNodeOperators": "0x88d247cdf4ff4A4AAA8B3DD9dd22D1b89219FB3B",
-        "SetVettedValidatorsLimits": "0x30Cb36DBb0596aD9Cf5159BD2c4B1456c18e47E8",
-        "SetNodeOperatorNames": "0x4792BaC0a262200fA7d3b68e7622bFc1c2c3a72d",
-        "SetNodeOperatorRewardAddresses": "0x6Bfc576018C7f3D2a9180974E5c8e6CFa021f617",
-        "UpdateTargetValidatorLimits": "0xC91a676A69Eb49be9ECa1954fE6fc861AE07A9A2",
-        "ChangeNodeOperatorManagers": "0xb8C4728bc0826bA5864D02FA53148de7A44C2f7E"
+        "AddNodeOperators": "0xC20129f1dd4DFeD023a6d6A8de9d54A7b61af5CC",
+        "ActivateNodeOperators": "0x08c48Fef9Cadca882E27d2325D1785858D5c1aE3",
+        "DeactivateNodeOperators": "0xf5436129Cf9d8fa2a1cb6e591347155276550635",
+        "SetNodeOperatorNames": "0xb6a31141A579FCB540E3BB3504C58F1e6F5f543a",
+        "SetNodeOperatorRewardAddresses": "0x7F9c5b838510e06b85DD146e71553EB7890fAf2e",
+        "UpdateTargetValidatorLimits": "0x6e570D487aE5729Bd982A7bb3a7bfA5213AeAEdE",
+        "SetVettedValidatorsLimits": "0xD420d6C8aA81c087829A64Ce59936b7C1176A81a",
+        "TransferNodeOperatorManager": "0xaa49cF620e3f80Ce72D3A7668b1b4f3dF370D2C7"
       }
     },
     "aragonApp": {
@@ -207,13 +207,11 @@
         "0x"
       ]
     },
-    "fullName": "simple-dvt.lidopm.eth",
-    "name": "simple-dvt",
-    "id": "0xe1635b63b5f7b5e545f2a637558a4029dea7905361a2f0fc28c66e9136cf86a4",
-    "ipfsCid": "QmaSSujHCGcnFuetAPGwVW5BegaMBvn5SCsgi3LSfvraSo",
-    "contentURI": "0x697066733a516d615353756a484347636e4675657441504777565735426567614d42766e355343736769334c5366767261536f",
-    "implementation": "0xE0270CF2564d81E02284e16539F59C1B5a4718fE",
-    "contract": "NodeOperatorsRegistry"
+    "implementation": {
+      "contract": "contracts/0.4.24/nos/NodeOperatorsRegistry.sol",
+      "address": "0x605A3AFadF35A8a8fa4f4Cd4fe34a09Bbcea7718",
+      "constructorArgs": []
+    }
   },
   "aragon-acl": {
     "implementation": {
@@ -414,7 +412,7 @@
     "slotsPerEpoch": 32,
     "secondsPerSlot": 12,
     "genesisTime": 1695902400,
-    "depositContract": "0x4242424242424242424242424242424242424242"
+    "depositContractAddress": "0x4242424242424242424242424242424242424242"
   },
   "createAppReposTx": "0xd8a9b10e16b5e75b984c90154a9cb51fbb06bf560a3c424e2e7ad81951008502",
   "daoAragonId": "lido-dao",
@@ -450,14 +448,13 @@
       "pauseIntentValidityPeriodBlocks": 6646
     },
     "contract": "contracts/0.8.9/DepositSecurityModule.sol",
-    "address": "0x045dd46212A178428c088573A7d102B9d89a022A",
+    "address": "0x808DE3b26Be9438F12E9B45528955EA94C17f217",
     "constructorArgs": [
       "0x3F1c547b21f65e10480dE3ad8E19fAAC46C95034",
       "0x4242424242424242424242424242424242424242",
       "0xd6EbF043D30A7fe46D1Db32BA90a0A51207FE229",
-      150,
-      5,
-      6646
+      6646,
+      200
     ]
   },
   "dummyEmptyContract": {
@@ -562,15 +559,15 @@
     },
     "implementation": {
       "contract": "contracts/0.8.9/LidoLocator.sol",
-      "address": "0xDba5Ad530425bb1b14EECD76F1b4a517780de537",
+      "address": "0xab89ED3D8f31bcF8BB7De53F02084d1e6F043D34",
       "constructorArgs": [
         [
           "0x4E97A3972ce8511D87F334dA17a2C332542a5246",
-          "0x045dd46212A178428c088573A7d102B9d89a022A",
+          "0x808DE3b26Be9438F12E9B45528955EA94C17f217",
           "0xE73a3602b99f1f913e72F8bdcBC235e206794Ac8",
           "0x072f72BE3AcFE2c52715829F2CD9061A6C8fF019",
           "0x3F1c547b21f65e10480dE3ad8E19fAAC46C95034",
-          "0xF0d576c7d934bBeCc68FE15F1c5DAF98ea2B78bb",
+          "0xd7C870777e08325Ad0A3A85F41E66E7D84B63E4f",
           "0x072f72BE3AcFE2c52715829F2CD9061A6C8fF019",
           "0x4E46BD7147ccf666E1d73A3A456fC7a68de82eCA",
           "0xd6EbF043D30A7fe46D1Db32BA90a0A51207FE229",
@@ -598,6 +595,11 @@
   },
   "lidoTemplateCreateStdAppReposTx": "0x3f5b8918667bd3e971606a54a907798720158587df355a54ce07c0d0f9750d3c",
   "lidoTemplateNewDaoTx": "0x3346246f09f91ffbc260b6c300b11ababce9f5ca54d7880a277860961f343112",
+  "minFirstAllocationStrategy": {
+    "contract": "contracts/common/lib/MinFirstAllocationStrategy.sol",
+    "address": "0xf95A8103E6d83B4437Ad20454F86a75ecf1E32Ef",
+    "constructorArgs": []
+  },
   "miniMeTokenFactoryAddress": "0x15ef666c9620C0f606Ba35De2aF668fe987E26ae",
   "miniMeTokenFactoryConstructorArgs": [],
   "networkId": 17000,
@@ -637,14 +639,15 @@
       "maxPositiveTokenRebase": 5000000
     },
     "contract": "contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol",
-    "address": "0xF0d576c7d934bBeCc68FE15F1c5DAF98ea2B78bb",
+    "address": "0xd7C870777e08325Ad0A3A85F41E66E7D84B63E4f",
     "constructorArgs": [
       "0x28FAB2059C713A7F9D8c86Db49f9bb0e96Af1ef8",
-      "0x22896Bfc68814BFD855b1a167255eE497006e730",
-      [1500, 500, 1000, 250, 2000, 100, 100, 128, 5000000],
-      [[], [], [], [], [], [], [], [], [], []]
+      "0xE92329EC7ddB11D25e25b3c21eeBf11f15eB325d",
+      [9000, 500, 1000, 50, 600, 8, 62, 7680, 750000, 43200],
+      [[], [], [], [], [], [], [], [], [], [], []]
     ]
   },
+  "scratchDeployGasUsed": "20484707",
   "stakingRouter": {
     "proxy": {
       "contract": "contracts/0.8.9/proxy/OssifiableProxy.sol",
@@ -657,7 +660,7 @@
     },
     "implementation": {
       "contract": "contracts/0.8.9/StakingRouter.sol",
-      "address": "0x32f236423928c2c138F46351D9E5FD26331B1aa4",
+      "address": "0x9b5890E950E3Df487Bb64E0A6743cdE791139152",
       "constructorArgs": ["0x4242424242424242424242424242424242424242"]
     }
   },

diff --git a/deployed-mainnet.json b/deployed-mainnet.json
@@ -14,9 +14,8 @@
       ]
     },
     "implementation": {
-      "address": "0xF3c5E0A67f32CF1dc07a8817590efa102079a1aF",
       "contract": "contracts/0.8.9/oracle/AccountingOracle.sol",
-      "deployTx": "0x3e27627d3ed236aff8901df187196e9682187dfd0d259c5d5811a6e923436083",
+      "address": "0x0e65898527E77210fB0133D00dd4C0E86Dc29bC7",
       "constructorArgs": [
         "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb",
         "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
@@ -114,14 +113,9 @@
       "address": "0x55032650b14df07b85bF18A3a3eC8E0Af2e028d5"
     },
     "implementation": {
-      "address": "0x8538930c385C0438A357d2c25CB3eAD95Ab6D8ed",
       "contract": "contracts/0.4.24/nos/NodeOperatorsRegistry.sol",
-      "deployTx": "0xbec5b6ffb8fbc775a183e25cd285367993d7201752e1638a07abec8962bab750",
-      "constructorArgs": [],
-      "deployParameters": {
-        "stakingModuleTypeId": "curated-onchain-v1",
-        "stuckPenaltyDelay": "432000"
-      }
+      "address": "0x1770044a38402e3CfCa2Fcfa0C84a093c9B42135",
+      "constructorArgs": []
     },
     "aragonApp": {
       "fullName": "node-operators-registry.lidopm.eth",
@@ -187,15 +181,18 @@
       ]
     },
     "implementation": {
-      "address": "0x8538930c385C0438A357d2c25CB3eAD95Ab6D8ed",
-      "contract": "contracts/0.4.24/nos/NodeOperatorsRegistry.sol"
+      "contract": "contracts/0.4.24/nos/NodeOperatorsRegistry.sol",
+      "address": "0x1770044a38402e3CfCa2Fcfa0C84a093c9B42135",
+      "constructorArgs": []
     }
   },
   "aragon-kernel": {
     "implementation": {
       "contract": "@aragon/os/contracts/kernel/Kernel.sol",
       "address": "0x2b33CF282f867A7FF693A66e11B0FcC5552e4425",
-      "constructorArgs": [true]
+      "constructorArgs": [
+        true
+      ]
     },
     "proxy": {
       "address": "0xb8FFC3Cd6e7Cf5a098A1c92F48009765B24088Dc",
@@ -249,16 +246,15 @@
   "deployCommit": "e45c4d6fb8120fd29426b8d969c19d8a798ca974",
   "deployer": "0x55Bc991b2edF3DDb4c520B222bE4F378418ff0fA",
   "depositSecurityModule": {
-    "address": "0xC77F8768774E1c9244BEed705C4354f2113CFc09",
+    "address": "0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD",
     "contract": "contracts/0.8.9/DepositSecurityModule.sol",
     "deployTx": "0x21307a2321f167f99de11ccec86d7bdd8233481bbffa493e15c519ca8d662c4f",
     "constructorArgs": [
       "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
       "0x00000000219ab540356cBB839Cbe05303d7705Fa",
       "0xFdDf38947aFB03C621C71b06C9C70bce73f12999",
-      150,
-      25,
-      6646
+      6646,
+      200
     ],
     "deployParameters": {
       "maxDepositsPerBlock": 150,
@@ -276,7 +272,9 @@
     "address": "0x8F73e4C2A6D852bb4ab2A45E6a9CF5715b3228B7",
     "contract": "contracts/0.8.9/EIP712StETH.sol",
     "deployTx": "0xecb5010620fb13b0e2bbc98b8a0c82de0d7385491452cd36cf303cd74216ed91",
-    "constructorArgs": ["0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"]
+    "constructorArgs": [
+      "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+    ]
   },
   "ensAddress": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
   "executionLayerRewardsVault": {
@@ -339,18 +337,17 @@
       ]
     },
     "implementation": {
-      "address": "0x1D920cc5bACf7eE506a271a5259f2417CaDeCE1d",
       "contract": "contracts/0.8.9/LidoLocator.sol",
-      "deployTx": "0xf90012ef0a40e47c909ab3a5b3503ecee78f6a9be134d1349a742e500d37ae33",
+      "address": "0x3ABc4764f0237923d52056CFba7E9AEBf87113D3",
       "constructorArgs": [
         [
           "0x852deD011285fe67063a08005c71a85690503Cee",
-          "0xC77F8768774E1c9244BEed705C4354f2113CFc09",
+          "0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD",
           "0x388C818CA8B9251b393131C08a736A67ccB19297",
           "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
           "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-          "0x9305c1Dbfe22c12c66339184C0025d7006f0f1cC",
-          "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
+          "0x6232397ebac4f5772e53285B26c47914E9461E75",
+          "0xe6793B9e4FbA7DE0ee833F9D02bba7DB5EB27823",
           "0xD15a672319Cf0352560eE76d9e89eAB0889046D3",
           "0xFdDf38947aFB03C621C71b06C9C70bce73f12999",
           "0x3e40D73EB977Dc6a537aF587D48316feE66E9C8c",
@@ -375,14 +372,22 @@
       "0xa0BC4B67F5FacDE4E50EAFF48691Cfc43F4E280A"
     ]
   },
+  "minFirstAllocationStrategy": {
+    "contract": "contracts/common/lib/MinFirstAllocationStrategy.sol",
+    "address": "0x7e70De6D1877B3711b2bEDa7BA00013C7142d993",
+    "constructorArgs": []
+  },
   "miniMeTokenFactoryAddress": "0x909d05f384d0663ed4be59863815ab43b4f347ec",
   "networkId": 1,
   "newDaoTx": "0x3feabd79e8549ad68d1827c074fa7123815c80206498946293d5373a160fd866",
   "oracleDaemonConfig": {
     "address": "0xbf05A929c3D7885a6aeAd833a992dA6E5ac23b09",
     "contract": "contracts/0.8.9/OracleDaemonConfig.sol",
     "deployTx": "0xa4f380b8806f5a504ef67fce62989e09be5a48bf114af63483c01c22f0c9a36f",
-    "constructorArgs": ["0x8Ea83AD72396f1E0cD2f8E72b1461db8Eb6aF7B5", []],
+    "constructorArgs": [
+      "0x8Ea83AD72396f1E0cD2f8E72b1461db8Eb6aF7B5",
+      []
+    ],
     "deployParameters": {
       "NORMALIZED_CL_REWARD_PER_EPOCH": 64,
       "NORMALIZED_CL_REWARD_MISTAKE_RATE_BP": 1000,
@@ -396,14 +401,26 @@
     }
   },
   "oracleReportSanityChecker": {
-    "address": "0x9305c1Dbfe22c12c66339184C0025d7006f0f1cC",
+    "address": "0x6232397ebac4f5772e53285B26c47914E9461E75",
     "contract": "contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol",
     "deployTx": "0x700c83996ad7deefda286044280ad86108dfef9c880909bd8e75a3746f7d631c",
     "constructorArgs": [
       "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb",
       "0x3e40D73EB977Dc6a537aF587D48316feE66E9C8c",
-      [20000, 500, 1000, 50, 600, 2, 100, 7680, 750000],
-      [[], [], [], [], [], [], [], [], [], []]
+      [
+        9000,
+        43200,
+        1000,
+        50,
+        600,
+        8,
+        24,
+        7680,
+        750000,
+        1000,
+        101,
+        50
+      ]
     ],
     "deployParameters": {
       "churnValidatorsPerDayLimit": 20000,
@@ -429,10 +446,11 @@
       ]
     },
     "implementation": {
-      "address": "0xD8784e748f59Ba711fB5643191Ec3fAdD50Fb6df",
       "contract": "contracts/0.8.9/StakingRouter.sol",
-      "deployTx": "0xd6d489f22203c835da6027ff0e532a01a08f36f0fda6c7c0a42e471ae3b3c461",
-      "constructorArgs": ["0x00000000219ab540356cBB839Cbe05303d7705Fa"]
+      "address": "0x89eDa99C0551d4320b56F82DDE8dF2f8D2eF81aA",
+      "constructorArgs": [
+        "0x00000000219ab540356cBB839Cbe05303d7705Fa"
+      ]
     }
   },
   "validatorsExitBusOracle": {
@@ -450,7 +468,11 @@
       "address": "0xA89Ea51FddE660f67d1850e03C9c9862d33Bc42c",
       "contract": "contracts/0.8.9/oracle/ValidatorsExitBusOracle.sol",
       "deployTx": "0x5ab545276f78a72a432c3e971c96384973abfab6394e08cb077a006c25aef7a7",
-      "constructorArgs": [12, 1606824023, "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb"],
+      "constructorArgs": [
+        12,
+        1606824023,
+        "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb"
+      ],
       "deployParameters": {
         "consensusVersion": 1
       }
@@ -540,7 +562,11 @@
       "address": "0xE42C659Dc09109566720EA8b2De186c2Be7D94D9",
       "contract": "contracts/0.8.9/WithdrawalQueueERC721.sol",
       "deployTx": "0x6ab0151735c01acdef518421358d41a08752169bc383c57d57f5bfa135ac6eb1",
-      "constructorArgs": ["0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", "Lido: stETH Withdrawal NFT", "unstETH"],
+      "constructorArgs": [
+        "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
+        "Lido: stETH Withdrawal NFT",
+        "unstETH"
+      ],
       "deployParameters": {
         "name": "Lido: stETH Withdrawal NFT",
         "symbol": "unstETH"
@@ -555,13 +581,18 @@
       "address": "0xCC52f17756C04bBa7E377716d7062fC36D7f69Fd",
       "contract": "contracts/0.8.9/WithdrawalVault.sol",
       "deployTx": "0xd9eb2eca684770e4d2b192709b6071875f75072a0ce794a582824ee907a704f3",
-      "constructorArgs": ["0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84", "0x3e40D73EB977Dc6a537aF587D48316feE66E9C8c"]
+      "constructorArgs": [
+        "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+        "0x3e40D73EB977Dc6a537aF587D48316feE66E9C8c"
+      ]
     }
   },
   "wstETH": {
     "address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
     "contract": "contracts/0.6.12/WstETH.sol",
     "deployTx": "0xaf2c1a501d2b290ef1e84ddcfc7beb3406f8ece2c46dee14e212e8233654ff05",
-    "constructorArgs": ["0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"]
+    "constructorArgs": [
+      "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+    ]
   }
 }