Merge pull request #314 from corpus-io/feature/addAuditAndReleaseV5.0.0

Feature/add audit and release v5.0.0
corpus-io · Dec 18, 2023 · c5ae9eb · c5ae9eb
2 parents 1c1c019 + 04eccff
commit c5ae9eb
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 30 deletions.
diff --git a/...ize.it-ConsenSysDiligence-finalReport.pdf → audits/2022-11_ConsenSys_Diligence.pdf b/...ize.it-ConsenSysDiligence-finalReport.pdf → audits/2022-11_ConsenSys_Diligence.pdf
diff --git a/audits/Corpus Ventures_SCAudit_Report-1.pdf → audits/2022-12_Hacken.pdf b/audits/Corpus Ventures_SCAudit_Report-1.pdf → audits/2022-12_Hacken.pdf
diff --git a/audits/2023-11_ConsenSys_Diligence.pdf b/audits/2023-11_ConsenSys_Diligence.pdf
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tokenize.it/contracts",
-  "version": "5.0.0-beta3",
+  "version": "5.0.0",
   "description": "Tokenize.it smart contracts for company tokenization, crowdinvesting, private offers and employee participation",
   "keywords": [
     "evm",
@@ -87,10 +87,10 @@
   },
   "scripts": {
     "prepack": "yarn npmignore --auto && yarn test && yarn build ",
-    "build": "yarn hardhat compile && yarn tsc --declaration",
+    "build": "yarn clean && yarn hardhat compile && yarn tsc --declaration",
     "test": "forge test --no-match-test Mainnet",
     "coverage": "forge coverage --report lcov && genhtml lcov.info --branch-coverage --output-directory=./coverage",
-    "clean": "yarn hardhat clean && forge clean"
+    "clean": "yarn hardhat clean && forge clean && rm -rf ./dist ./coverage ./cache"
   },
   "prettier": {
     "singleQuote": true,

diff --git a/script/DeployPlatform.s.sol b/script/DeployPlatform.s.sol
@@ -17,12 +17,12 @@ contract DeployPlatform is Script {
         address deployerAddress = vm.addr(deployerPrivateKey);
 
         // Goerli
-        //address platformColdWallet = 0x1695F52e342f3554eC8BC06621B7f5d1644cCE39;
-        //address platformAdminWallet = 0x1695F52e342f3554eC8BC06621B7f5d1644cCE39;
+        address platformColdWallet = 0x1695F52e342f3554eC8BC06621B7f5d1644cCE39;
+        address trustedForwarder = 0x0445d09A1917196E1DC12EdB7334C70c1FfB1623;
 
         // Mainnet
-        address platformColdWallet = 0x9E23f8AA17B2721cf69D157b8a15bd7b64ac881C;
-        address trustedForwarder = 0xAa3E82b4c4093b4bA13Cb5714382C99ADBf750cA;
+        // address platformColdWallet = 0x9E23f8AA17B2721cf69D157b8a15bd7b64ac881C;
+        // address trustedForwarder = 0xAa3E82b4c4093b4bA13Cb5714382C99ADBf750cA;
 
         console.log("Deployer address: ", deployerAddress);
 
@@ -36,7 +36,7 @@ contract DeployPlatform is Script {
         console.log("FeeSettingsCloneFactory deployed at: ", address(feeSettingsCloneFactory));
 
         console.log("Deploying FeeSettings contract...");
-        Fees memory fees = Fees(100, 100, 100, 0);
+        Fees memory fees = Fees(200, 600, 200, 0);
         FeeSettings feeSettings = FeeSettings(
             feeSettingsCloneFactory.createFeeSettingsClone(
                 bytes32(0),
@@ -49,31 +49,27 @@ contract DeployPlatform is Script {
             )
         );
         console.log("FeeSettings deployed at: ", address(feeSettings));
-        feeSettings.transferOwnership(platformColdWallet);
-        console.log("Started ownership transfer to: ", platformColdWallet);
 
-        console.log("Deploying AllowListCloneFactory contract...");
-        AllowList allowListLogicContract = new AllowList(trustedForwarder);
-        AllowListCloneFactory allowListCloneFactory = new AllowListCloneFactory(address(allowListLogicContract));
-        console.log("AllowListCloneFactory deployed at: ", address(allowListCloneFactory));
+        // console.log("Deploying AllowListCloneFactory contract...");
+        // AllowList allowListLogicContract = new AllowList(trustedForwarder);
+        // AllowListCloneFactory allowListCloneFactory = new AllowListCloneFactory(address(allowListLogicContract));
+        // console.log("AllowListCloneFactory deployed at: ", address(allowListCloneFactory));
 
-        console.log("Deploying AllowList contract...");
-        AllowList allowList = AllowList(
-            allowListCloneFactory.createAllowListClone(bytes32(0), trustedForwarder, platformColdWallet)
-        );
-        console.log("Allowlist deployed at: ", address(allowList));
+        // console.log("Deploying AllowList contract...");
+        // AllowList allowList = AllowList(
+        //     allowListCloneFactory.createAllowListClone(bytes32(0), trustedForwarder, platformColdWallet)
+        // );
+        // console.log("Allowlist deployed at: ", address(allowList));
 
-        console.log("Deploying VestingCloneFactory contract...");
-        Vesting vestingImplementation = new Vesting(trustedForwarder);
-        VestingCloneFactory vestingCloneFactory = new VestingCloneFactory(address(vestingImplementation));
-        console.log("VestingCloneFactory deployed at: ", address(vestingCloneFactory));
+        // console.log("Deploying VestingCloneFactory contract...");
+        // Vesting vestingImplementation = new Vesting(trustedForwarder);
+        // VestingCloneFactory vestingCloneFactory = new VestingCloneFactory(address(vestingImplementation));
+        // console.log("VestingCloneFactory deployed at: ", address(vestingCloneFactory));
 
-        console.log("Deploying PrivateOfferFactory contract...");
-        PrivateOfferFactory privateOfferFactory = new PrivateOfferFactory(vestingCloneFactory);
-        console.log("PrivateOfferFactory deployed at: ", address(privateOfferFactory));
+        // console.log("Deploying PrivateOfferFactory contract...");
+        // PrivateOfferFactory privateOfferFactory = new PrivateOfferFactory(vestingCloneFactory);
+        // console.log("PrivateOfferFactory deployed at: ", address(privateOfferFactory));
 
         vm.stopBroadcast();
-
-        console.log("Don't forget to check and finalize ownership transfers for all contracts!");
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,6 +7,11 @@
     "outDir": "dist",
     "resolveJsonModule": true
   },
-  "include": ["./types/contracts", "./types/factories/contracts"],
-  "files": ["./hardhat.config.ts"]
+  "include": [
+    "./types/contracts",
+    "./types/factories/contracts",
+    "./types/@openzeppelin"
+  ],
+  "exclude": ["**/*.t.sol*"],
+  "files": ["./hardhat.config.ts", "./types/index.ts"]
 }