From 99f4896d90cb48c900beabb9e922149b152963be Mon Sep 17 00:00:00 2001 From: 0xDiscotech <131301107+0xDiscotech@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:28:25 -0300 Subject: [PATCH 1/3] chore: bump contracts versions --- packages/contracts-bedrock/semver-lock.json | 12 ++++++------ .../src/L1/OptimismPortalInterop.sol | 2 +- .../contracts-bedrock/src/L1/SystemConfigInterop.sol | 2 +- packages/contracts-bedrock/src/L2/CrossL2Inbox.sol | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json index 51666e0d6fba..621fe4e8f265 100644 --- a/packages/contracts-bedrock/semver-lock.json +++ b/packages/contracts-bedrock/semver-lock.json @@ -44,8 +44,8 @@ "sourceCodeHash": "0x3fb97859f66c078573753b6ba5ec370449ab03b8eca9e7779fce8db5bb23b7c0" }, "src/L1/OptimismPortalInterop.sol": { - "initCodeHash": "0x1c8372865dbf38225de4d843ca696a17f0d9e3cacf13c10a3d065ba19bdca05e", - "sourceCodeHash": "0x5e0f8540d605da9d6470fc6e321dcb6f6c2d46feb9358a0857a2b50674e27795" + "initCodeHash": "0xfeaa67ccd652bda9103fea507e4357b2bd4e93210b03ff85eb357d7145f1606c", + "sourceCodeHash": "0x0bcdd9c071f3cd687db479dc02265a109b6921e4a563eaf8770917c5eb7bb3b2" }, "src/L1/ProtocolVersions.sol": { "initCodeHash": "0x8f033874dd8b36615b2209d553660dcff1ff91ca2bad3ca1de7b441dbfba4842", @@ -60,16 +60,16 @@ "sourceCodeHash": "0x06a50ac992175fdb434b13e8461893e83862c23ce399e697e6e8109728ad1a3d" }, "src/L1/SystemConfigInterop.sol": { - "initCodeHash": "0x1f500e310170769ffc747e08ad1d5b0de4b0f58534001bc4d4d563ec058bb331", - "sourceCodeHash": "0xdd61b3f0e69d3187b212cb93add237e9ccc174b7e04848597229f2f144275e1d" + "initCodeHash": "0x7515e5ed1266412a8c2d27d99aba6266fda2fc9068c20f0b7e6b555ee5073c91", + "sourceCodeHash": "0xb34c768fdd45c3d9b846bc5a690f60b5d4de52c820146fb16c4677960ee55994" }, "src/L2/BaseFeeVault.sol": { "initCodeHash": "0x3bfcd57e25ad54b66c374f63e24e33a6cf107044aa8f5f69ef21202c380b5c5b", "sourceCodeHash": "0x2dc2284cf7c68e743da50e4113e96ffeab435de2390aeba2eab2f1e8ca411ce9" }, "src/L2/CrossL2Inbox.sol": { - "initCodeHash": "0x0ee27866b4bf864a0b68ab25ea9559d7f2722b0396d02f2e8e089c6a1a5a6a93", - "sourceCodeHash": "0x383400ce56e5e694050e682b53cc539977054ce33266af9e136ab11ae1af2b87" + "initCodeHash": "0x66b052adce7e9194d054952d67d08b53964120067600358243ec86c85b90877b", + "sourceCodeHash": "0xe85cf50f5372dd4db460fd0d2e0e1b4f85ee862daee23fca4c5ef37851a2c06b" }, "src/L2/ETHLiquidity.sol": { "initCodeHash": "0x713c18f95a6a746d0703f475f3ae10c106c9b9ecb64d881a2e61b8969b581371", diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol index 8c3e36a0e077..df5c1b0cb000 100644 --- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol +++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol @@ -25,7 +25,7 @@ contract OptimismPortalInterop is OptimismPortal2 { /// @custom:semver +interop function version() public pure override returns (string memory) { - return string.concat(super.version(), "+interop"); + return string.concat(super.version(), "+interop-beta.1"); } /// @notice Sets static configuration options for the L2 system. diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol index e560d9182e4c..1bfea1f63ce2 100644 --- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol +++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol @@ -70,7 +70,7 @@ contract SystemConfigInterop is SystemConfig { /// @custom:semver +interop function version() public pure override returns (string memory) { - return string.concat(super.version(), "+interop"); + return string.concat(super.version(), "+interop-beta.1"); } /// @notice Internal setter for the gas paying token address, includes validation. diff --git a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol index e96fdf5b56bf..ae59525f0265 100644 --- a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol +++ b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol @@ -66,7 +66,7 @@ contract CrossL2Inbox is ICrossL2Inbox, ISemver, TransientReentrancyAware { /// @notice Semantic version. /// @custom:semver 1.0.0-beta.7 - string public constant version = "1.0.0-beta.7"; + string public constant version = "1.0.0-beta.8"; /// @notice Emitted when a cross chain message is being executed. /// @param msgHash Hash of message payload being executed. From 057149adb29fdec6b2713ad8f7c4a8e4bf6b2d89 Mon Sep 17 00:00:00 2001 From: 0xDiscotech <131301107+0xDiscotech@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:32:51 -0300 Subject: [PATCH 2/3] fix: add devdoc --- packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol | 2 +- packages/contracts-bedrock/src/L1/SystemConfigInterop.sol | 2 +- packages/contracts-bedrock/src/L2/CrossL2Inbox.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol index df5c1b0cb000..b02248eaff43 100644 --- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol +++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol @@ -23,7 +23,7 @@ contract OptimismPortalInterop is OptimismPortal2 { OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds) { } - /// @custom:semver +interop + /// @custom:semver +interop-beta.1 function version() public pure override returns (string memory) { return string.concat(super.version(), "+interop-beta.1"); } diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol index 1bfea1f63ce2..f7b8921d10d2 100644 --- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol +++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol @@ -68,7 +68,7 @@ contract SystemConfigInterop is SystemConfig { Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager); } - /// @custom:semver +interop + /// @custom:semver +interop-beta.1 function version() public pure override returns (string memory) { return string.concat(super.version(), "+interop-beta.1"); } diff --git a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol index ae59525f0265..7939dccddbb4 100644 --- a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol +++ b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol @@ -65,7 +65,7 @@ contract CrossL2Inbox is ICrossL2Inbox, ISemver, TransientReentrancyAware { address internal constant DEPOSITOR_ACCOUNT = 0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001; /// @notice Semantic version. - /// @custom:semver 1.0.0-beta.7 + /// @custom:semver 1.0.0-beta.8 string public constant version = "1.0.0-beta.8"; /// @notice Emitted when a cross chain message is being executed. From 78b52b4595f0322f6b2061a762e1da54b58378a2 Mon Sep 17 00:00:00 2001 From: 0xDiscotech <131301107+0xDiscotech@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:39:29 -0300 Subject: [PATCH 3/3] chore: run pre pr --- packages/contracts-bedrock/semver-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json index 621fe4e8f265..d3b130442046 100644 --- a/packages/contracts-bedrock/semver-lock.json +++ b/packages/contracts-bedrock/semver-lock.json @@ -45,7 +45,7 @@ }, "src/L1/OptimismPortalInterop.sol": { "initCodeHash": "0xfeaa67ccd652bda9103fea507e4357b2bd4e93210b03ff85eb357d7145f1606c", - "sourceCodeHash": "0x0bcdd9c071f3cd687db479dc02265a109b6921e4a563eaf8770917c5eb7bb3b2" + "sourceCodeHash": "0x6401b81f04093863557ef46192f56793daa0d412618065383ab353b2ed2929d8" }, "src/L1/ProtocolVersions.sol": { "initCodeHash": "0x8f033874dd8b36615b2209d553660dcff1ff91ca2bad3ca1de7b441dbfba4842", @@ -61,7 +61,7 @@ }, "src/L1/SystemConfigInterop.sol": { "initCodeHash": "0x7515e5ed1266412a8c2d27d99aba6266fda2fc9068c20f0b7e6b555ee5073c91", - "sourceCodeHash": "0xb34c768fdd45c3d9b846bc5a690f60b5d4de52c820146fb16c4677960ee55994" + "sourceCodeHash": "0x441d1e3e8e987f829f55996b5b6c850da8c59ad48f09cf7e0a69a1fa559d42a2" }, "src/L2/BaseFeeVault.sol": { "initCodeHash": "0x3bfcd57e25ad54b66c374f63e24e33a6cf107044aa8f5f69ef21202c380b5c5b", @@ -69,7 +69,7 @@ }, "src/L2/CrossL2Inbox.sol": { "initCodeHash": "0x66b052adce7e9194d054952d67d08b53964120067600358243ec86c85b90877b", - "sourceCodeHash": "0xe85cf50f5372dd4db460fd0d2e0e1b4f85ee862daee23fca4c5ef37851a2c06b" + "sourceCodeHash": "0x38e6127ec6be99eb8c38c2c9d6e82761b33dde446bba250dc2c1b84983449e4e" }, "src/L2/ETHLiquidity.sol": { "initCodeHash": "0x713c18f95a6a746d0703f475f3ae10c106c9b9ecb64d881a2e61b8969b581371",