ARM Router

.gitignore

@@ -24,6 +24,7 @@ artifacts
 
 # Forge
 .gas-snapshot
+snapshots/
 dependencies/
 soldeer.lock
 

Makefile

@@ -13,7 +13,7 @@ install:
 	yarn install
 
 clean:
-	@rm -rf broadcast cache out
+	@rm -rf broadcast cache out snapshots
 
 clean-all:
 	@rm -rf broadcast cache out dependencies node_modules soldeer.lock yarn.lock lcov.info lcov.info.pruned artifacts cache_hardhat

foundry.toml

@@ -6,13 +6,14 @@ verbosity = 3
 sender = "0x0165C55EF814dEFdd658532A48Bd17B2c8356322"
 tx_origin = "0x0165C55EF814dEFdd658532A48Bd17B2c8356322"
 auto_detect_remappings = false
-gas_reports = ["OethARM", "Proxy", "LidoARM", "OriginARM"]
+gas_reports = ["OethARM", "Proxy", "LidoARM", "OriginARM", "ARMRouter"]
 fs_permissions = [{ access = "read-write", path = "./build" }]
 extra_output_files = ["metadata"]
 ignored_warnings_from = ["src/contracts/Proxy.sol"]
 optimizer = true
-optimizer_runs = 200
+optimizer_runs = 50000
 ffi = true
+gas_snapshot_check = false
 
 # About remappings: 
 # - @pendle-sy use a different version of oz contracts than the one used in the rest of the project.
@@ -26,6 +27,7 @@ remappings = [
   "test/=./test",
   "utils/=./src/contracts/utils",
   # Manage dependencies remappings
+  "@solady/=dependencies/solady-1.0.0/src/",
   "@solmate/=dependencies/solmate-6.7.0/src/",
   "forge-std/=dependencies/forge-std-1.9.7/src/",
   "@pendle-sy/=dependencies/@pendle-sy-1.0.0-1.0.0/contracts/",
@@ -70,6 +72,7 @@ forge-std = "1.9.7"
 "@openzeppelin-contracts-5.0.2" = { version = "5.0.2", git = "https://github.com/OpenZeppelin/openzeppelin-contracts.git", rev = "dbb6104ce834628e473d2173bbc9d47f81a9eec3" }
 "@openzeppelin-contracts-upgradeable-4.9.3" = { version = "4.9.3", git = "https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable.git", rev = "3d4c0d5741b131c231e558d7a6213392ab3672a5" }
 "@openzeppelin-contracts-upgradeable-5.0.2" = { version = "5.0.2", git = "https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable.git", rev = "723f8cab09cdae1aca9ec9cc1cfa040c2d4b06c1" }
+solady = { version = "1.0.0", git = "https://github.com/Vectorized/solady.git", rev = "73f13dd1483707ef6b4d16cb0543570b7e1715a8" }
 
 [soldeer]
 recursive_deps = false

script/deploy/DeployManager.sol

@@ -25,6 +25,7 @@ import {UpgradeOriginARMSetBufferScript} from "./sonic/005_UpgradeOriginARMSetBu
 import {UpgradeLidoARMAssetScript} from "./mainnet/010_UpgradeLidoARMAssetScript.sol";
 import {DeployEtherFiARMScript} from "./mainnet/011_DeployEtherFiARMScript.sol";
 import {UpgradeEtherFiARMScript} from "./mainnet/012_UpgradeEtherFiARMScript.sol";
+import {DeployRouterScript} from "./mainnet/013_DeployRouterScript.sol";
 
 contract DeployManager is Script {
     using stdJson for string;
@@ -86,6 +87,7 @@ contract DeployManager is Script {
             _runDeployFile(new UpgradeLidoARMAssetScript());
             _runDeployFile(new DeployEtherFiARMScript());
             _runDeployFile(new UpgradeEtherFiARMScript());
+            _runDeployFile(new DeployRouterScript());
         } else if (block.chainid == 17000) {
             // Holesky
             _runDeployFile(new DeployCoreHoleskyScript());

script/deploy/mainnet/013_DeployRouterScript.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.23;
+
+// Foundry imports
+import {console} from "forge-std/console.sol";
+
+// Contract imports
+import {ARMRouter} from "contracts/ARMRouter.sol";
+import {Mainnet} from "contracts/utils/Addresses.sol";
+
+// Deployment imports
+import {GovProposal, GovSixHelper} from "contracts/utils/GovSixHelper.sol";
+import {AbstractDeployScript} from "../AbstractDeployScript.sol";
+
+contract DeployRouterScript is AbstractDeployScript {
+    using GovSixHelper for GovProposal;
+
+    GovProposal public govProposal;
+
+    string public constant override DEPLOY_NAME = "013_DeployRouterScript";
+    bool public constant override proposalExecuted = false;
+
+    function _execute() internal override {
+        console.log("Deploy:", DEPLOY_NAME);
+        console.log("------------");
+
+        // 1. Deploy ARM Router
+        _recordDeploy("ARM_ROUTER", address(new ARMRouter(Mainnet.WETH)));
+
+        console.log("Finished deploying", DEPLOY_NAME);
+    }
+}