deploy: whitelist with gateway (#84)

* deploy whitelist with gateway * add json deploy artifact print
primev · Feb 29, 2024 · 511b6f5 · 511b6f5
1 parent 6adab5a
commit 511b6f5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/scripts/DeployScripts.s.sol b/scripts/DeployScripts.s.sol
@@ -77,6 +77,8 @@ contract DeployScript is Script, Create2Deployer {
 contract DeployWhitelist is Script, Create2Deployer {
     function run() external {
 
+        console.log("Warning: DeployWhitelist is deprecated and only for backwards compatibility with hyperlane");
+
         address expectedWhiteListAddr = 0x57508f0B0f3426758F1f3D63ad4935a7c9383620;
         if (isContractDeployed(expectedWhiteListAddr)) {
             console.log("Whitelist already deployed to:", expectedWhiteListAddr);

diff --git a/scripts/DeployStandardBridge.s.sol b/scripts/DeployStandardBridge.s.sol
@@ -4,18 +4,12 @@ import "forge-std/Script.sol";
 import {Create2Deployer} from "scripts/DeployScripts.s.sol";
 import {SettlementGateway} from "contracts/standard-bridge/SettlementGateway.sol";
 import {L1Gateway} from "contracts/standard-bridge/L1Gateway.sol";
+import {Whitelist} from "contracts/Whitelist.sol";
+import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 
 contract DeploySettlementGateway is Script, Create2Deployer {
     function run() external {
 
-        // Note this addr is dependant on values given to contract constructor
-        address expectedAddr = 0xc1f93bE11D7472c9B9a4d87B41dD0a491F1fbc75;
-        if (isContractDeployed(expectedAddr)) {
-            console.log("Standard bridge gateway on settlement chain already deployed to:",
-                expectedAddr);
-            return;
-        }
-
         vm.startBroadcast();
 
         checkCreate2Deployed();
@@ -25,8 +19,12 @@ contract DeploySettlementGateway is Script, Create2Deployer {
         bytes32 salt = 0x8989000000000000000000000000000000000000000000000000000000000000;
 
         address expectedWhitelistAddr = 0x57508f0B0f3426758F1f3D63ad4935a7c9383620;
-        address relayerAddr = vm.envAddress("RELAYER_ADDR");
+        if (isContractDeployed(expectedWhitelistAddr)) {
+            console.log("Whitelist must not be deployed to execute DeploySettlementGateway script. Exiting...");
+            return;
+        }
 
+        address relayerAddr = vm.envAddress("RELAYER_ADDR");
         SettlementGateway gateway = new SettlementGateway{salt: salt}(
             expectedWhitelistAddr,
             msg.sender, // Owner
@@ -35,21 +33,33 @@ contract DeploySettlementGateway is Script, Create2Deployer {
         console.log("Standard bridge gateway for settlement chain deployed to:",
             address(gateway));
 
+        Whitelist whitelist = new Whitelist{salt: salt}(msg.sender);
+        console.log("Whitelist deployed to:", address(whitelist));
+
+        if (!isContractDeployed(expectedWhitelistAddr)) {
+            console.log("Whitelist not deployed to expected address:", expectedWhitelistAddr);
+            return;
+        }
+
+        whitelist.addToWhitelist(address(gateway));
+        console.log("Settlement gateway has been whitelisted. Gateway contract address:", address(gateway));
+
+        string memory jsonOutput = string.concat(
+            '{"settlement_gateway_addr": "',
+            Strings.toHexString(address(gateway)),
+            '", "whitelist_addr": "',
+            Strings.toHexString(address(whitelist)),
+            '"}'
+        );
+        console.log("JSON_DEPLOY_ARTIFACT:", jsonOutput); 
+
         vm.stopBroadcast();
     }
 }
 
 contract DeployL1Gateway is Script, Create2Deployer {
     function run() external {
 
-        // Note this addr is dependant on values given to contract constructor
-        address expectedAddr = 0x1a18dfEc4f2B66207b1Ad30aB5c7A0d62Ef4A40b;
-        if (isContractDeployed(expectedAddr)) {
-            console.log("Standard bridge gateway on l1 already deployed to:",
-                expectedAddr);
-            return;
-        }
-
         vm.startBroadcast();
 
         checkCreate2Deployed();
@@ -66,6 +76,13 @@ contract DeployL1Gateway is Script, Create2Deployer {
             1, 1); // Fees set to 1 wei for now
         console.log("Standard bridge gateway for l1 deployed to:",
             address(gateway));
+
+        string memory jsonOutput = string.concat(
+            '{"l1_gateway_addr": "',
+            Strings.toHexString(address(gateway)),
+            '"}'
+        );
+        console.log("JSON_DEPLOY_ARTIFACT:", jsonOutput);
 
         vm.stopBroadcast();
     }