From aa1ae96b8d56b9b444756a1cf4d32aad691a7b4b Mon Sep 17 00:00:00 2001
From: DanielZlotin <danielzlotin@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:44:54 +0200
Subject: [PATCH] refactor

---
 script/00_DeployAdmin.s.sol   |  8 +-------
 script/02_DeployReactor.s.sol |  5 +----
 script/deployall              | 29 ++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/script/00_DeployAdmin.s.sol b/script/00_DeployAdmin.s.sol
index 225afde..f22f90b 100644
--- a/script/00_DeployAdmin.s.sol
+++ b/script/00_DeployAdmin.s.sol
@@ -6,20 +6,14 @@ import "forge-std/Script.sol";
 import {BaseScript, Admin} from "script/base/BaseScript.sol";
 
 contract DeployAdmin is BaseScript {
-    //address fee00 = _admin(owner, weth, 0x55669ad6a3db66a4a3bbfe640c9faa64095a75a5228cf52464f4a449257ee6c5);
-    //address fee01 = _admin(owner, weth, 0xab1462bd378a47c5676f45ed8b1f1de08ddf212e2525b6c82e7c2c11c41590d2);
-    //address fee02 = _admin(owner, weth, 0x668fa19c8dfec98130ebcc64b727ecf11105987af78936a05550a1f6679b16cc);
-    //address fee03 = _admin(owner, weth, 0x7622f2bb307bda72700fbabe78b8f2bc76c8d4f214e47ca34aa96b4e980947ce);
-
     function run() public returns (address admin) {
         address owner = vm.envAddress("OWNER");
         address weth = vm.envAddress("WETH");
+        bytes32 salt = vm.envOr("SALT", bytes32(uint256(0x9563)));
 
         bytes32 initCodeHash = hashInitCode(type(Admin).creationCode, abi.encode(owner));
         console.logBytes32(initCodeHash);
 
-        bytes32 salt = bytes32(uint256(0x9563));
-
         admin = computeCreate2Address(salt, initCodeHash);
 
         if (admin.code.length == 0) {
diff --git a/script/02_DeployReactor.s.sol b/script/02_DeployReactor.s.sol
index 34eb46c..65c7d0b 100644
--- a/script/02_DeployReactor.s.sol
+++ b/script/02_DeployReactor.s.sol
@@ -8,11 +8,8 @@ import {BaseScript, Admin, Consts} from "script/base/BaseScript.sol";
 import {ExclusiveDutchOrderReactor, IPermit2} from "uniswapx/src/reactors/ExclusiveDutchOrderReactor.sol";
 
 contract DeployReactor is BaseScript {
-    //reactor = _reactor(bytes32(uint256(0)));
-    //reactor2 = _reactor(bytes32(uint256(1)));
-
     function run() public returns (address reactor) {
-        bytes32 salt = vm.envOr("SALT", bytes32(0));
+        bytes32 salt = vm.envOr("SALT", bytes32(uint256(0)));
 
         bytes32 initCodeHash =
             hashInitCode(type(ExclusiveDutchOrderReactor).creationCode, abi.encode(Consts.PERMIT2_ADDRESS, address(0)));
diff --git a/script/deployall b/script/deployall
index 87e9d68..b1efb2e 100755
--- a/script/deployall
+++ b/script/deployall
@@ -17,25 +17,44 @@ echo $chains | tr ' ' '\n' | parallel --keep-order "
     export REACTOR=$(jq -r '."*".reactor' $deployments);
     export REPERMIT=$(jq -r '."*".repermit' $deployments);
 
-    #forge script DeployAdmin ${b:+--broadcast};
+    forge script DeployAdmin ${b:+--broadcast};
     echo \"✔ admin\n\"
 
-    #forge script UpdateWhitelist ${b:+--broadcast};
+    export SALT="0x55669ad6a3db66a4a3bbfe640c9faa64095a75a5228cf52464f4a449257ee6c5"
+    forge script DeployAdmin ${b:+--broadcast};
+    echo \"✔ admin fee0\n\"
+
+    export SALT="0xab1462bd378a47c5676f45ed8b1f1de08ddf212e2525b6c82e7c2c11c41590d2"
+    forge script DeployAdmin ${b:+--broadcast};
+    echo \"✔ admin fee1\n\"
+
+    export SALT="0x668fa19c8dfec98130ebcc64b727ecf11105987af78936a05550a1f6679b16cc"
+    forge script DeployAdmin ${b:+--broadcast};
+    echo \"✔ admin fee2\n\"
+
+    export SALT="0x7622f2bb307bda72700fbabe78b8f2bc76c8d4f214e47ca34aa96b4e980947ce"
+    forge script DeployAdmin ${b:+--broadcast};
+    echo \"✔ admin fee3\n\"
+    unset SALT
+
+    forge script UpdateWhitelist ${b:+--broadcast};
     echo \"✔ whitelist\n\"
 
-    #forge script DeployReactor ${b:+--broadcast};
+    forge script DeployReactor ${b:+--broadcast};
     echo \"✔ reactor\n\"
 
     export SALT="0x0000000000000000000000000000000000000000000000000000000000000001"
     forge script DeployReactor ${b:+--broadcast};
     echo \"✔ reactor2\n\"
+    unset SALT
 
     forge script DeployExecutor ${b:+--broadcast};
     echo \"✔ executor\n\"
 
 #    forge script DeployRepermit ${b:+--broadcast};
-    echo \"✔ repermit\n\"
+#    echo \"✔ repermit\n\"
 
 #    forge script DeployPartial ${b:+--broadcast};
-    echo \"✔ partial\n\"
+#    echo \"✔ partial\n\"
+
 "