Skip to content

N
nebula
Commit d7089f9d authored by smartcontracts's avatar smartcontracts Committed by Adrian Sutton
Browse files
Options

feat: contract versions for fp fixes (#295)

parent 3dff3bc7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 143 deletions
packages/contracts-bedrock/semver-lock.json
View file @ d7089f9d
......@@ -128,8 +128,8 @@
"sourceCodeHash": "0xbe200a6cb297a3ca1a7d174a9c886e3f17eb8edf617ad014a2ac4f6c2e2ac7f1"
},
"src/Safe/DeputyGuardianModule.sol": {
"initCodeHash": "0x23ecfc6ff42575058b51b3bde8449f62ee929fd5881f707a904fa3eb8f628053",
"sourceCodeHash": "0x904ff08bf288dc257501dc0a60539791c7a2dc5fba508a3523521c39009e7d5e"
"initCodeHash": "0x5e0e2089fa737bfeeeff66cb84f4c0a90cd42f9ef4d4814b4850094f48c2a391",
"sourceCodeHash": "0x6ad81146f59f35f17e1ea432e902de3ef6fc84a4aedcbe0593f5997af6835018"
},
"src/Safe/LivenessGuard.sol": {
"initCodeHash": "0xf54289de5cef7ba0044e0d63310937fa231d6528aac91e13e531c845af42afac",
......@@ -140,8 +140,8 @@
"sourceCodeHash": "0x3ff4a3f21202478935412d47fd5ef7f94a170402ddc50e5c062013ce5544c83f"
},
"src/cannon/MIPS.sol": {
"initCodeHash": "0x468236ddc5c995a086747da2a4197716a50ed54cb79378188e6e60e5a1e48d5e",
"sourceCodeHash": "0xcf8b9665b8ec1d940ecc7cdef9e32704f38015304b5dbb60447921024e1ceafe"
"initCodeHash": "0x826aa41a3f37c3ef6613be21eb9bb275bdf0a48d2196dffc56f494b68b32a156",
"sourceCodeHash": "0x10cd9132b6c9f45af6b7f11ccc50bb889c62105bdb556bc7fb4100b6136e37df"
},
"src/cannon/MIPS2.sol": {
"initCodeHash": "0xbb425bd1c3cad13a77f5c9676b577606e2f8f320687739f529b257a042f58d85",
......@@ -149,11 +149,11 @@
},
"src/cannon/PreimageOracle.sol": {
"initCodeHash": "0x967d730bb1b10a36ee625179734cccd6b6826ce480bad0419272663c460603bd",
"sourceCodeHash": "0xb1f0d6f26c2e6a2c3b635eaf8f327e91a8d22ef7479b1ebb93427b88f73ed163"
"sourceCodeHash": "0xa73ce9635a75395c09e00e383f0c9072308813971c8f0dffe445dd9310f7007a"
},
"src/dispute/AnchorStateRegistry.sol": {
"initCodeHash": "0x92aa16ad6c88b8c2842fea07ec69afe45e7d0dcb49cdfad7ce4693e03c3bbc47",
"sourceCodeHash": "0x0383f33a1cbf41ceb010a1bf79ddd14880f55c13512e4704f82d5587fff16826"
"initCodeHash": "0xe064c2d66f48d71a91db81a9f54ea819bc75f90e98efbd3efca1e460a16d8cc5",
"sourceCodeHash": "0xb01e484637783b0e4f1e0f20d073659c21ac8232442cc506886720b3ec736cd9"
},
"src/dispute/DisputeGameFactory.sol": {
"initCodeHash": "0x7a7cb8f2c95df2f9afb3ce9eaefe4a6f997ccce7ed8ffda5d425a65a2474a792",
......@@ -164,8 +164,8 @@
"sourceCodeHash": "0xea69f63d4df701e9dfb73b85692c9a62b8a5819b3f473889c9da3734131b9738"
},
"src/dispute/weth/DelayedWETH.sol": {
"initCodeHash": "0x8f9a5b50374331ad2fabe03a7ce28a0012bfaca5fa48ee917339c3eec39a319f",
"sourceCodeHash": "0x22cbcab45d46c3746e0ef6a7c39192ce85a21d0cabf055c2cc21796714f5c47f"
"initCodeHash": "0x305074302172657578c3fff485fb2115d608834a3c1447d9a957e4baf55a982c",
"sourceCodeHash": "0xb3a260564b82992fac71ad21be01ebe7eaae6855f66cafbd4a0b21f53853e17e"
},
"src/legacy/DeployerWhitelist.sol": {
"initCodeHash": "0x8de80fb23b26dd9d849f6328e56ea7c173cd9e9ce1f05c9beea559d1720deb3d",
......
packages/contracts-bedrock/src/Safe/DeputyGuardianModule.sol
View file @ d7089f9d
......@@ -45,8 +45,8 @@ contract DeputyGuardianModule is ISemver {
address internal immutable DEPUTY_GUARDIAN;
/// @notice Semantic version.
/// @custom:semver 2.0.0-beta.1
string public constant version = "2.0.0-beta.1";
/// @custom:semver 2.0.0
string public constant version = "2.0.0";
// Constructor to initialize the Safe and baseModule instances
constructor(Safe _safe, SuperchainConfig _superchainConfig, address _deputyGuardian) {
......
packages/contracts-bedrock/src/cannon/MIPS.sol
View file @ d7089f9d
......@@ -44,8 +44,8 @@ contract MIPS is ISemver {
}
/// @notice The semantic version of the MIPS contract.
/// @custom:semver 1.1.0-beta.7
string public constant version = "1.1.0-beta.7";
/// @custom:semver 1.1.0
string public constant version = "1.1.0";
/// @notice The preimage oracle contract.
IPreimageOracle internal immutable ORACLE;
......
packages/contracts-bedrock/src/cannon/PreimageOracle.sol
View file @ d7089f9d
......@@ -31,7 +31,7 @@ contract PreimageOracle is IPreimageOracle, ISemver {
uint256 public constant PRECOMPILE_CALL_RESERVED_GAS = 100_000;
/// @notice The semantic version of the Preimage Oracle contract.
/// @custom:semver 1.1.1
/// @custom:semver 1.1.2
string public constant version = "1.1.2";
////////////////////////////////////////////////////////////////
......
packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
View file @ d7089f9d
......@@ -27,8 +27,8 @@ contract AnchorStateRegistry is Initializable, IAnchorStateRegistry, ISemver {
}
/// @notice Semantic version.
/// @custom:semver 1.1.0-beta.1
string public constant version = "2.0.0-beta.1";
/// @custom:semver 2.0.0
string public constant version = "2.0.0";
/// @notice DisputeGameFactory address.
IDisputeGameFactory internal immutable DISPUTE_GAME_FACTORY;
......
packages/contracts-bedrock/src/dispute/weth/DelayedWETH.sol
View file @ d7089f9d
......@@ -21,8 +21,8 @@ import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
/// Not the prettiest contract in the world, but it gets the job done.
contract DelayedWETH is OwnableUpgradeable, WETH98, IDelayedWETH, ISemver {
/// @notice Semantic version.
/// @custom:semver 1.0.0
string public constant version = "1.0.0";
/// @custom:semver 1.1.0
string public constant version = "1.1.0";
/// @inheritdoc IDelayedWETH
mapping(address => mapping(address => WithdrawalRequest)) public withdrawals;
......
packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
View file @ d7089f9d
......@@ -13,9 +13,9 @@ contract DeploymentSummary is DeploymentSummaryCode {
Vm private constant vm = Vm(VM_ADDRESS);
address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
address internal constant anchorStateRegistryAddress = 0x18AdFeBA1BcE3eCa45E563944759E2d6eCaF7BA2;
address internal constant anchorStateRegistryAddress = 0x2d0983b9B70A282D344520a78CC3009bd0656aB4;
address internal constant anchorStateRegistryProxyAddress = 0x970670459734a83899773A0fd45941B5afC1200e;
address internal constant delayedWETHAddress = 0x90b505357aFad15A1fb8F1098B3295b7cfac1c24;
address internal constant delayedWETHAddress = 0x07F69b19532476c6Cd03056D6BC3F1b110Ab7538;
address internal constant delayedWETHProxyAddress = 0xEF179756ea6525AFade217cA5aB0b1b5CfE0fd92;
address internal constant disputeGameFactoryAddress = 0x20B168142354Cee65a32f6D8cf3033E592299765;
address internal constant disputeGameFactoryProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
......@@ -27,7 +27,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
address internal constant mipsAddress = 0x59272D1cd178Ee40F8a05AA6aEF87e9faeD718DC;
address internal constant mipsAddress = 0xaB5b145Bd477C9Bf42F3Ee3f0d988Abef3a27679;
address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;
......@@ -697,7 +697,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
value = hex"000000000000000000000000000000000000000000000000000000000000000e";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000090b505357afad15a1fb8f1098b3295b7cfac1c24";
value = hex"00000000000000000000000007f69b19532476c6cd03056d6bc3f1b110ab7538";
vm.store(delayedWETHProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......@@ -721,7 +721,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
value = hex"000000000000000000000000000000000000000000000000000000000000000f";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000090b505357afad15a1fb8f1098b3295b7cfac1c24";
value = hex"00000000000000000000000007f69b19532476c6cd03056d6bc3f1b110ab7538";
vm.store(permissionedDelayedWETHProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......@@ -745,7 +745,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
value = hex"0000000000000000000000000000000000000000000000000000000000000010";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000018adfeba1bce3eca45e563944759e2d6ecaf7ba2";
value = hex"0000000000000000000000002d0983b9b70a282d344520a78cc3009bd0656ab4";
vm.store(anchorStateRegistryProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......
packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol
View file @ d7089f9d
This source diff could not be displayed because it is too large. You can view the blob instead.
packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol
View file @ d7089f9d
......@@ -13,9 +13,9 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
Vm private constant vm = Vm(VM_ADDRESS);
address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
address internal constant anchorStateRegistryAddress = 0x18AdFeBA1BcE3eCa45E563944759E2d6eCaF7BA2;
address internal constant anchorStateRegistryAddress = 0x2d0983b9B70A282D344520a78CC3009bd0656aB4;
address internal constant anchorStateRegistryProxyAddress = 0x970670459734a83899773A0fd45941B5afC1200e;
address internal constant delayedWETHAddress = 0x90b505357aFad15A1fb8F1098B3295b7cfac1c24;
address internal constant delayedWETHAddress = 0x07F69b19532476c6Cd03056D6BC3F1b110Ab7538;
address internal constant delayedWETHProxyAddress = 0xEF179756ea6525AFade217cA5aB0b1b5CfE0fd92;
address internal constant disputeGameFactoryAddress = 0x20B168142354Cee65a32f6D8cf3033E592299765;
address internal constant disputeGameFactoryProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
......@@ -27,7 +27,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
address internal constant mipsAddress = 0x59272D1cd178Ee40F8a05AA6aEF87e9faeD718DC;
address internal constant mipsAddress = 0xaB5b145Bd477C9Bf42F3Ee3f0d988Abef3a27679;
address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;
......@@ -700,7 +700,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
value = hex"000000000000000000000000000000000000000000000000000000000000000e";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000090b505357afad15a1fb8f1098b3295b7cfac1c24";
value = hex"00000000000000000000000007f69b19532476c6cd03056d6bc3f1b110ab7538";
vm.store(delayedWETHProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......@@ -724,7 +724,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
value = hex"000000000000000000000000000000000000000000000000000000000000000f";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000090b505357afad15a1fb8f1098b3295b7cfac1c24";
value = hex"00000000000000000000000007f69b19532476c6cd03056d6bc3f1b110ab7538";
vm.store(permissionedDelayedWETHProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......@@ -748,7 +748,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
value = hex"0000000000000000000000000000000000000000000000000000000000000010";
vm.store(systemOwnerSafeAddress, slot, value);
slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
value = hex"00000000000000000000000018adfeba1bce3eca45e563944759e2d6ecaf7ba2";
value = hex"0000000000000000000000002d0983b9b70a282d344520a78cc3009bd0656ab4";
vm.store(anchorStateRegistryProxyAddress, slot, value);
slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
value = hex"0000000000000000000000000000000000000000000000000000000000000001";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment