From 7c6036f3168670fa689e65701f5bf2ed39c317b0 Mon Sep 17 00:00:00 2001
From: Anna Carroll <anna.s.carroll@gmail.com>
Date: Thu, 22 Aug 2024 16:20:16 +0100
Subject: [PATCH] constants, fmt

---
 script/DeployL2.s.sol | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/script/DeployL2.s.sol b/script/DeployL2.s.sol
index cb29b16..85ec218 100644
--- a/script/DeployL2.s.sol
+++ b/script/DeployL2.s.sol
@@ -13,6 +13,10 @@ import {SimpleERC20} from "simple-erc20/SimpleERC20.sol";
 // utils
 import {Script, console2} from "forge-std/Script.sol";
 
+address MINTER = 0x9999999999999999999999999999999999999999;
+address OWNER_ONE = 0x1111111111111111111111111111111111111111;
+address OWNER_TWO = 0x2222222222222222222222222222222222222222;
+
 contract L2Script is Script {
     // deploy:
     // forge script ZenithScript --sig "deployL2()" --fork-url $ANVIL_URL --broadcast
@@ -22,10 +26,10 @@ contract L2Script is Script {
             address permit2,
             address passage,
             address rollupOrders,
-            address wbtc,
-            address usdt,
             address gnosisFactory,
             address gnosisSingleton,
+            address wbtc,
+            address usdt,
             address usdcAdmin
         )
     {
@@ -48,17 +52,16 @@ contract L2Script is Script {
 
         // deploy simple erc20 tokens
         // make minter a recognizable addrs to aid in inspecting storage layout
-        address minter = 0x9999999999999999999999999999999999999999;
-        wbtc = address(new SimpleERC20(minter, "Wrapped BTC", "WBTC"));
-        usdt = address(new SimpleERC20(minter, "Tether USD", "USDT"));
+        wbtc = address(new SimpleERC20(MINTER, "Wrapped BTC", "WBTC"));
+        usdt = address(new SimpleERC20(MINTER, "Tether USD", "USDT"));
         console2.log("wbtc", wbtc);
         console2.log("usdt", usdt);
 
-        // setup the gnosis safe with 2 owners, threshold of 1. 
+        // setup the gnosis safe with 2 owners, threshold of 1.
         // make the owners recognizable addrs to aid in inspecting storage layout
         address[] memory owners = new address[](2);
-        owners[0] = 0x1111111111111111111111111111111111111111;
-        owners[1] = 0x2222222222222222222222222222222222222222;
+        owners[0] = OWNER_ONE;
+        owners[1] = OWNER_TWO;
         SafeSetup memory usdcAdminSetup = SafeSetup({
             owners: owners,
             threshold: 1,
@@ -75,7 +78,7 @@ contract L2Script is Script {
         console2.log("usdcAdmin", usdcAdmin);
 
         // NOTE: must deploy USDC via https://github.com/circlefin/stablecoin-evm/blob/master/scripts/deploy/deploy-fiat-token.s.sol
-        // cannot import USDC deploy script because of git submodules - 
+        // cannot import USDC deploy script because of git submodules -
         // it has a different remapping for openzeppelin contracts and can't compile in this repo
     }
 }