From 424c326b98781369997da0cfdb291ea0b33eff35 Mon Sep 17 00:00:00 2001
From: Ben Sparks <52714090+BenSparksCode@users.noreply.github.com>
Date: Thu, 9 Nov 2023 18:18:57 +0200
Subject: [PATCH] Include new contract addrs in basic atlas deploy script

---
 deployments.json              | 18 +++++++++++++++---
 package.json                  |  5 +++--
 script/base/deploy-base.s.sol |  2 --
 script/deploy-atlas.s.sol     | 10 ++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/deployments.json b/deployments.json
index 6dc6313f..a386fc47 100644
--- a/deployments.json
+++ b/deployments.json
@@ -1,13 +1,21 @@
 {
   "LOCAL": {
-    "ATLAS": "0x38c76A767d45Fc390160449948aF80569E2C4217",
-    "SIMULATOR": "0x721d8077771Ebf9B931733986d619aceea412a1C",
+    "ATLAS": "0x4653251486a57f90Ee89F9f34E098b9218659b83",
+    "ATLAS_FACTORY": "0x89ec9355b1Bcc964e576211c8B011BD709083f8d",
+    "ATLAS_VERIFICATION": "0x72662E4da74278430123cE51405c1e7A1B87C294",
+    "GAS_ACCOUNTING_LIB": "0x52bad4A8584909895C22bdEcf8DBF33314468Fb0",
+    "SAFETY_LOCKS_LIB": "0xed12bE400A07910E4d4E743E4ceE26ab1FC9a961",
+    "SIMULATOR": "0x20Dc424c5fa468CbB1c702308F0cC9c14DA2825C",
     "SWAP_INTENT_DAPP_CONTROL": "0xDC57724Ea354ec925BaFfCA0cCf8A1248a8E5CF1",
     "TX_BUILDER": "0xa8d297D643a11cE83b432e87eEBce6bee0fd2bAb",
     "SIMPLE_RFQ_SOLVER": "0xEb63D671653489B91E653c52a018B63D5095223B"
   },
   "SEPOLIA": {
     "ATLAS": "",
+    "ATLAS_FACTORY": "",
+    "ATLAS_VERIFICATION": "",
+    "GAS_ACCOUNTING_LIB": "",
+    "SAFETY_LOCKS_LIB": "",
     "SIMULATOR": "",
     "SWAP_INTENT_DAPP_CONTROL": "",
     "TX_BUILDER": "",
@@ -15,9 +23,13 @@
   },
   "MAINNET": {
     "ATLAS": "",
+    "ATLAS_FACTORY": "",
+    "ATLAS_VERIFICATION": "",
+    "GAS_ACCOUNTING_LIB": "",
+    "SAFETY_LOCKS_LIB": "",
     "SIMULATOR": "",
     "SWAP_INTENT_DAPP_CONTROL": "",
     "TX_BUILDER": "",
     "SIMPLE_RFQ_SOLVER": ""
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d030db1..169dbee9 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,9 @@
       "anvil": "anvil",
       "anvil-mainnet-fork": "source .env && anvil --fork-url ${MAINNET_RPC_URL} --fork-block-number ${MAINNET_FORK_BLOCK_NUMBER} --code-size-limit ${CODE_SIZE_LIMIT}",
       
-      "deploy-atlas": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${SEPOLIA_RPC_URL} --broadcast",
-      
+      "deploy-atlas-sepolia": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${SEPOLIA_RPC_URL} --broadcast",
+      "deploy-atlas-local": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --fork-url http://localhost:8545 --broadcast",
+
       "deploy-atlas-demo": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --fork-url http://localhost:8545 --broadcast --non-interactive",
       "deploy-atlas-swap-intent": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasAndSwapIntentDAppControlScript --fork-url http://localhost:8545 --broadcast --non-interactive",
       "deploy-atlas-swap-intent-tx-builder": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasAndSwapIntentDAppControlAndTxBuilderScript --fork-url http://localhost:8545 --broadcast --non-interactive",
diff --git a/script/base/deploy-base.s.sol b/script/base/deploy-base.s.sol
index 93832b99..4907b47c 100644
--- a/script/base/deploy-base.s.sol
+++ b/script/base/deploy-base.s.sol
@@ -7,8 +7,6 @@ import "forge-std/StdJson.sol";
 
 import {ERC20} from "solmate/tokens/ERC20.sol";
 
-
-
 contract DeployBaseScript is Script {
     using stdJson for string;
 
diff --git a/script/deploy-atlas.s.sol b/script/deploy-atlas.s.sol
index bf03266c..9a0c264d 100644
--- a/script/deploy-atlas.s.sol
+++ b/script/deploy-atlas.s.sol
@@ -84,11 +84,21 @@ contract DeployAtlasScript is DeployBaseScript {
         vm.stopBroadcast();
 
         _writeAddressToDeploymentsJson("ATLAS", address(atlas));
+        _writeAddressToDeploymentsJson("ATLAS_FACTORY", address(atlasFactory));
+        _writeAddressToDeploymentsJson("ATLAS_VERIFICATION", address(atlasVerification));
+        _writeAddressToDeploymentsJson("GAS_ACCOUNTING_LIB", address(gasAccountingLib));
+        _writeAddressToDeploymentsJson("SAFETY_LOCKS_LIB", address(safetyLocksLib));
         _writeAddressToDeploymentsJson("SIMULATOR", address(simulator));
 
         console.log("\n");
         console.log("Atlas deployed at: \t\t\t\t", address(atlas));
+        console.log("AtlasFactory deployed at: \t\t\t", address(atlasFactory));
+        console.log("AtlasVerification deployed at: \t\t", address(atlasVerification));
+        console.log("GasAccountingLib deployed at: \t\t", address(gasAccountingLib));
+        console.log("SafetyLocksLib deployed at: \t\t\t", address(safetyLocksLib));
         console.log("Simulator deployed at: \t\t\t", address(simulator));
+        console.log("\n");
+        console.log("You can find a list of contract addresses from the latest deployment in deployments.json");
     }
 }