Fix deployer

EthSign · May 23, 2024 · e837a50 · e837a50
1 parent 24b0802
commit e837a50
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 529 deletions.
diff --git a/contracts/hooks/KYCHook.sol b/contracts/hooks/KYCHook.sol
diff --git a/contracts/mock/MockKYCHook.sol b/contracts/mock/MockKYCHook.sol
diff --git a/contracts/mock/MockZETA.sol b/contracts/mock/MockZETA.sol
diff --git a/contracts/proxy/TTUDeployerLite.sol b/contracts/proxy/TTUDeployerLite.sol
@@ -162,14 +162,22 @@ contract TTUDeployerLite is ITTUDeployer, Ownable, IVersionable {
                 )
             );
             futureToken.initialize(projectToken, isTransferable);
+            unlocker = ITokenTableUnlockerV2(
+                Clones.clone(
+                    beaconManager
+                        .beacons("TokenTableUnlockerV2")
+                        .implementation()
+                )
+            );
         } else {
             futureToken = ITTFutureTokenV2(existingFutureToken);
+            unlocker = ITokenTableUnlockerV2(
+                Clones.clone(
+                    beaconManager.beacons("TTUV2ExternalFT").implementation()
+                )
+            );
         }
-        unlocker = ITokenTableUnlockerV2(
-            Clones.clone(
-                beaconManager.beacons("TokenTableUnlockerV2").implementation()
-            )
-        );
+
         unlocker.initialize(
             projectToken,
             address(futureToken),

diff --git a/deploy/10-deploy-ttudeployer-lite.ts b/deploy/10-deploy-ttudeployer-lite.ts
@@ -2,7 +2,7 @@ import {DeployFunction} from 'hardhat-deploy/dist/types'
 import {HardhatRuntimeEnvironment} from 'hardhat/types'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {network, ethers, run} from 'hardhat'
-import {TTUDeployerLite} from '../typechain-types'
+import {TTUDeployerLite, TTUV2BeaconManager} from '../typechain-types'
 import {log} from '../config/logging'
 
 // Replicating logic in TTUDeployer
@@ -20,6 +20,12 @@ const deployLite: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
         args: [],
         waitConfirmations: 1
     })
+    const unlockerExternalFTDeploymentResult = await deploy('TTUV2ExternalFT', {
+        from: deployer,
+        log: true,
+        args: [],
+        waitConfirmations: 1
+    })
     const ftDeploymentResult = await deploy('TTFutureTokenV2', {
         from: deployer,
         log: true,
@@ -63,45 +69,45 @@ const deployLite: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     const beaconManagerDeploymentResult = await deploy('TTUV2BeaconManager', {
         from: deployer,
         log: true,
-        args: [
-            unlockerDeploymentResult.address,
-            ftDeploymentResult.address,
-            ttDeploymentResult.address
-        ],
+        args: [],
         waitConfirmations: 1
     })
+
     // Getting instances
     const DeployerLiteFactory =
         await ethers.getContractFactory('TTUDeployerLite')
     const deployerLiteInstance = DeployerLiteFactory.attach(
         deployerLiteDeploymentResult.address
     ) as TTUDeployerLite
+    const BeaconManagerFactory =
+        await ethers.getContractFactory('TTUV2BeaconManager')
+    const beaconManagerInstance = BeaconManagerFactory.attach(
+        beaconManagerDeploymentResult.address
+    ) as TTUV2BeaconManager
     // Setup
     await deployerLiteInstance.setFeeCollector(
         feeCollectorDeploymentResult.address
     )
     await deployerLiteInstance.setBeaconManager(
         beaconManagerDeploymentResult.address
     )
-    /*
-     * Run verification
-     * await run('verify:verify', {
-     *     address: beaconManagerDeploymentResult.address,
-     *     constructorArguments: [
-     *         unlockerDeploymentResult.address,
-     *         ftDeploymentResult.address,
-     *         ttDeploymentResult.address
-     *     ]
-     * })
-     * await run('verify:verify', {
-     *     address: deployerLiteDeploymentResult.address,
-     *     contract: 'contracts/proxy/TTUDeployerLite.sol:TTUDeployerLite'
-     * })
-     * await run('verify:verify', {
-     *     address: feeCollectorDeploymentResult.address
-     * })
-     * Print results to console (save this!)
-     */
+    await beaconManagerInstance.upgradeCustomBeacon(
+        'TokenTableUnlockerV2',
+        unlockerDeploymentResult.address
+    )
+    await beaconManagerInstance.upgradeCustomBeacon(
+        'TTFutureTokenV2',
+        ftDeploymentResult.address
+    )
+    await beaconManagerInstance.upgradeCustomBeacon(
+        'TTTrackerTokenV2',
+        ttDeploymentResult.address
+    )
+    await beaconManagerInstance.upgradeCustomBeacon(
+        'TTUV2ExternalFT',
+        unlockerExternalFTDeploymentResult.address
+    )
+
     log.info(
         `Chain ID: ${chainId} | BeaconManager: ${beaconManagerDeploymentResult.address} | FeeCollector: ${feeCollectorDeploymentResult.address} | DeployerLite: ${deployerLiteDeploymentResult.address}`
     )

diff --git a/deploy/95-deploy-kychook.ts → deploy/11-deploy-fee-collector.ts b/deploy/95-deploy-kychook.ts → deploy/11-deploy-fee-collector.ts
@@ -1,20 +1,21 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+// TypeScript
 import {DeployFunction} from 'hardhat-deploy/dist/types'
 import {HardhatRuntimeEnvironment} from 'hardhat/types'
 
-const deployClone: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+const deployTTUFeeCollector: DeployFunction = async (
+    hre: HardhatRuntimeEnvironment
+) => {
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const {deploy} = hre.deployments
     const {deployer} = await hre.getNamedAccounts()
 
-    await deploy('KYCHook', {
+    await deploy('TTUFeeCollector', {
         from: deployer,
         log: true,
         args: [],
         waitConfirmations: 1
     })
 }
 
-export default deployClone
-deployClone.tags = ['KYCHook']
+export default deployTTUFeeCollector
+deployTTUFeeCollector.tags = ['TTUFeeCollector']