Merge pull request #77 from Uniswap/deployer-update

Final Deployer Preparations

Author: marktoda

.github/workflows/ci.yml

@@ -52,3 +52,4 @@ jobs:
           FOUNDRY_PROFILE: pr
           FORGE_SNAPSHOT_CHECK: true
           MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+          UNICHAIN_RPC_URL: ${{ secrets.UNICHAIN_RPC_URL }}

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "lib/BokkyPooBahsDateTimeLibrary"]
 	path = lib/BokkyPooBahsDateTimeLibrary
 	url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary
+[submodule "lib/dao-signer"]
+	path = lib/dao-signer
+	url = https://github.com/ScopeLift/dao-signer

foundry.lock

@@ -5,6 +5,9 @@
   "lib/briefcase": {
     "rev": "62c718ec25b64ecc95b4e09c2751134d78b89a4f"
   },
+  "lib/dao-signer": {
+    "rev": "ee1e73fbda9b3328aca30d9e42ca78819f4383a3"
+  },
   "lib/forge-std": {
     "rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
   },

foundry.toml

@@ -1,39 +1,41 @@
 [profile.default]
-  evm_version = "cancun"
-  optimizer = true
-  optimizer_runs = 10_000_000
-  solc_version = "0.8.29"
-  verbosity = 3
-  gas_limit = "9223372036854775807"
-  no_match_test = "test_fuzz_gas_release_malicious"
+evm_version = "cancun"
+optimizer = true
+optimizer_runs = 10_000_000
+solc_version = "0.8.29"
+verbosity = 3
+gas_limit = "9223372036854775807"
+no_match_test = "test_fuzz_gas_release_malicious"
 
 [rpc_endpoints]
-  mainnet = "${MAINNET_RPC_URL}"
+mainnet = "${MAINNET_RPC_URL}"
+unichain = "${UNICHAIN_RPC_URL}"
 
 [profile.ci]
-  fuzz = { runs = 5000 }
-  invariant = { runs = 1000 }
+fuzz = { runs = 5000 }
+invariant = { runs = 1000 }
 
 [profile.coverage]
-  fuzz = { runs = 100 }
-  invariant = { runs = 0 }
+fuzz = { runs = 100 }
+invariant = { runs = 0 }
 
 [profile.lite]
-  fuzz = { runs = 50 }
-  invariant = { runs = 10 }
-  # Speed up compilation and tests during development.
-  optimizer = false
+fuzz = { runs = 50 }
+invariant = { runs = 10 }
+# Speed up compilation and tests during development.
+optimizer = false
 
 [fmt]
-  bracket_spacing = false
-  int_types = "long"
-  line_length = 100
-  multiline_func_header = "attributes_first"
-  number_underscore = "thousands"
-  quote_style = "double"
-  single_line_statement_blocks = "single"
-  tab_width = 2
-  wrap_comments = true
+bracket_spacing = false
+int_types = "long"
+line_length = 100
+multiline_func_header = "attributes_first"
+number_underscore = "thousands"
+quote_style = "double"
+single_line_statement_blocks = "single"
+tab_width = 2
+wrap_comments = true
 
 [lint]
-exclude_lints = ["mixed-case-variable", "mixed-case-function"]
+exclude_lints = ["mixed-case-variable", "mixed-case-function"]
+

lib/dao-signer

@@ -1,2 +1,3 @@
 solmate/=lib/solmate/
 @eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock
+eas-contracts/=lib/dao-signer/lib/eas-contracts/contracts/

remappings.txt

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {console2} from "forge-std/console2.sol";
+import "forge-std/Script.sol";
+import {MainnetDeployer} from "./deployers/MainnetDeployer.sol";
+
+contract DeployMainnet is Script {
+  function setUp() public {}
+
+  function run() public {
+    require(block.chainid == 1, "Not mainnet");
+
+    vm.startBroadcast();
+
+    MainnetDeployer deployer = new MainnetDeployer();
+    console2.log("Deployed Deployer at:", address(deployer));
+    console2.log("TOKEN_JAR at:", address(deployer.TOKEN_JAR()));
+    console2.log("RELEASER at:", address(deployer.RELEASER()));
+    console2.log("V3_FEE_ADAPTER at:", address(deployer.V3_FEE_ADAPTER()));
+    console2.log("UNI_VESTING at:", address(deployer.UNI_VESTING()));
+
+    vm.stopBroadcast();
+  }
+}

script/01_DeployMainnet.s.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {console2} from "forge-std/console2.sol";
+import {Script} from "forge-std/Script.sol";
+import {UnichainDeployer} from "./deployers/UnichainDeployer.sol";
+import {OptimismBridgedResourceFirepit} from "../src/releasers/OptimismBridgedResourceFirepit.sol";
+
+contract DeployUnichain is Script {
+  function setUp() public {}
+
+  function run() public {
+    require(block.chainid == 130, "Not Unichain");
+
+    vm.startBroadcast();
+
+    UnichainDeployer deployer = new UnichainDeployer();
+    console2.log("Deployed Deployer at:", address(deployer));
+    console2.log("TOKEN_JAR at:", address(deployer.TOKEN_JAR()));
+    console2.log("RELEASER at:", address(deployer.RELEASER()));
+
+    vm.stopBroadcast();
+  }
+}

script/02_DeployUnichain.s.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity ^0.8.29;
+
+import {Script, console2} from "forge-std/Script.sol";
+import {IAgreementAnchorFactory} from "dao-signer/src/interfaces/IAgreementAnchorFactory.sol";
+import {AgreementAnchor} from "dao-signer/src/AgreementAnchor.sol";
+
+contract CreateAgreementAnchors is Script {
+  IAgreementAnchorFactory public constant AGREEMENT_ANCHOR_FACTORY =
+    IAgreementAnchorFactory(0x5Ef3cCf9eC7E0af61E1767b2EEbB50e052b5Df47);
+
+  // TODO: set content hashes and counterparty addresses for DUNI agreements
+  bytes32 public constant AGREEMENT_ANCHOR_1_CONTENT_HASH = "";
+  address public constant AGREEMENT_ANCHOR_1_COUNTER_SIGNER = address(0);
+  bytes32 public constant AGREEMENT_ANCHOR_2_CONTENT_HASH = "";
+  address public constant AGREEMENT_ANCHOR_2_COUNTER_SIGNER = address(0);
+
+  function run() public returns (address, address) {
+    require(block.chainid == 1, "Not mainnet");
+    vm.startBroadcast();
+    address agreementAnchor1 = address(
+      AGREEMENT_ANCHOR_FACTORY.createAgreementAnchor(
+        AGREEMENT_ANCHOR_1_CONTENT_HASH, AGREEMENT_ANCHOR_1_COUNTER_SIGNER
+      )
+    );
+
+    address agreementAnchor2 = address(
+      AGREEMENT_ANCHOR_FACTORY.createAgreementAnchor(
+        AGREEMENT_ANCHOR_2_CONTENT_HASH, AGREEMENT_ANCHOR_2_COUNTER_SIGNER
+      )
+    );
+    console2.log("Agreement Anchor 1:", agreementAnchor1);
+    console2.log("Agreement Anchor 2:", agreementAnchor2);
+    vm.stopBroadcast();
+    return (agreementAnchor1, agreementAnchor2);
+  }
+}