Add deployments

package.json

@@ -7,7 +7,11 @@
     "build": "pnpm build:contracts && pnpm build:abi",
     "build:abi": "./generate-abi.sh",
     "build:contracts": "forge clean && forge build",
-    "test": "pnpm build && forge test"
+    "test": "pnpm build && forge test",
+    "deploy:magic-spend": "pnpm build && pnpm deploy:magic-spend:sepolia && pnpm deploy:magic-spend:base-sepolia",
+    "deploy:magic-spend:sepolia": "pnpm deploy:magic-spend:script --rpc-url https://11155111.rpc.thirdweb.com",
+    "deploy:magic-spend:base-sepolia": "pnpm deploy:magic-spend:script --rpc-url https://84532.rpc.thirdweb.com",
+    "deploy:magic-spend:script": "forge script script/MagicSpend.s.sol:MagicSpend_Deploy --broadcast"
   },
   "keywords": [],
   "author": "",

script/MagicSpend.s.sol

@@ -9,7 +9,7 @@ import {ETH} from "./../src/base/Helpers.sol";
 
 import {Upgrades} from "@openzeppelin-0.3.6/foundry-upgrades/Upgrades.sol";
 
-contract MagicSpend_Deploy is Script {
+contract MagicSpend_Deploy is Script, MagicSpendFactory {
     function setUp() public {}
 
     function run() public returns (address _stakeManager, address _withdrawalManager) {
@@ -19,9 +19,8 @@ contract MagicSpend_Deploy is Script {
         address alice = vm.rememberKey(vm.envUint("ALICE"));
 
         vm.startBroadcast(deployer);
-
-        MagicSpendStakeManager stakeManager = MagicSpendFactory.deployStakeManager(owner);
-        MagicSpendWithdrawalManager withdrawalManager = MagicSpendFactory.deployWithdrawalManager(owner, signer);
+        MagicSpendStakeManager stakeManager = deployStakeManager(owner);
+        MagicSpendWithdrawalManager withdrawalManager = deployWithdrawalManager(owner, signer);
         vm.stopBroadcast();
 
         vm.startBroadcast(owner);

src/MagicSpendFactory.sol

@@ -6,16 +6,16 @@ import {MagicSpendWithdrawalManager} from "./MagicSpendWithdrawalManager.sol";
 
 import {Upgrades} from "@openzeppelin-0.3.6/foundry-upgrades/Upgrades.sol";
 
-library MagicSpendFactory {
-    function deployStakeManager(address owner) external returns (MagicSpendStakeManager) {
+abstract contract MagicSpendFactory {
+    function deployStakeManager(address owner) internal returns (MagicSpendStakeManager) {
         address proxy = Upgrades.deployTransparentProxy(
             "MagicSpendStakeManager.sol", owner, abi.encodeCall(MagicSpendStakeManager.initialize, (owner))
         );
 
         return MagicSpendStakeManager(payable(proxy));
     }
 
-    function deployWithdrawalManager(address owner, address signer) external returns (MagicSpendWithdrawalManager) {
+    function deployWithdrawalManager(address owner, address signer) internal returns (MagicSpendWithdrawalManager) {
         address proxy = Upgrades.deployTransparentProxy(
             "MagicSpendWithdrawalManager.sol",
             owner,

test/MagicSpendStakeManager.t.sol

@@ -13,7 +13,7 @@ import {SafeTransferLib} from "@solady-0.0.259/utils/SafeTransferLib.sol";
 import {MagicSpendStakeManager} from "./../src/MagicSpendStakeManager.sol";
 import {MagicSpendFactory} from "./../src/MagicSpendFactory.sol";
 
-contract MagicSpendStakeManagerTest is Test {
+contract MagicSpendStakeManagerTest is Test, MagicSpendFactory {
     address immutable OWNER = makeAddr("owner");
     address immutable RECIPIENT = makeAddr("recipient");
 
@@ -31,7 +31,7 @@ contract MagicSpendStakeManagerTest is Test {
     function setUp() external {
         (alice, aliceKey) = makeAddrAndKey("alice");
 
-        magicSpendStakeManager = MagicSpendFactory.deployStakeManager(OWNER);
+        magicSpendStakeManager = deployStakeManager(OWNER);
 
         erc20 = new TestERC20(18);
         forceReverter = new ForceReverter();

test/MagicSpendWithdrawalManager.t.sol

@@ -13,7 +13,7 @@ import {SafeTransferLib} from "@solady-0.0.259/utils/SafeTransferLib.sol";
 import {MagicSpendWithdrawalManager} from "./../src/MagicSpendWithdrawalManager.sol";
 import {MagicSpendFactory} from "./../src/MagicSpendFactory.sol";
 
-contract MagicSpendLiquidityManagerTest is Test {
+contract MagicSpendLiquidityManagerTest is Test, MagicSpendFactory {
     address immutable OWNER = makeAddr("owner");
     address immutable RECIPIENT = makeAddr("recipient");
 
@@ -31,7 +31,7 @@ contract MagicSpendLiquidityManagerTest is Test {
     function setUp() external {
         (signer, signerKey) = makeAddrAndKey("signer");
 
-        magicSpendWithdrawalManager = MagicSpendFactory.deployWithdrawalManager(OWNER, signer);
+        magicSpendWithdrawalManager = deployWithdrawalManager(OWNER, signer);
 
         erc20 = new TestERC20(18);
         forceReverter = new ForceReverter();