Merge pull request #78 from loreum-org/chore/deploy-main

Adds broadcast and script updates for mainnet deployment

.gitignore

@@ -1,8 +1,7 @@
 
 
 # Ignores development broadcast logs
-!/broadcast
-/broadcast/*
+
 /broadcast/*/31337/
 
 .env

Makefile

@@ -15,7 +15,7 @@ deploy-anvil :; forge script script/${contract}.s.sol:Deploy${contract} \
 deploy :; forge script script/${contract}.s.sol:Deploy${contract} \
 	--chain-id ${chain} \
 	--rpc-url ${rpc}  \
-	--private-key ${private} \
+	--account ${account} \
 	--broadcast \
 	--verify
 

script/LoreumProxy.s.sol → script/Loreum.s.sol

@@ -7,28 +7,28 @@ import { Chamber } from "src/Chamber.sol";
 import { LoreumBeacon } from "src/proxy/LoreumBeacon.sol";
 import { LoreumProxy } from "src/proxy/LoreumProxy.sol";
 import { console2 } from "lib/forge-std/src/console2.sol";
+import { TransparentUpgradeableProxy } from "src/Common.sol";
 
-contract DeployLoreumProxy is Script {
+contract DeployLoreum is Script {
 
     function run() external {
 
         vm.startBroadcast();
-        Chamber chamberImpl = new Chamber();
-        LoreumBeacon chamberBeacon = new LoreumBeacon(address(chamberImpl),msg.sender);
-        vm.stopBroadcast();
+        address chamberImpl = 0x0634d2d9d60fB527681821bbB224Dd0EaF8b69Fd;
+        address teamMultiSig = 0x5d45A213B2B6259F0b3c116a8907B56AB5E22095;
+
+        LoreumBeacon chamberBeacon = new LoreumBeacon(chamberImpl, teamMultiSig);
 
         console2.log("Chamber Implementation address: ", address(chamberImpl));
         console2.log("Chamber LoreumBeacon address: ", address(chamberBeacon));
 
-        vm.startBroadcast();
-        Registry registryImpl = new Registry();
-        LoreumBeacon registryBeacon = new LoreumBeacon(address(registryImpl),msg.sender);
-        bytes memory data = abi.encodeWithSelector(Registry.initialize.selector, address(chamberBeacon), msg.sender);
-        LoreumProxy registry = new LoreumProxy(address(registryBeacon), data, msg.sender);
+        address registryImpl = 0xc2CBefB9593eA19d636C04b2B91fc78369eB3C26;
+
+        bytes memory data = abi.encodeWithSelector(Registry.initialize.selector, address(chamberBeacon), teamMultiSig);
+        TransparentUpgradeableProxy registry = new TransparentUpgradeableProxy(registryImpl, teamMultiSig, data);
         vm.stopBroadcast();
 
         console2.log("Registry Implementation address: ", address(registryImpl));
-        console2.log("Registry Beacon address: ", address(registryBeacon));
         console2.log("Registry Proxy address: ", address(registry));
     }
 }

src/Common.sol

@@ -14,6 +14,7 @@ import { IERC721 } from "lib/openzeppelin-contracts/contracts/interfaces/IERC721
 import { Initializable } from "lib/openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
 import { ReentrancyGuard } from "lib/openzeppelin-contracts/contracts/security/ReentrancyGuard.sol";
 import { SafeERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import { TransparentUpgradeableProxy } from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 abstract contract Common is Initializable, ReentrancyGuard, Context, ERC721Holder, ERC1155Holder, GuardManager {
     using ECDSA for bytes32;