feat: Refactor staging to simplify and new deploy (SC-873)

script/input/1/base-staging.json

@@ -2,5 +2,8 @@
     "cctpTokenMessenger": "0x1682Ae6375C4E4A97e4B583BC394c861A46D8962",
     "relayer": "0xaB959A6F88b8D966c44a7cDC2049Ba9669EBf047",
     "freezer": "0xaB959A6F88b8D966c44a7cDC2049Ba9669EBf047",
-    "usdc": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+    "usdc": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    "psm": "0x1601843c5E9bC251A3272907010AFa41Fa18347E",
+    "usds": "0x820C137fa70C8691f0e44Dc420a5e53c168921Dc",
+    "susds": "0x5875eEE11Cf8398102FdAd704C9E96607675467a"
 }

script/output/1/base-staging-release-20241210.json

@@ -1,12 +1,8 @@
 {
   "admin": "0xd1236a6A111879d9862f8374BA15344b6B233Fbd",
-  "almProxy": "0xE81A5b3657605FB2B9D8B35B17bfe27d3Bd6219d",
-  "controller": "0x61Baf0Ce69D23C8318c786e161D1cAc285AA4EA3",
+  "almProxy": "0x2627d5D0AF0B88Ee58BD7346F20A429f67a73e00",
+  "controller": "0xa3091Dfa6c02B6611250733852c95A59a127E00F",
   "freezer": "0xaB959A6F88b8D966c44a7cDC2049Ba9669EBf047",
-  "psm": "0xe1e4953C93Da52b95eDD0ffd910565D3369aCd6b",
-  "rateLimits": "0x205216D89a00FeB2a73273ceecD297BAf89d576d",
-  "relayer": "0xaB959A6F88b8D966c44a7cDC2049Ba9669EBf047",
-  "susds": "0x76B3D354FEe58523E4687a2142c2CCc6a4d35e8B",
-  "usdc": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-  "usds": "0x3C258BCaC2ab3615fC8BCfcD878e8B8df81fFA06"
+  "rateLimits": "0xAe20F9093eB3301b2D83871A3505935eFc8498C6",
+  "relayer": "0xaB959A6F88b8D966c44a7cDC2049Ba9669EBf047"
 }

script/output/1/mainnet-staging-release-20241210.json

@@ -1,22 +1,22 @@
 {
   "admin": "0xd1236a6A111879d9862f8374BA15344b6B233Fbd",
-  "allocatorBuffer": "0x08F72DC80943284A1d2d50eDCB0a7EDc27148758",
-  "allocatorOracle": "0xfDE179F68E4BF6Aa5Ff969df4354423C4A2D731B",
-  "allocatorRegistry": "0xaFaeAf9eEF4710629ca8c827b82091B3FF1a2701",
-  "allocatorRoles": "0x5117899510D9F4232c24376e2BBa622c64A90aFD",
-  "allocatorVault": "0xb3Df65B801529D128ce97307067a1b6dA4f7abcA",
-  "almProxy": "0xEA428cDa449c23Bd5475E6b0723c2F1636f1Bb37",
-  "controller": "0xDE7ba05f63B7918D2F8e2c1b1Dcdd439Fc7AC291",
+  "allocatorBuffer": "0x36138584868028D1913bf01359D7c736E6773008",
+  "allocatorOracle": "0xfC0E1fFBF9cCd82688c775b1587c45506cebDBdf",
+  "allocatorRegistry": "0xfd0A671c07309f14b05ec72c741C86AEA02e873c",
+  "allocatorRoles": "0xF954e125E979e104974882ca94063B4f088cf71D",
+  "allocatorVault": "0xAB0d4019B1182021C4cAa2F3D078EFe55cD5B5A6",
+  "almProxy": "0x675fc95BF2b42Fc61FF0f2E9969d9Ab19b65cda5",
+  "controller": "0x08c830bc14b52A65E7e62aBc7365e1C53933D4Bf",
   "dai": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
   "daiUsds": "0x3225737a9Bbb6473CB4a45b7244ACa2BeFdB276A",
   "freezer": "0x611C7c37F296240c2fF5a92f0B4a398B01B237c4",
-  "jug": "0x985B99384d922f167Ca80E00e56545B3143a00e8",
-  "psm": "0x42B3D76B2cEb919F33337E7d04bf4E60FFC94B99",
-  "rateLimits": "0x27c4c9b33E270713876fF505f21ED1BDD03Cb916",
+  "jug": "0xf999576B81c53BFf473550354eeD98cD7b126184",
+  "psm": "0x8ac160e388a3F975c9Db1D41DeB76C574702CFa9",
+  "rateLimits": "0x449F100E37CF9CC4631c044efC4726609Be26766",
   "relayer": "0x611C7c37F296240c2fF5a92f0B4a398B01B237c4",
   "susds": "0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD",
   "usdc": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
   "usds": "0xdC035D45d973E3EC169d2276DDab16f1e407384F",
-  "usdsJoin": "0x00df3C06AED70d70e1FA2996cEeAE40BD515A69B",
-  "vat": "0xcCBA298E63411df1156c6432Ec332a1aB04B41d7"
+  "usdsJoin": "0xAd309294c38EB44C929a9bB2A9452B1C8D96965e",
+  "vat": "0x373E0699D8bFDdd99d78248e5b993E6a02061B0e"
 }

script/staging/FullStagingDeploy.s.sol

@@ -19,14 +19,10 @@ import { AllocatorVault }  from "dss-allocator/src/AllocatorVault.sol";
 
 import { ScriptTools } from "dss-test/ScriptTools.sol";
 
-import { MockERC20 } from "erc20-helpers/MockERC20.sol";
-
 import { IERC20 }  from "forge-std/interfaces/IERC20.sol";
 import { Script }  from "forge-std/Script.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 
-import { PSM3Deploy } from "spark-psm/deploy/PSM3Deploy.sol";
-
 import { CCTPForwarder } from "xchain-helpers/src/forwarders/CCTPForwarder.sol";
 
 import {
@@ -44,10 +40,10 @@ import {
     RateLimitData
 } from "../../deploy/ControllerInit.sol";
 
-import { IRateLimits } from "../../src/interfaces/IRateLimits.sol";
+import { IRateLimits }      from "../../src/interfaces/IRateLimits.sol";
+import { RateLimitHelpers } from "../../src/RateLimitHelpers.sol";
 
 import { MockJug }          from "./mocks/MockJug.sol";
-import { MockRateProvider } from "./mocks/MockRateProvider.sol";
 import { MockUsdsJoin }     from "./mocks/MockUsdsJoin.sol";
 import { MockVat }          from "./mocks/MockVat.sol";
 import { PSMWrapper }       from "./mocks/PSMWrapper.sol";
@@ -102,15 +98,6 @@ contract FullStagingDeploy is Script {
     address mainnetAlmProxy;
     address mainnetController;
 
-    /**********************************************************************************************/
-    /*** Base dependency deployments                                                            ***/
-    /**********************************************************************************************/
-
-    address usdsBase;
-    address susdsBase;
-
-    address psmBase;
-
     /**********************************************************************************************/
     /*** Deployment-specific variables                                                          ***/
     /**********************************************************************************************/
@@ -306,6 +293,26 @@ contract FullStagingDeploy is Script {
             name:       "usdeBurnData",
             decimals:   18
         });
+        MainnetControllerInit.setRateLimitData({
+            key:        RateLimitHelpers.makeAssetKey(
+                            MainnetController(instance.controller).LIMIT_4626_DEPOSIT(),
+                            address(MainnetController(instance.controller).susde())
+                        ),
+            rateLimits: IRateLimits(instance.rateLimits),
+            data:       rateLimitData18,
+            name:       "susdsMintData",
+            decimals:   18
+        });
+        MainnetControllerInit.setRateLimitData({
+            key:        RateLimitHelpers.makeAssetKey(
+                            MainnetController(instance.controller).LIMIT_4626_WITHDRAW(),
+                            address(MainnetController(instance.controller).susde())
+                        ),
+            rateLimits: IRateLimits(instance.rateLimits),
+            data:       rateLimitData18,
+            name:       "susdsMintData",
+            decimals:   18
+        });
 
         // Step 3: Transfer ownership of mock usdsJoin to the vault (able to mint usds)
 
@@ -322,32 +329,6 @@ contract FullStagingDeploy is Script {
         ScriptTools.exportContract(mainnet.name, "rateLimits", instance.rateLimits);
     }
 
-    function _setUpBasePSM() public {
-        vm.selectFork(base.forkId);
-        vm.startBroadcast();
-
-        usdsBase  = address(new MockERC20("USDS",  "USDS",  18));
-        susdsBase = address(new MockERC20("sUSDS", "sUSDS", 18));
-
-        // Mint enough for seeded deposit
-        MockERC20(usdsBase).mint(deployer, 1e18);
-
-        psmBase = PSM3Deploy.deploy({
-            owner        : deployer,
-            usdc         : base.config.readAddress(".usdc"),
-            usds         : usdsBase,
-            susds        : susdsBase,
-            rateProvider : address(new MockRateProvider())
-        });
-
-        vm.stopBroadcast();
-
-        ScriptTools.exportContract(base.name, "usds",  usdsBase);
-        ScriptTools.exportContract(base.name, "susds", susdsBase);
-        ScriptTools.exportContract(base.name, "usdc",  base.config.readAddress(".usdc"));
-        ScriptTools.exportContract(base.name, "psm",   psmBase);
-    }
-
     function _setUpBaseALMController() public {
         vm.selectFork(base.forkId);
         vm.startBroadcast();
@@ -356,7 +337,7 @@ contract FullStagingDeploy is Script {
 
         ControllerInstance memory instance = ForeignControllerDeploy.deployFull({
             admin : base.admin,
-            psm   : address(psmBase),
+            psm   : base.config.readAddress(".psm"),
             usdc  : base.config.readAddress(".usdc"),
             cctp  : base.config.readAddress(".cctpTokenMessenger")
         });
@@ -392,11 +373,11 @@ contract FullStagingDeploy is Script {
                 freezer       : base.config.readAddress(".freezer"),
                 relayer       : base.config.readAddress(".relayer"),
                 oldController : address(0),
-                psm           : psmBase,
+                psm           : base.config.readAddress(".psm"),
                 cctpMessenger : base.config.readAddress(".cctpTokenMessenger"),
                 usdc          : base.config.readAddress(".usdc"),
-                usds          : usdsBase,
-                susds         : susdsBase
+                usds          : base.config.readAddress(".usds"),
+                susds         : base.config.readAddress(".susds")
             }),
             controllerInst: instance,
             data: ForeignControllerInit.InitRateLimitData({
@@ -412,14 +393,9 @@ contract FullStagingDeploy is Script {
             mintRecipients: mintRecipients
         });
 
-        // Step 3: Seed ALM Proxy with initial amounts of USDS and sUSDS
-
-        MockERC20(usdsBase).mint(baseAlmProxy,  USDS_UNIT_SIZE);
-        MockERC20(susdsBase).mint(baseAlmProxy, USDS_UNIT_SIZE);
-
         vm.stopBroadcast();
 
-        // Step 4: Export all deployed addresses
+        // Step 3: Export all deployed addresses
 
         ScriptTools.exportContract(base.name, "freezer",    base.config.readAddress(".freezer"));
         ScriptTools.exportContract(base.name, "relayer",    base.config.readAddress(".relayer"));
@@ -440,9 +416,6 @@ contract FullStagingDeploy is Script {
         vm.stopBroadcast();
     }
 
-    function _runFullDeployment() internal {
-    }
-
     function run() public {
         vm.setEnv("FOUNDRY_ROOT_CHAINID",             "1");
         vm.setEnv("FOUNDRY_EXPORTS_OVERWRITE_LATEST", "true");
@@ -472,7 +445,6 @@ contract FullStagingDeploy is Script {
         _setUpDependencies();
         _setUpAllocationSystem();
         _setUpALMController();
-        _setUpBasePSM();
         _setUpBaseALMController();
         _setBaseMintRecipient();