Merge branch 'develop' into zhwrd/01-10-INF-22_integrate_op-signer_client_with_op-proposer

op-bindings/hardhat/hardhat.go

@@ -76,6 +76,7 @@ func (h *Hardhat) init() error {
 // initDeployments reads all of the deployment json files from disk and then
 // caches the deserialized `Deployment` structs.
 func (h *Hardhat) initDeployments() error {
+	knownDeployments := make(map[string]string)
 	for _, deploymentPath := range h.DeploymentPaths {
 		fileSystem := os.DirFS(filepath.Join(deploymentPath, h.network))
 		err := fs.WalkDir(fileSystem, ".", func(path string, d fs.DirEntry, err error) error {
@@ -103,7 +104,16 @@ func (h *Hardhat) initDeployments() error {
 			}
 
 			deployment.Name = filepath.Base(name[:len(name)-5])
+			if knownDeployments[deployment.Name] != "" {
+				return fmt.Errorf(
+					"discovered duplicate deployment %s. old: %s, new: %s",
+					deployment.Name,
+					knownDeployments[deployment.Name],
+					name,
+				)
+			}
 			h.deployments = append(h.deployments, &deployment)
+			knownDeployments[deployment.Name] = name
 			return nil
 		})
 		if err != nil {

op-bindings/hardhat/hardhat_test.go

@@ -146,6 +146,20 @@ func TestHardhatGetDeployments(t *testing.T) {
 	require.NotNil(t, deployment)
 }
 
+func TestHardhatGetDeploymentsDuplicates(t *testing.T) {
+	t.Parallel()
+
+	// Set the network to an empty string to simulate
+	// an invalid network name.
+	_, err := hardhat.New(
+		"",
+		[]string{"testdata/artifacts"},
+		[]string{"testdata/deployments"},
+	)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "duplicate deployment")
+}
+
 func TestHardhatGetStorageLayout(t *testing.T) {
 	t.Parallel()
 

packages/contracts-bedrock/.gas-snapshot

@@ -92,16 +92,17 @@ L1ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 16093)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 17593)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 323814)
-L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 576276)
-L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 574103)
+L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 624279)
+L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 621958)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_notEoa_reverts() (gas: 22320)
-L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 324839)
-L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 367666)
+L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 358590)
+L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 401413)
 L1StandardBridge_DepositETH_TestFail:test_depositETH_notEoa_reverts() (gas: 40780)
+L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 48661)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 34207)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 34288)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 34257)
-L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 492896)
+L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 495885)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notMessenger_reverts() (gas: 31148)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notOtherBridge_reverts() (gas: 31504)
 L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 58686)
@@ -163,16 +164,17 @@ L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 26093)
 L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15149)
 L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20131)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 180413)
+L2StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 36076)
 L2StandardBridge_Test:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 23843)
 L2StandardBridge_Test:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 23982)
 L2StandardBridge_Test:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 23893)
-L2StandardBridge_Test:test_finalizeDeposit_succeeds() (gas: 89473)
+L2StandardBridge_Test:test_finalizeDeposit_succeeds() (gas: 90641)
 L2StandardBridge_Test:test_initialize_succeeds() (gas: 24270)
-L2StandardBridge_Test:test_receive_succeeds() (gas: 141940)
-L2StandardBridge_Test:test_withdrawTo_succeeds() (gas: 344914)
+L2StandardBridge_Test:test_receive_succeeds() (gas: 176698)
+L2StandardBridge_Test:test_withdrawTo_succeeds() (gas: 384552)
 L2StandardBridge_Test:test_withdraw_insufficientValue_reverts() (gas: 19627)
-L2StandardBridge_Test:test_withdraw_notEOA_reverts() (gas: 251798)
-L2StandardBridge_Test:test_withdraw_succeeds() (gas: 344228)
+L2StandardBridge_Test:test_withdraw_notEOA_reverts() (gas: 251836)
+L2StandardBridge_Test:test_withdraw_succeeds() (gas: 382649)
 L2ToL1MessagePasserTest:test_burn_succeeds() (gas: 112572)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract_succeeds() (gas: 70423)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA_succeeds() (gas: 75874)