Merge branch 'develop' into feat/output-tx-calldata

.changeset/twelve-carrots-pump.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Make lint check and fix scripts match

packages/contracts-bedrock/.gas-snapshot

@@ -230,11 +230,11 @@ OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 24162)
 OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11142)
 OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140502)
 OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163420)
-OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 9983)
+OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 10005)
 OptimismMintableERC721Factory_Test:test_constructor_zeroBridge_reverts() (gas: 39114)
-OptimismMintableERC721Factory_Test:test_constructor_zeroRemoteChainId_reverts() (gas: 41265)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2276418)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverst() (gas: 9395)
+OptimismMintableERC721Factory_Test:test_constructor_zeroRemoteChainId_reverts() (gas: 41287)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2276374)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9373)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 10791)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15833)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 16011)

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

@@ -428,10 +428,11 @@ contract ERC721Bridge_Initializer is Messenger_Initializer {
         L1Bridge = new L1ERC721Bridge(address(L1Messenger), Predeploys.L2_ERC721_BRIDGE);
 
         // Deploy the implementation for the L2ERC721Bridge and etch it into the predeploy address.
-        vm.etch(Predeploys.L2_ERC721_BRIDGE, address(new L2ERC721Bridge(
-            Predeploys.L2_CROSS_DOMAIN_MESSENGER,
-            address(L1Bridge)
-        )).code);
+        vm.etch(
+            Predeploys.L2_ERC721_BRIDGE,
+            address(new L2ERC721Bridge(Predeploys.L2_CROSS_DOMAIN_MESSENGER, address(L1Bridge)))
+                .code
+        );
 
         // Set up a reference to the L2ERC721Bridge.
         L2Bridge = L2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE);

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

@@ -49,20 +49,12 @@ contract OptimismMintableERC721Factory_Test is ERC721Bridge_Initializer {
 
         // Expect a token creation event.
         vm.expectEmit(true, true, true, true);
-        emit OptimismMintableERC721Created(
-            predicted,
-            address(1234),
-            alice
-        );
+        emit OptimismMintableERC721Created(predicted, address(1234), alice);
 
         // Create the token.
         vm.prank(alice);
         OptimismMintableERC721 created = OptimismMintableERC721(
-            factory.createOptimismMintableERC721(
-                address(1234),
-                "L2Token",
-                "L2T"
-            )
+            factory.createOptimismMintableERC721(address(1234), "L2Token", "L2T")
         );
 
         // Token address should be correct.
@@ -79,13 +71,9 @@ contract OptimismMintableERC721Factory_Test is ERC721Bridge_Initializer {
         assertEq(created.REMOTE_CHAIN_ID(), 1);
     }
 
-    function test_createOptimismMintableERC721_zeroRemoteToken_reverst() external {
+    function test_createOptimismMintableERC721_zeroRemoteToken_reverts() external {
         // Try to create a token with a zero remote token address.
         vm.expectRevert("OptimismMintableERC721Factory: L1 token address cannot be address(0)");
-        factory.createOptimismMintableERC721(
-            address(0),
-            "L2Token",
-            "L2T"
-        );
+        factory.createOptimismMintableERC721(address(0), "L2Token", "L2T");
     }
 }

packages/contracts-bedrock/package.json

@@ -33,10 +33,10 @@
     "clean": "rm -rf ./dist ./artifacts ./forge-artifacts ./cache ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo ./src/contract-artifacts.ts ./test-case-generator/fuzz",
     "lint:ts:check": "eslint . --max-warnings=0",
     "lint:forge-tests:check": "ts-node scripts/forge-test-names.ts",
-    "lint:contracts:check": "yarn solhint -f table 'contracts/**/*.sol' && yarn lint:forge-tests:check",
+    "lint:contracts:check": "yarn solhint -f table 'contracts/**/*.sol' && yarn prettier --check 'contracts/**/*.sol' && yarn lint:forge-tests:check",
     "lint:check": "yarn lint:contracts:check && yarn lint:ts:check",
     "lint:ts:fix": "eslint --fix .",
-    "lint:contracts:fix": "yarn prettier --write 'contracts/**/*.sol'",
+    "lint:contracts:fix": "yarn solhint --fix 'contracts/**/*.sol' && yarn prettier --write 'contracts/**/*.sol'",
     "lint:fix": "yarn lint:contracts:fix && yarn lint:ts:fix",
     "lint": "yarn lint:fix && yarn lint:check",
     "typechain": "typechain --target ethers-v5 --out-dir dist/types --glob 'artifacts/!(build-info)/**/+([a-zA-Z0-9_]).json'",