Merge pull request #4949 from ethereum-optimism/jm/fix-error-strings

fix(ctb): Add correct prefix to errors

packages/contracts-bedrock/.gas-snapshot

-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261407)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75936)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348359)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112814)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348381)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112834)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40875)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75075)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36188)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169229)
 Bytes_slice_Test:test_slice_acrossMultipleWords_works() (gas: 9423)
 Bytes_slice_Test:test_slice_acrossWords_works() (gas: 1418)
 Bytes_slice_Test:test_slice_fromNonZeroIdx_works() (gas: 17154)
@@ -17,9 +6,6 @@ Bytes_toNibbles_Test:test_toNibbles_expectedResult128Bytes_works() (gas: 129874)
 Bytes_toNibbles_Test:test_toNibbles_expectedResult5Bytes_works() (gas: 6132)
 Bytes_toNibbles_Test:test_toNibbles_zeroLengthInput_works() (gas: 944)
 CrossDomainMessenger_BaseGas_Test:test_baseGas_succeeds() (gas: 20120)
-CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 72494)
-CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
-CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8416)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner2_reverts() (gas: 63695)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16544)
@@ -36,10 +22,24 @@ CrossDomainOwnable3_Test:test_transferOwnershipNoLocal_succeeds() (gas: 48610)
 CrossDomainOwnable3_Test:test_transferOwnership_noLocalZeroAddress_reverts() (gas: 12015)
 CrossDomainOwnable3_Test:test_transferOwnership_notOwner_reverts() (gas: 13437)
 CrossDomainOwnable3_Test:test_transferOwnership_zeroAddress_reverts() (gas: 12081)
+CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 72494)
+CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
+CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7582)
 DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
 FeeVault_Test:test_constructor_succeeds() (gas: 10736)
 FeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 10713)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261407)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75936)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348359)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112814)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348381)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112834)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40875)
+GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75075)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36188)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169229)
 GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8325)
 GasPriceOracle_Test:test_decimals_succeeds() (gas: 6167)
 GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8294)
@@ -59,15 +59,15 @@ GovernanceToken_Test:test_mint_fromOwner_succeeds() (gas: 108592)
 GovernanceToken_Test:test_transferFrom_succeeds() (gas: 146273)
 GovernanceToken_Test:test_transfer_succeeds() (gas: 138108)
 Hashing_hashDepositSource_Test:test_hashDepositSource_succeeds() (gas: 633)
+L1BlockNumberTest:test_fallback_succeeds() (gas: 18655)
+L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10625)
+L1BlockNumberTest:test_receive_succeeds() (gas: 25384)
 L1BlockTest:test_basefee_succeeds() (gas: 7554)
 L1BlockTest:test_hash_succeeds() (gas: 7576)
 L1BlockTest:test_number_succeeds() (gas: 7629)
 L1BlockTest:test_sequenceNumber_succeeds() (gas: 7630)
 L1BlockTest:test_timestamp_succeeds() (gas: 7640)
 L1BlockTest:test_updateValues_succeeds() (gas: 60482)
-L1BlockNumberTest:test_fallback_succeeds() (gas: 18655)
-L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10625)
-L1BlockNumberTest:test_receive_succeeds() (gas: 25384)
 L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24759)
 L1CrossDomainMessenger_Test:test_pause_callerIsNotOwner_reverts() (gas: 24495)
 L1CrossDomainMessenger_Test:test_pause_succeeds() (gas: 52964)
@@ -250,19 +250,19 @@ OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11121)
 OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63566)
 OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7689)
 OptimismMintableERC20_Test:test_semver_succeeds() (gas: 8812)
-OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1268564)
+OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2336687)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
 OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966)
 OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832)
 OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28279)
 OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11098)
 OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524)
 OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163442)
-OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2336687)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
+OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1268564)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 11016)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15940)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 16056)
@@ -305,17 +305,6 @@ OptimismPortal_Test:test_receive_succeeds() (gas: 127554)
 OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 24232)
 OptimismPortal_Test:test_unpause_onlyGuardian_reverts() (gas: 46151)
 OptimismPortal_Test:test_unpause_succeeds() (gas: 31780)
-Proxy_Test:test_delegatesToImpl_succeeds() (gas: 45207)
-Proxy_Test:test_implementationKey_succeeds() (gas: 20909)
-Proxy_Test:test_implementation_isZeroAddress_reverts() (gas: 47626)
-Proxy_Test:test_implementation_zeroAddressCaller_succeeds() (gas: 14752)
-Proxy_Test:test_ownerKey_succeeds() (gas: 19059)
-Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 34615)
-Proxy_Test:test_proxyCallToImp_notAdmin_succeeds() (gas: 30008)
-Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 104565)
-Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53742)
-Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125190)
-Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101359)
 ProxyAdmin_Test:test_chugsplashChangeProxyAdmin_succeeds() (gas: 35586)
 ProxyAdmin_Test:test_chugsplashGetProxyAdmin_succeeds() (gas: 15675)
 ProxyAdmin_Test:test_chugsplashGetProxyImplementation_succeeds() (gas: 51084)
@@ -339,6 +328,17 @@ ProxyAdmin_Test:test_setAddressManager_notOwner_reverts() (gas: 10578)
 ProxyAdmin_Test:test_setImplementationName_notOwner_reverts() (gas: 11111)
 ProxyAdmin_Test:test_setImplementationName_succeeds() (gas: 38945)
 ProxyAdmin_Test:test_setProxyType_notOwner_reverts() (gas: 10814)
+Proxy_Test:test_delegatesToImpl_succeeds() (gas: 45207)
+Proxy_Test:test_implementationKey_succeeds() (gas: 20909)
+Proxy_Test:test_implementation_isZeroAddress_reverts() (gas: 47626)
+Proxy_Test:test_implementation_zeroAddressCaller_succeeds() (gas: 14752)
+Proxy_Test:test_ownerKey_succeeds() (gas: 19059)
+Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 34615)
+Proxy_Test:test_proxyCallToImp_notAdmin_succeeds() (gas: 30008)
+Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 104565)
+Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53742)
+Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125190)
+Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101359)
 RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1878)
 RLPReader_readBytes_Test:test_readBytes_bytestring01_succeeds() (gas: 1855)
 RLPReader_readBytes_Test:test_readBytes_bytestring7f_succeeds() (gas: 1876)
@@ -421,4 +421,4 @@ SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 10555)
 SystemConfig_Setters_TestFail:test_setGasLimit_notOwner_reverts() (gas: 10658)
 SystemConfig_Setters_TestFail:test_setUnsafeBlockSigner_notOwner_reverts() (gas: 10660)
 TransferOnionTest:test_constructor_succeeds() (gas: 564855)
-TransferOnionTest:test_unwrap_succeeds() (gas: 724958)
+TransferOnionTest:test_unwrap_succeeds() (gas: 724958)
\ No newline at end of file

packages/contracts-bedrock/contracts/L1/L1ERC721Bridge.sol

@@ -26,7 +26,7 @@ contract L1ERC721Bridge is ERC721Bridge, Semver {
      * @param _otherBridge Address of the ERC721 bridge on the other network.
      */
     constructor(address _messenger, address _otherBridge)
-        Semver(1, 0, 0)
+        Semver(1, 1, 0)
         ERC721Bridge(_messenger, _otherBridge)
     {}
 
@@ -83,7 +83,7 @@ contract L1ERC721Bridge is ERC721Bridge, Semver {
         uint32 _minGasLimit,
         bytes calldata _extraData
     ) internal override {
-        require(_remoteToken != address(0), "ERC721Bridge: remote token cannot be address(0)");
+        require(_remoteToken != address(0), "L1ERC721Bridge: remote token cannot be address(0)");
 
         // Construct calldata for _l2Token.finalizeBridgeERC721(_to, _tokenId)
         bytes memory message = abi.encodeWithSelector(

packages/contracts-bedrock/contracts/L2/L2ERC721Bridge.sol

@@ -26,7 +26,7 @@ contract L2ERC721Bridge is ERC721Bridge, Semver {
      * @param _otherBridge Address of the ERC721 bridge on the other network.
      */
     constructor(address _messenger, address _otherBridge)
-        Semver(1, 0, 0)
+        Semver(1, 1, 0)
         ERC721Bridge(_messenger, _otherBridge)
     {}
 
@@ -85,12 +85,12 @@ contract L2ERC721Bridge is ERC721Bridge, Semver {
         uint32 _minGasLimit,
         bytes calldata _extraData
     ) internal override {
-        require(_remoteToken != address(0), "ERC721Bridge: remote token cannot be address(0)");
+        require(_remoteToken != address(0), "L2ERC721Bridge: remote token cannot be address(0)");
 
         // Check that the withdrawal is being initiated by the NFT owner
         require(
             _from == IOptimismMintableERC721(_localToken).ownerOf(_tokenId),
-            "Withdrawal is not being initiated by NFT owner"
+            "L2ERC721Bridge: Withdrawal is not being initiated by NFT owner"
         );
 
         // Construct calldata for l1ERC721Bridge.finalizeBridgeERC721(_to, _tokenId)

packages/contracts-bedrock/contracts/test/L1ERC721Bridge.t.sol

@@ -135,7 +135,7 @@ contract L1ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721_remoteTokenZeroAddress_reverts() external {
         // Bridge the token.
         vm.prank(alice);
-        vm.expectRevert("ERC721Bridge: remote token cannot be address(0)");
+        vm.expectRevert("L1ERC721Bridge: remote token cannot be address(0)");
         bridge.bridgeERC721(address(localToken), address(0), tokenId, 1234, hex"5678");
 
         // Token is not locked in the bridge.
@@ -212,7 +212,7 @@ contract L1ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721To_remoteTokenZeroAddress_reverts() external {
         // Bridge the token.
         vm.prank(alice);
-        vm.expectRevert("ERC721Bridge: remote token cannot be address(0)");
+        vm.expectRevert("L1ERC721Bridge: remote token cannot be address(0)");
         bridge.bridgeERC721To(address(localToken), address(0), bob, tokenId, 1234, hex"5678");
 
         // Token is not locked in the bridge.

packages/contracts-bedrock/contracts/test/L2ERC721Bridge.t.sol

@@ -144,7 +144,7 @@ contract L2ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721_remoteTokenZeroAddress_reverts() external {
         // Bridge the token.
         vm.prank(alice);
-        vm.expectRevert("ERC721Bridge: remote token cannot be address(0)");
+        vm.expectRevert("L2ERC721Bridge: remote token cannot be address(0)");
         bridge.bridgeERC721(address(localToken), address(0), tokenId, 1234, hex"5678");
 
         // Token is not locked in the bridge.
@@ -154,7 +154,7 @@ contract L2ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721_wrongOwner_reverts() external {
         // Bridge the token.
         vm.prank(bob);
-        vm.expectRevert("Withdrawal is not being initiated by NFT owner");
+        vm.expectRevert("L2ERC721Bridge: Withdrawal is not being initiated by NFT owner");
         bridge.bridgeERC721(address(localToken), address(remoteToken), tokenId, 1234, hex"5678");
 
         // Token is not locked in the bridge.
@@ -218,7 +218,7 @@ contract L2ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721To_remoteTokenZeroAddress_reverts() external {
         // Bridge the token.
         vm.prank(alice);
-        vm.expectRevert("ERC721Bridge: remote token cannot be address(0)");
+        vm.expectRevert("L2ERC721Bridge: remote token cannot be address(0)");
         bridge.bridgeERC721To(address(localToken), address(0), bob, tokenId, 1234, hex"5678");
 
         // Token is not locked in the bridge.
@@ -228,7 +228,7 @@ contract L2ERC721Bridge_Test is Messenger_Initializer {
     function test_bridgeERC721To_wrongOwner_reverts() external {
         // Bridge the token.
         vm.prank(bob);
-        vm.expectRevert("Withdrawal is not being initiated by NFT owner");
+        vm.expectRevert("L2ERC721Bridge: Withdrawal is not being initiated by NFT owner");
         bridge.bridgeERC721To(
             address(localToken),
             address(remoteToken),

packages/contracts-bedrock/tasks/check-l2.ts

@@ -525,7 +525,7 @@ const check = {
       signer
     )
 
-    await assertSemver(L2ERC721Bridge, 'L2ERC721Bridge')
+    await assertSemver(L2ERC721Bridge, 'L2ERC721Bridge', '1.1.0')
 
     const MESSENGER = await L2ERC721Bridge.MESSENGER()
     assert(MESSENGER !== hre.ethers.constants.AddressZero)