style(ev-deployer): fix rustfmt formatting

Author: randygrok

bin/ev-deployer/src/contracts/admin_proxy.rs

@@ -12,7 +12,6 @@ pub(crate) const ADMIN_PROXY_BYTECODE: &[u8] = &hex!("60806040526004361061007e57
 /// Regenerate with: `cd contracts && forge inspect AdminProxy bytecode`
 pub(crate) const ADMIN_PROXY_INITCODE: &[u8] = &hex!("6080604052348015600e575f5ffd5b506112ab8061001c5f395ff3fe60806040526004361061007e575f3560e01c80638da5cb5b1161004d5780638da5cb5b1461012d578063e30c397814610157578063f2fde38b14610181578063fa4bb79d146101a957610085565b806318dfb3c7146100895780631cff79cd146100c557806379ba5097146101015780638b5298541461011757610085565b3661008557005b5f5ffd5b348015610094575f5ffd5b506100af60048036038101906100aa9190610cf8565b6101e5565b6040516100bc9190610ea1565b60405180910390f35b3480156100d0575f5ffd5b506100eb60048036038101906100e69190610f70565b6104d9565b6040516100f89190611015565b60405180910390f35b34801561010c575f5ffd5b5061011561066c565b005b348015610122575f5ffd5b5061012b6107ed565b005b348015610138575f5ffd5b506101416108b4565b60405161014e9190611044565b60405180910390f35b348015610162575f5ffd5b5061016b6108d8565b6040516101789190611044565b60405180910390f35b34801561018c575f5ffd5b506101a760048036038101906101a2919061105d565b6108fd565b005b3480156101b4575f5ffd5b506101cf60048036038101906101ca91906110bb565b610aa4565b6040516101dc9190611015565b60405180910390f35b60605f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461026c576040517f30cd747100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8282905085859050146102ab576040517fff633a3800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8484905067ffffffffffffffff8111156102c8576102c761112c565b5b6040519080825280602002602001820160405280156102fb57816020015b60608152602001906001900390816102e65790505b5090505f5f90505b858590508110156104d0575f5f87878481811061032357610322611159565b5b9050602002016020810190610338919061105d565b73ffffffffffffffffffffffffffffffffffffffff1686868581811061036157610360611159565b5b90506020028101906103739190611192565b604051610381929190611230565b5f604051808303815f865af19150503d805f81146103ba576040519150601f19603f3d011682016040523d82523d5f602084013e6103bf565b606091505b50915091508161040657806040517fa5fa8d2b0000000000000000000000000000000000000000000000000000000081526004016103fd9190611015565b60405180910390fd5b87878481811061041957610418611159565b5b905060200201602081019061042e919061105d565b73ffffffffffffffffffffffffffffffffffffffff167fc96720f35dd524e76ea92971ce13d08e9a17816bf3b0008a7083e6032354ebb587878681811061047857610477611159565b5b905060200281019061048a9190611192565b8460405161049a93929190611274565b60405180910390a2808484815181106104b6576104b5611159565b5b602002602001018190525050508080600101915050610303565b50949350505050565b60605f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610560576040517f30cd747100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f5f8573ffffffffffffffffffffffffffffffffffffffff168585604051610589929190611230565b5f604051808303815f865af19150503d805f81146105c2576040519150601f19603f3d011682016040523d82523d5f602084013e6105c7565b606091505b50915091508161060e57806040517fa5fa8d2b0000000000000000000000000000000000000000000000000000000081526004016106059190611015565b60405180910390fd5b8573ffffffffffffffffffffffffffffffffffffffff167fc96720f35dd524e76ea92971ce13d08e9a17816bf3b0008a7083e6032354ebb586868460405161065893929190611274565b60405180910390a280925050509392505050565b60015f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146106f2576040517f1853971c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff165f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3335f5f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505f60015f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610872576040517f30cd747100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f60015f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610982576040517f30cd747100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f73ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036109e7576040517fd92e233d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8060015f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508073ffffffffffffffffffffffffffffffffffffffff165f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b60605f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b2b576040517f30cd747100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f5f8673ffffffffffffffffffffffffffffffffffffffff16848787604051610b55929190611230565b5f6040518083038185875af1925050503d805f8114610b8f576040519150601f19603f3d011682016040523d82523d5f602084013e610b94565b606091505b509150915081610bdb57806040517fa5fa8d2b000000000000000000000000000000000000000000000000000000008152600401610bd29190611015565b60405180910390fd5b8673ffffffffffffffffffffffffffffffffffffffff167fc96720f35dd524e76ea92971ce13d08e9a17816bf3b0008a7083e6032354ebb5878784604051610c2593929190611274565b60405180910390a28092505050949350505050565b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5f83601f840112610c6357610c62610c42565b5b8235905067ffffffffffffffff811115610c8057610c7f610c46565b5b602083019150836020820283011115610c9c57610c9b610c4a565b5b9250929050565b5f5f83601f840112610cb857610cb7610c42565b5b8235905067ffffffffffffffff811115610cd557610cd4610c46565b5b602083019150836020820283011115610cf157610cf0610c4a565b5b9250929050565b5f5f5f5f60408587031215610d1057610d0f610c3a565b5b5f85013567ffffffffffffffff811115610d2d57610d2c610c3e565b5b610d3987828801610c4e565b9450945050602085013567ffffffffffffffff811115610d5c57610d5b610c3e565b5b610d6887828801610ca3565b925092505092959194509250565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b5f81519050919050565b5f82825260208201905092915050565b8281835e5f83830152505050565b5f601f19601f8301169050919050565b5f610de182610d9f565b610deb8185610da9565b9350610dfb818560208601610db9565b610e0481610dc7565b840191505092915050565b5f610e1a8383610dd7565b905092915050565b5f602082019050919050565b5f610e3882610d76565b610e428185610d80565b935083602082028501610e5485610d90565b805f5b85811015610e8f5784840389528151610e708582610e0f565b9450610e7b83610e22565b925060208a01995050600181019050610e57565b50829750879550505050505092915050565b5f6020820190508181035f830152610eb98184610e2e565b905092915050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f610eea82610ec1565b9050919050565b610efa81610ee0565b8114610f04575f5ffd5b50565b5f81359050610f1581610ef1565b92915050565b5f5f83601f840112610f3057610f2f610c42565b5b8235905067ffffffffffffffff811115610f4d57610f4c610c46565b5b602083019150836001820283011115610f6957610f68610c4a565b5b9250929050565b5f5f5f60408486031215610f8757610f86610c3a565b5b5f610f9486828701610f07565b935050602084013567ffffffffffffffff811115610fb557610fb4610c3e565b5b610fc186828701610f1b565b92509250509250925092565b5f82825260208201905092915050565b5f610fe782610d9f565b610ff18185610fcd565b9350611001818560208601610db9565b61100a81610dc7565b840191505092915050565b5f6020820190508181035f83015261102d8184610fdd565b905092915050565b61103e81610ee0565b82525050565b5f6020820190506110575f830184611035565b92915050565b5f6020828403121561107257611071610c3a565b5b5f61107f84828501610f07565b91505092915050565b5f819050919050565b61109a81611088565b81146110a4575f5ffd5b50565b5f813590506110b581611091565b92915050565b5f5f5f5f606085870312156110d3576110d2610c3a565b5b5f6110e087828801610f07565b945050602085013567ffffffffffffffff81111561110157611100610c3e565b5b61110d87828801610f1b565b93509350506040611120878288016110a7565b91505092959194509250565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5f833560016020038436030381126111ae576111ad611186565b5b80840192508235915067ffffffffffffffff8211156111d0576111cf61118a565b5b6020830192506001820236038313156111ec576111eb61118e565b5b509250929050565b5f81905092915050565b828183375f83830152505050565b5f61121783856111f4565b93506112248385846111fe565b82840190509392505050565b5f61123c82848661120c565b91508190509392505050565b5f6112538385610fcd565b93506112608385846111fe565b61126983610dc7565b840190509392505050565b5f6040820190508181035f83015261128d818587611248565b905081810360208301526112a18184610fdd565b905094935050505056");
 
-
 /// Build a genesis alloc entry for `AdminProxy`.
 pub(crate) fn build(config: &AdminProxyConfig) -> GenesisContract {
     let address = config.address.expect("address required for genesis");

bin/ev-deployer/src/deploy/create2.rs

@@ -1,11 +1,12 @@
 //! CREATE2 address computation.
 
-use alloy_primitives::{Address, Bytes, B256, keccak256};
+use alloy_primitives::{keccak256, Address, Bytes, B256};
 
 /// The deterministic deployer factory address (Nick's factory).
 /// See: https://github.com/Arachnid/deterministic-deployment-proxy
-pub(crate) const DETERMINISTIC_DEPLOYER: Address =
-    Address::new(alloy_primitives::hex!("4e59b44847b379578588920ca78fbf26c0b4956c"));
+pub(crate) const DETERMINISTIC_DEPLOYER: Address = Address::new(alloy_primitives::hex!(
+    "4e59b44847b379578588920ca78fbf26c0b4956c"
+));
 
 /// Compute the CREATE2 address for a contract deployed via the deterministic deployer.
 ///

bin/ev-deployer/src/deploy/deployer.rs

@@ -37,7 +37,9 @@ pub(crate) struct LiveDeployer {
 impl LiveDeployer {
     /// Create a new LiveDeployer from an RPC URL and a hex-encoded private key.
     pub(crate) fn new(rpc_url: &str, private_key_hex: &str) -> eyre::Result<Self> {
-        let key_hex = private_key_hex.strip_prefix("0x").unwrap_or(private_key_hex);
+        let key_hex = private_key_hex
+            .strip_prefix("0x")
+            .unwrap_or(private_key_hex);
         let signer: PrivateKeySigner = key_hex.parse()?;
         let wallet = EthereumWallet::from(signer);
 

bin/ev-deployer/src/deploy/pipeline.rs

@@ -99,8 +99,7 @@ pub(crate) async fn run(
         let initcode = contracts::permit2::PERMIT2_INITCODE.to_vec();
         let address = compute_address(salt, &initcode);
 
-        let expected_runtime =
-            contracts::permit2::expected_runtime_bytecode(chain_id, address);
+        let expected_runtime = contracts::permit2::expected_runtime_bytecode(chain_id, address);
 
         deploy_contract(
             deployer,
@@ -242,8 +241,7 @@ async fn verify_all(
     if let Some(ref cs) = state.contracts.permit2 {
         if cs.status == ContractStatus::Deployed {
             let on_chain = deployer.get_code(cs.address).await?;
-            let expected =
-                contracts::permit2::expected_runtime_bytecode(chain_id, cs.address);
+            let expected = contracts::permit2::expected_runtime_bytecode(chain_id, cs.address);
             eyre::ensure!(
                 on_chain.as_ref() == expected.as_slice(),
                 "bytecode mismatch at {}: expected {} bytes, got {} bytes",
@@ -338,33 +336,22 @@ mod tests {
                 .unwrap_or_default())
         }
 
-        async fn deploy_create2(
-            &self,
-            salt: B256,
-            initcode: &[u8],
-        ) -> eyre::Result<TxReceipt> {
-            self.deploys
-                .lock()
-                .unwrap()
-                .push((salt, initcode.to_vec()));
+        async fn deploy_create2(&self, salt: B256, initcode: &[u8]) -> eyre::Result<TxReceipt> {
+            self.deploys.lock().unwrap().push((salt, initcode.to_vec()));
 
             // Simulate: place the expected runtime bytecode at the computed address
             let address = compute_address(salt, initcode);
 
             // Determine which contract this is based on initcode
-            let runtime =
-                if initcode.len() > contracts::admin_proxy::ADMIN_PROXY_INITCODE.len()
-                    && initcode[..contracts::admin_proxy::ADMIN_PROXY_INITCODE.len()]
-                        == *contracts::admin_proxy::ADMIN_PROXY_INITCODE
-                {
-                    Bytes::from_static(contracts::admin_proxy::ADMIN_PROXY_BYTECODE)
-                } else {
-                    let runtime = contracts::permit2::expected_runtime_bytecode(
-                        self.chain_id,
-                        address,
-                    );
-                    Bytes::from(runtime)
-                };
+            let runtime = if initcode.len() > contracts::admin_proxy::ADMIN_PROXY_INITCODE.len()
+                && initcode[..contracts::admin_proxy::ADMIN_PROXY_INITCODE.len()]
+                    == *contracts::admin_proxy::ADMIN_PROXY_INITCODE
+            {
+                Bytes::from_static(contracts::admin_proxy::ADMIN_PROXY_BYTECODE)
+            } else {
+                let runtime = contracts::permit2::expected_runtime_bytecode(self.chain_id, address);
+                Bytes::from(runtime)
+            };
 
             self.code.lock().unwrap().insert(address, runtime);
 

bin/ev-deployer/src/deploy/state.rs

@@ -122,7 +122,9 @@ impl DeployState {
                     new_ap.owner
                 );
             } else {
-                eyre::bail!("immutability violation: admin_proxy was configured but is now missing");
+                eyre::bail!(
+                    "immutability violation: admin_proxy was configured but is now missing"
+                );
             }
         }
 
@@ -147,11 +149,7 @@ impl AppliedIntent {
                 .admin_proxy
                 .as_ref()
                 .map(|ap| AppliedAdminProxy { owner: ap.owner }),
-            permit2: config
-                .contracts
-                .permit2
-                .as_ref()
-                .map(|_| AppliedPermit2 {}),
+            permit2: config.contracts.permit2.as_ref().map(|_| AppliedPermit2 {}),
         }
     }
 }

bin/ev-deployer/src/output.rs

@@ -18,10 +18,7 @@ pub(crate) fn build_manifest(config: &DeployConfig) -> Value {
 
     if let Some(ref p2) = config.contracts.permit2 {
         if let Some(addr) = p2.address {
-            manifest.insert(
-                "permit2".to_string(),
-                Value::String(format!("{}", addr)),
-            );
+            manifest.insert("permit2".to_string(), Value::String(format!("{}", addr)));
         }
     }