add script to deploy

Author: QuertyCube

.gitignore

@@ -15,3 +15,4 @@ docs/
 
 # other
 .DS_Store
+.vscode

script/deploy.s.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+import {Script} from "forge-std/Script.sol";
+import {console} from "forge-std/console.sol";
+import {MasterOwnerModifier} from "../src/MasterOwnerModifier.sol";
+import {MasterContract} from "../src/Master.sol";
+import {TreasuryFund} from "../src/TreasuryFund.sol";
+import {MockERC20} from "../src/MockERC20.sol";
+
+contract DeployScript is Script {
+    function run() external {
+
+        address usdc_token_testnet_address = address(0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238); // USDC testnet address
+        address usdc_token_mainnet_address = address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); // USDC mainnet address
+
+        // Ambil private key dan RPC URL dari .env
+        uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
+        string memory network = vm.envString("NETWORK");
+        string memory rpcUrl;
+
+        if (keccak256(bytes(network)) == keccak256(bytes("sepolia"))) {
+            rpcUrl = vm.envString("SEPOLIA_RPC_URL");
+            console.log(" Deploying to Sepolia...");
+        } else if (keccak256(bytes(network)) == keccak256(bytes("mainnet"))) {
+            rpcUrl = vm.envString("MAINNET_RPC_URL");
+            console.log(" Deploying to Ethereum Mainnet...");
+        } else {
+            revert(" Unsupported network! Use 'sepolia' or 'mainnet'.");
+        }
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        // Deploy MasterOwnerModifier
+        MasterOwnerModifier masterOwnerModifier = new MasterOwnerModifier();
+        console.log(" MasterOwnerModifier deployed at:", address(masterOwnerModifier));
+
+        // Deploy TreasuryFund
+        TreasuryFund treasuryFund = new TreasuryFund();
+        console.log("TreasuryFund deployed at:", address(treasuryFund));
+
+        // Deploy MasterContract
+        MasterContract masterContract = new MasterContract(
+            address(treasuryFund),
+            usdc_token_testnet_address,
+            address(masterOwnerModifier)
+        );
+        console.log("MasterContract deployed at:", address(masterContract));
+
+        vm.stopBroadcast();
+    }
+}
+/*
+forge script script/deploy.s.sol --rpc-url $(grep ${NETWORK}_RPC_URL .env | cut -d '=' -f2) --broadcast --private-key $DEPLOYER_PRIVATE_KEY
+
+
+*/

src/Master.sol

@@ -7,13 +7,21 @@ import "./MasterOwnerModifier.sol";
 contract MasterContract {
     address public owner;
     address public immutable treasuryContract;
+    address public immutable usdc_token;
     MasterOwnerModifier public immutable masterOwnerModifier;
 
     address[] public eventContracts;
 
     event EventCreated(address indexed eventAddress);
     event FundsWithdrawn(address indexed owner, uint256 amount);
 
+    constructor(address _treasuryContract, address _usdc_token,address _ownerModifierAddress) {
+        owner = msg.sender;
+        treasuryContract = _treasuryContract;
+        usdc_token = _usdc_token;
+        masterOwnerModifier = MasterOwnerModifier(_ownerModifierAddress);
+    }
+
     modifier onlyOwner() {
         require(masterOwnerModifier.isMasterOwner(msg.sender), "Caller is not an owner");
         _;
@@ -33,13 +41,6 @@ contract MasterContract {
         uint256 startSale;
         uint256 endSale;
         TicketInfo[] ticketInfos;
-        address usdcToken;
-    }
-
-    constructor(address _treasuryContract, address _ownerModifierAddress) {
-        owner = msg.sender;
-        treasuryContract = _treasuryContract;
-        masterOwnerModifier = MasterOwnerModifier(_ownerModifierAddress);
     }
 
     function addOwner(address _newOwner) external onlyOwner {
@@ -72,7 +73,7 @@ contract MasterContract {
         EventContract newEvent = new EventContract(
             msg.sender, // Vendor as eventOwner
             owner, // Main owner of the MasterContract
-            params.usdcToken,
+            usdc_token,
             treasuryContract,
             address(masterOwnerModifier), // Pass the ownerModifier address
             params.name,

test/Master.t.sol

@@ -31,7 +31,7 @@ contract MasterContractTest is Test {
         treasury = new TreasuryFund();
 
         // Deploy MasterContract
-        masterContract = new MasterContract(address(treasury), address(ownerModifier));
+        masterContract = new MasterContract(address(treasury),address(usdc), address(ownerModifier));
 
         // // Add owner to Owner Modifier contract
         // ownerModifier.addMasterOwner(owner);
@@ -50,8 +50,7 @@ contract MasterContractTest is Test {
             end: block.timestamp + 2 days,
             startSale: block.timestamp,
             endSale: block.timestamp + 1 days,
-            ticketInfos: tickets,
-            usdcToken: address(usdc)
+            ticketInfos: tickets
         });
 
         // Create event
@@ -75,8 +74,7 @@ contract MasterContractTest is Test {
             end: block.timestamp + 1 days, // Error: start > end
             startSale: block.timestamp,
             endSale: block.timestamp + 1 days,
-            ticketInfos: tickets,
-            usdcToken: address(usdc)
+            ticketInfos: tickets
         });
 
         vm.prank(owner);
@@ -95,8 +93,7 @@ contract MasterContractTest is Test {
             end: block.timestamp + 2 days,
             startSale: block.timestamp + 2 days, // Error: startSale > endSale
             endSale: block.timestamp + 1 days,
-            ticketInfos: tickets,
-            usdcToken: address(usdc)
+            ticketInfos: tickets
         });
 
         vm.prank(owner);
@@ -114,8 +111,7 @@ contract MasterContractTest is Test {
             end: block.timestamp + 2 days,
             startSale: block.timestamp,
             endSale: block.timestamp + 1 days,
-            ticketInfos: tickets, // Error: No ticket types
-            usdcToken: address(usdc)
+            ticketInfos: tickets // Error: No ticket types
         });
 
         vm.prank(owner);