Merge branch 'develop' into dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-6.7.0

op-challenger/Dockerfile

@@ -32,6 +32,12 @@ ARG TARGETOS TARGETARCH
 
 RUN make op-program-host VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
+WORKDIR /app/cannon
+
+ARG TARGETOS TARGETARCH
+
+RUN make cannon VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
+
 WORKDIR /app/op-challenger
 
 RUN make op-challenger VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
@@ -39,10 +45,13 @@ RUN make op-challenger VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 FROM alpine:3.18
 
 # Make the bundled op-program the default cannon server
+COPY --from=builder /app/op-program/bin/op-program /usr/local/bin
 ENV OP_CHALLENGER_CANNON_SERVER /usr/local/bin/op-program
 
-COPY --from=builder /app/op-challenger/bin/op-challenger /usr/local/bin
+# Make the bundled cannon the default cannon executable
+COPY --from=builder /app/cannon/bin/cannon /usr/local/bin
+ENV OP_CHALLENGER_CANNON_BIN /usr/local/bin/cannon
 
-COPY --from=builder /app/op-program/bin/op-program /usr/local/bin
+COPY --from=builder /app/op-challenger/bin/op-challenger /usr/local/bin
 
 CMD ["op-challenger"]

package.json

@@ -62,7 +62,7 @@
     "eslint-plugin-unicorn": "^42.0.0",
     "husky": "^8.0.3",
     "lint-staged": "14.0.1",
-    "markdownlint": "^0.30.0",
+    "markdownlint": "^0.31.0",
     "markdownlint-cli2": "0.4.0",
     "mocha": "^10.2.0",
     "nx": "16.8.1",

packages/contracts-bedrock/.gas-snapshot

@@ -122,12 +122,12 @@ FaultDisputeGame_Test:test_resolve_rootUncontested_succeeds() (gas: 27279)
 FaultDisputeGame_Test:test_resolve_teamDeathmatch_succeeds() (gas: 395658)
 FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8276)
 FeeVault_Test:test_constructor_succeeds() (gas: 18185)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 354286)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2952493)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 542178)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4054371)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 443438)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3489165)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 354421)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2952628)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 542325)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4054518)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 443561)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3489288)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 42714)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 90658)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75076)
@@ -162,42 +162,42 @@ L1BlockTest:test_sequenceNumber_succeeds() (gas: 7630)
 L1BlockTest:test_timestamp_succeeds() (gas: 7640)
 L1BlockTest:test_updateValues_succeeds() (gas: 60482)
 L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24781)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 49417)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 212527)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 206219)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterSuccess_reverts() (gas: 126476)
-L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 79665)
-L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 200193)
-L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 76623)
-L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 60845)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 49384)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 212329)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 206087)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterSuccess_reverts() (gas: 126344)
+L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 79599)
+L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 200127)
+L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 76590)
+L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 60779)
 L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 12343)
-L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 33166)
-L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 392870)
-L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1669046)
-L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 87043)
+L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 33133)
+L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 392933)
+L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1669172)
+L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 86992)
 L1CrossDomainMessenger_Test:test_xDomainSender_notSet_reverts() (gas: 24253)
 L1ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 62677)
 L1ERC721Bridge_Test:test_bridgeERC721To_remoteTokenZeroAddress_reverts() (gas: 37273)
-L1ERC721Bridge_Test:test_bridgeERC721To_succeeds() (gas: 455032)
+L1ERC721Bridge_Test:test_bridgeERC721To_succeeds() (gas: 455254)
 L1ERC721Bridge_Test:test_bridgeERC721To_wrongOwner_reverts() (gas: 70985)
 L1ERC721Bridge_Test:test_bridgeERC721_fromContract_reverts() (gas: 35669)
 L1ERC721Bridge_Test:test_bridgeERC721_localTokenZeroAddress_reverts() (gas: 60552)
 L1ERC721Bridge_Test:test_bridgeERC721_remoteTokenZeroAddress_reverts() (gas: 35192)
-L1ERC721Bridge_Test:test_bridgeERC721_succeeds() (gas: 454729)
+L1ERC721Bridge_Test:test_bridgeERC721_succeeds() (gas: 454951)
 L1ERC721Bridge_Test:test_bridgeERC721_wrongOwner_reverts() (gas: 70811)
 L1ERC721Bridge_Test:test_constructor_succeeds() (gas: 18861)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_notEscrowed_reverts() (gas: 29472)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (gas: 27217)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 23238)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 24990)
-L1ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 425005)
-L1StandardBridge_BridgeETHTo_Test:test_bridgeETHTo_succeeds() (gas: 514621)
-L1StandardBridge_BridgeETH_Test:test_bridgeETH_succeeds() (gas: 501799)
-L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 720125)
-L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 717702)
+L1ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 425227)
+L1StandardBridge_BridgeETHTo_Test:test_bridgeETHTo_succeeds() (gas: 514756)
+L1StandardBridge_BridgeETH_Test:test_bridgeETH_succeeds() (gas: 501934)
+L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 720272)
+L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 717849)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_notEoa_reverts() (gas: 22276)
-L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 514654)
-L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 501871)
+L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 514789)
+L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 502006)
 L1StandardBridge_DepositETH_TestFail:test_depositETH_notEoa_reverts() (gas: 40759)
 L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 54102)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 36551)
@@ -210,11 +210,11 @@ L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds(
 L1StandardBridge_Getter_Test:test_getters_succeeds() (gas: 28383)
 L1StandardBridge_Initialize_Test:test_initialize_fix_succeeds() (gas: 5258)
 L1StandardBridge_Initialize_Test:test_initialize_succeeds() (gas: 24195)
-L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 615007)
+L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 615130)
 L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8477)
 L2CrossDomainMessenger_Test:test_relayMessage_retry_succeeds() (gas: 163815)
 L2CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 48946)
-L2CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 31169)
+L2CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 31136)
 L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 11689)
 L2CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 123768)
 L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 135434)
@@ -241,8 +241,8 @@ L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 46800)
 L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15216)
 L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20216)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 191348)
-L2OutputOracle_constructor_Test:test_constructor_l2BlockTimeZero_reverts() (gas: 39212)
-L2OutputOracle_constructor_Test:test_constructor_submissionInterval_reverts() (gas: 39222)
+L2OutputOracle_constructor_Test:test_constructor_l2BlockTimeZero_reverts() (gas: 39022)
+L2OutputOracle_constructor_Test:test_constructor_submissionInterval_reverts() (gas: 39032)
 L2OutputOracle_constructor_Test:test_constructor_succeeds() (gas: 51777)
 L2OutputOracle_constructor_Test:test_initialize_badTimestamp_reverts() (gas: 12353)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_afterLatest_reverts() (gas: 217031)
@@ -645,11 +645,11 @@ SequencerFeeVault_Test:test_withdraw_toL1_succeeds() (gas: 171357)
 SetPrevBaseFee_Test:test_setPrevBaseFee_succeeds() (gas: 11549)
 StandardBridge_Stateless_Test:test_isCorrectTokenPair_succeeds() (gas: 49936)
 StandardBridge_Stateless_Test:test_isOptimismMintableERC20_succeeds() (gas: 33072)
-SystemConfig_Initialize_Test:test_initialize_events_succeeds() (gas: 72060)
-SystemConfig_Initialize_Test:test_initialize_startBlockOverride_succeeds() (gas: 65242)
+SystemConfig_Initialize_Test:test_initialize_events_succeeds() (gas: 71945)
+SystemConfig_Initialize_Test:test_initialize_startBlockOverride_succeeds() (gas: 65127)
 SystemConfig_Initialize_Test:test_initialize_values_succeeds() (gas: 64946)
-SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 55655)
-SystemConfig_Initialize_TestFail:test_initialize_startBlock_reverts() (gas: 78352)
+SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 55589)
+SystemConfig_Initialize_TestFail:test_initialize_startBlock_reverts() (gas: 78208)
 SystemConfig_Setters_TestFail:test_setBatcherHash_notOwner_reverts() (gas: 15607)
 SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 15577)
 SystemConfig_Setters_TestFail:test_setGasLimit_notOwner_reverts() (gas: 15676)

packages/contracts-bedrock/semver-lock.json

 {
   "src/EAS/EAS.sol": "0x1acb25751a1206eb859cc5fcf934da2f84cfb907b8e8951d86fc4e43c53a7303",
   "src/EAS/SchemaRegistry.sol": "0x305f3afed2e337cd70aac70fc202e6503b947b0a31e0d4e18c49486eeb635bb5",
-  "src/L1/L1CrossDomainMessenger.sol": "0x0e663b5d608b07cf278b94b1eeb3202abc01bea6b5905a3869010353df33ad1a",
-  "src/L1/L1ERC721Bridge.sol": "0xbb10b777d1cd36ef98b53df6675f37a20b14a9a82b174f0d8f8872eedca65f17",
-  "src/L1/L1StandardBridge.sol": "0xbd7b303cefe46bc14bf1a2b81e5702ff45ce9c5257524e59778e11c75f7f5bdc",
-  "src/L1/L2OutputOracle.sol": "0x05ea17a834563ffa50cade81189b120b6f0805ba316d6a9893c8cf8b231e57e3",
-  "src/L1/OptimismPortal.sol": "0xeefcc16d30e14ed7ce9970f3aeaf1d5668324b3fc1ddb4790da5804cfdd78980",
-  "src/L1/SystemConfig.sol": "0xd5904b53153f2e32be28f2ce1ea51374b19fdf4f478f486f02cf67d8b62b7c29",
+  "src/L1/L1CrossDomainMessenger.sol": "0x14f5991022705b8bd3bf931e138a528cc9c9e90d0f1ec398efd5079224d61b3b",
+  "src/L1/L1ERC721Bridge.sol": "0x3e0e3d2f4c151e41585850f06e6452cdda86348debfe6ff16e364a839266450b",
+  "src/L1/L1StandardBridge.sol": "0x12e227c6054660a83b92d823a7447db96a7d476b7a94e0f1807772d400329880",
+  "src/L1/L2OutputOracle.sol": "0x2e298bccb5fe73cf365e23bb56ebe974534549e0052bfe0f86372c52067153e6",
+  "src/L1/OptimismPortal.sol": "0xc8e41a7c3405c1b04c98f4b6bc7d20ff6f20cd3132134a3106670f5a475978c7",
+  "src/L1/SystemConfig.sol": "0xd508b84ef7c6d57be1e2e7eef92fc340f6bb3d68d999bdf2fabe12d110f9615c",
   "src/L2/BaseFeeVault.sol": "0xd8df28898799b80c370e77e9aad09f79235dfda2bf13e56daf21997cfe54200d",
   "src/L2/GasPriceOracle.sol": "0xb7d8c4f3ea8db31900125e341aae42a862a2b7d3f1c1aa60c97dc2d0e022b7ba",
   "src/L2/L1Block.sol": "0x38ea78a9611656a60ae4d58db75e96413a638e3ccb2e935052441f98a1fd3105",

packages/contracts-bedrock/src/universal/ISemver.sol

+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @title ISemver
+/// @notice ISemver is a simple contract for ensuring that contracts are
+///         versioned using semantic versioning.
+interface ISemver {
+    /// @notice Getter for the semantic version of the contract. This is not
+    ///         meant to be used onchain but instead meant to be used by offchain
+    ///         tooling.
+    /// @return Semver contract version as a string.
+    function version() external view returns (string memory);
+}