ci: bump ci-builder to 0.47.0 (#10126)

* ci: bump ci-builder to 0.47.0

Includes a new foundry version that fixes issues with generating
state dumps for kontrol integration.

https://github.com/ethereum-optimism/optimism/pull/10125
https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/50797/workflows/a85a79de-a4a8-4820-9199-ded9ffe9de7d

* lint: fix

* snapshots: update kontrol

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   ci_builder_image:
     type: string
-    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.46.1
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.47.0
   ci_builder_rust_image:
     type: string
     default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest

packages/contracts-bedrock/scripts/Deploy.s.sol

@@ -963,7 +963,7 @@ contract Deploy is Deployer {
                         optimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy")
                     })
                 )
-                )
+            )
         });
 
         SystemConfig config = SystemConfig(systemConfigProxy);
@@ -997,7 +997,7 @@ contract Deploy is Deployer {
             _innerCallData: abi.encodeCall(
                 L1StandardBridge.initialize,
                 (L1CrossDomainMessenger(l1CrossDomainMessengerProxy), SuperchainConfig(superchainConfigProxy))
-                )
+            )
         });
 
         string memory version = L1StandardBridge(payable(l1StandardBridgeProxy)).version();
@@ -1020,7 +1020,7 @@ contract Deploy is Deployer {
             _innerCallData: abi.encodeCall(
                 L1ERC721Bridge.initialize,
                 (L1CrossDomainMessenger(payable(l1CrossDomainMessengerProxy)), SuperchainConfig(superchainConfigProxy))
-                )
+            )
         });
 
         L1ERC721Bridge bridge = L1ERC721Bridge(l1ERC721BridgeProxy);
@@ -1087,7 +1087,7 @@ contract Deploy is Deployer {
             _innerCallData: abi.encodeCall(
                 L1CrossDomainMessenger.initialize,
                 (SuperchainConfig(superchainConfigProxy), OptimismPortal(payable(optimismPortalProxy)))
-                )
+            )
         });
 
         L1CrossDomainMessenger messenger = L1CrossDomainMessenger(l1CrossDomainMessengerProxy);
@@ -1117,7 +1117,7 @@ contract Deploy is Deployer {
                     cfg.l2OutputOracleChallenger(),
                     cfg.finalizationPeriodSeconds()
                 )
-                )
+            )
         });
 
         L2OutputOracle oracle = L2OutputOracle(l2OutputOracleProxy);
@@ -1151,7 +1151,7 @@ contract Deploy is Deployer {
                     SystemConfig(systemConfigProxy),
                     SuperchainConfig(superchainConfigProxy)
                 )
-                )
+            )
         });
 
         OptimismPortal portal = OptimismPortal(payable(optimismPortalProxy));
@@ -1180,7 +1180,7 @@ contract Deploy is Deployer {
                     SystemConfig(systemConfigProxy),
                     SuperchainConfig(superchainConfigProxy)
                 )
-                )
+            )
         });
 
         OptimismPortal2 portal = OptimismPortal2(payable(optimismPortalProxy));
@@ -1209,7 +1209,7 @@ contract Deploy is Deployer {
                     ProtocolVersion.wrap(requiredProtocolVersion),
                     ProtocolVersion.wrap(recommendedProtocolVersion)
                 )
-                )
+            )
         });
 
         ProtocolVersions versions = ProtocolVersions(protocolVersionsProxy);
@@ -1425,7 +1425,7 @@ contract Deploy is Deployer {
             _innerCallData: abi.encodeCall(
                 DataAvailabilityChallenge.initialize,
                 (finalSystemOwner, daChallengeWindow, daResolveWindow, daBondSize, daResolverRefundPercentage)
-                )
+            )
         });
 
         DataAvailabilityChallenge dac = DataAvailabilityChallenge(payable(dataAvailabilityChallengeProxy));

packages/contracts-bedrock/scripts/DeployPeriphery.s.sol

@@ -372,7 +372,7 @@ contract DeployPeriphery is Script, Artifacts {
                     dripcheck: CheckBalanceLow(mustGetAddress("CheckBalanceLow")),
                     checkparams: abi.encode(
                         CheckBalanceLow.Params({ target: mustGetAddress("FaucetProxy"), threshold: cfg.faucetDripV1Threshold() })
-                        ),
+                    ),
                     actions: actions
                 })
             });
@@ -401,7 +401,7 @@ contract DeployPeriphery is Script, Artifacts {
                     dripcheck: CheckBalanceLow(mustGetAddress("CheckBalanceLow")),
                     checkparams: abi.encode(
                         CheckBalanceLow.Params({ target: mustGetAddress("FaucetProxy"), threshold: cfg.faucetDripV2Threshold() })
-                        ),
+                    ),
                     actions: actions
                 })
             });
@@ -436,7 +436,7 @@ contract DeployPeriphery is Script, Artifacts {
                             target: mustGetAddress("FaucetProxy"),
                             threshold: cfg.faucetAdminDripV1Threshold()
                         })
-                        ),
+                    ),
                     actions: actions
                 })
             });
@@ -463,7 +463,7 @@ contract DeployPeriphery is Script, Artifacts {
                     // Gelato represents ETH as 0xeeeee....eeeee
                     0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE,
                     cfg.faucetGelatoBalanceV1Value()
-                    ),
+                ),
                 value: cfg.faucetGelatoBalanceV1Value()
             });
             drippie.create({
@@ -478,7 +478,7 @@ contract DeployPeriphery is Script, Artifacts {
                             threshold: cfg.faucetGelatoThreshold(),
                             treasury: cfg.faucetGelatoTreasury()
                         })
-                        ),
+                    ),
                     actions: actions
                 })
             });

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

@@ -184,7 +184,7 @@ abstract contract CrossDomainMessenger is
             _value: msg.value,
             _data: abi.encodeWithSelector(
                 this.relayMessage.selector, messageNonce(), msg.sender, _target, msg.value, _minGasLimit, _message
-                )
+            )
         });
 
         emit SentMessage(_target, msg.sender, _message, messageNonce(), _minGasLimit);

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

@@ -372,7 +372,7 @@ abstract contract StandardBridge is Initializable {
                 _to,
                 _amount,
                 _extraData
-                ),
+            ),
             _minGasLimit: _minGasLimit
         });
     }

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

@@ -96,7 +96,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
                     abi.encodeCall(
                         L2ERC721Bridge.finalizeBridgeERC721,
                         (address(remoteToken), address(localToken), alice, alice, tokenId, hex"5678")
-                        ),
+                    ),
                     1234
                 )
             )
@@ -177,7 +177,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
                     abi.encodeCall(
                         L2ERC721Bridge.finalizeBridgeERC721,
                         (address(remoteToken), address(localToken), alice, bob, tokenId, hex"5678")
-                        ),
+                    ),
                     1234
                 )
             )

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

@@ -100,7 +100,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
                     abi.encodeCall(
                         L2ERC721Bridge.finalizeBridgeERC721,
                         (address(remoteToken), address(localToken), alice, alice, tokenId, hex"5678")
-                        ),
+                    ),
                     1234
                 )
             )
@@ -177,7 +177,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
                     abi.encodeCall(
                         L1ERC721Bridge.finalizeBridgeERC721,
                         (address(remoteToken), address(localToken), alice, bob, tokenId, hex"5678")
-                        ),
+                    ),
                     1234
                 )
             )

packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol

@@ -139,7 +139,7 @@ contract OptimistInviter_Initializer is Test {
                 optimistInviterHelper.getDigestWithEIP712Domain(
                     claimableInvite, _eip712Name, _eip712Version, _eip712Chainid, _eip712VerifyingContract
                 )
-                )
+            )
         );
     }
 

packages/contracts-bedrock/test/vendor/Initializable.t.sol

@@ -133,7 +133,7 @@ contract Initializer_Test is Bridge_Initializer {
                 target: deploy.mustGetAddress("OptimismPortal2"),
                 initCalldata: abi.encodeCall(
                     optimismPortal2.initialize, (disputeGameFactory, systemConfig, superchainConfig)
-                    ),
+                ),
                 initializedSlotVal: deploy.loadInitializedSlot("OptimismPortal2")
             })
         );
@@ -176,7 +176,7 @@ contract Initializer_Test is Bridge_Initializer {
                             optimismMintableERC20Factory: address(0)
                         })
                     )
-                    ),
+                ),
                 initializedSlotVal: deploy.loadInitializedSlot("SystemConfig")
             })
         );
@@ -211,7 +211,7 @@ contract Initializer_Test is Bridge_Initializer {
                             optimismMintableERC20Factory: address(0)
                         })
                     )
-                    ),
+                ),
                 initializedSlotVal: deploy.loadInitializedSlot("SystemConfigProxy")
             })
         );
@@ -221,7 +221,7 @@ contract Initializer_Test is Bridge_Initializer {
                 target: deploy.mustGetAddress("ProtocolVersions"),
                 initCalldata: abi.encodeCall(
                     protocolVersions.initialize, (address(0), ProtocolVersion.wrap(1), ProtocolVersion.wrap(2))
-                    ),
+                ),
                 initializedSlotVal: deploy.loadInitializedSlot("ProtocolVersions")
             })
         );
@@ -231,7 +231,7 @@ contract Initializer_Test is Bridge_Initializer {
                 target: address(protocolVersions),
                 initCalldata: abi.encodeCall(
                     protocolVersions.initialize, (address(0), ProtocolVersion.wrap(1), ProtocolVersion.wrap(2))
-                    ),
+                ),
                 initializedSlotVal: deploy.loadInitializedSlot("ProtocolVersionsProxy")
             })
         );