feat: create2 deterministic deploys

Author: glitch003

packages/libs/contracts-sdk/foundry.toml

@@ -3,6 +3,9 @@ src = "src"
 out = "out"
 libs = ["node_modules", "lib"]
 solc_version = "0.8.29"
+evm_version = "prague"
+bytecode_hash = "none"
+cbor_metadata = false
 
 remappings = ["forge-std/=lib/forge-std/src/", "@aave-dao/aave-v3-origin/=node_modules/@aave-dao/aave-v3-origin/"]
 via_ir = true

packages/libs/contracts-sdk/script/DeployFeeDiamond.sol

@@ -54,7 +54,7 @@ contract DeployFeeDiamond is Script {
      * @notice Deploy to a specific network
      * @param network Network name for logging
      */
-    function deployToNetwork(string memory network) public returns (address) {
+    function deployToNetwork(string memory network, bytes32 create2Salt) public returns (address) {
         // Get private key from environment variable
         uint256 deployerPrivateKey = vm.envUint("VINCENT_DEPLOYER_PRIVATE_KEY");
         if (deployerPrivateKey == 0) {
@@ -71,23 +71,25 @@ contract DeployFeeDiamond is Script {
         IDiamondCut.FacetCut[] memory cuts = new IDiamondCut.FacetCut[](6);
 
         // core diamond lib facets
-        DiamondLoupeFacet diamondLoupeFacet = new DiamondLoupeFacet();
+        DiamondLoupeFacet diamondLoupeFacet = new DiamondLoupeFacet{salt: create2Salt}();
         cuts[0] = contractToFacetCutAdd("DiamondLoupeFacet", address(diamondLoupeFacet));
-        OwnershipFacet ownershipFacet = new OwnershipFacet();
+        OwnershipFacet ownershipFacet = new OwnershipFacet{salt: create2Salt}();
         cuts[1] = contractToFacetCutAdd("OwnershipFacet", address(ownershipFacet));
 
         // fee facets
-        FeeViewsFacet feeViewsFacet = new FeeViewsFacet();
+        FeeViewsFacet feeViewsFacet = new FeeViewsFacet{salt: create2Salt}();
         cuts[2] = contractToFacetCutAdd("FeeViewsFacet", address(feeViewsFacet));
-        FeeAdminFacet feeAdminFacet = new FeeAdminFacet();
+        FeeAdminFacet feeAdminFacet = new FeeAdminFacet{salt: create2Salt}();
         cuts[3] = contractToFacetCutAdd("FeeAdminFacet", address(feeAdminFacet));
-        MorphoPerfFeeFacet morphoPerfFeeFacet = new MorphoPerfFeeFacet();
+        MorphoPerfFeeFacet morphoPerfFeeFacet = new MorphoPerfFeeFacet{salt: create2Salt}();
         cuts[4] = contractToFacetCutAdd("MorphoPerfFeeFacet", address(morphoPerfFeeFacet));
-        AavePerfFeeFacet aavePerfFeeFacet = new AavePerfFeeFacet();
+        AavePerfFeeFacet aavePerfFeeFacet = new AavePerfFeeFacet{salt: create2Salt}();
         cuts[5] = contractToFacetCutAdd("AavePerfFeeFacet", address(aavePerfFeeFacet));
 
         // Deploy the Diamond with the diamondCut facet and all other facets in one transaction
-        Fee diamond = new Fee(cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")}));
+        Fee diamond = new Fee{
+            salt: create2Salt
+        }(cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")}));
 
         // Stop broadcasting transactions
         vm.stopBroadcast();
@@ -108,7 +110,7 @@ contract DeployFeeDiamond is Script {
      * @notice Deploy to Datil network
      */
     function deployToDatil() public returns (address) {
-        return deployToNetwork("Datil");
+        return deployToNetwork("Datil", keccak256("DatilSalt"));
     }
 
     /**

packages/libs/contracts-sdk/test/fees/AaveFeeForkTest.t.sol

@@ -46,7 +46,7 @@ contract FeeForkTest is Test {
 
         DeployFeeDiamond deployScript = new DeployFeeDiamond();
 
-        address diamondAddress = deployScript.deployToNetwork("test");
+        address diamondAddress = deployScript.deployToNetwork("test", keccak256("testSalt"));
         feeDiamond = Fee(payable(diamondAddress));
 
         feeViewsFacet = FeeViewsFacet(diamondAddress);

packages/libs/contracts-sdk/test/fees/Fee.t.sol

@@ -37,7 +37,7 @@ contract FeeTest is Test {
 
         DeployFeeDiamond deployScript = new DeployFeeDiamond();
 
-        address diamondAddress = deployScript.deployToNetwork("test");
+        address diamondAddress = deployScript.deployToNetwork("test", keccak256("testSalt"));
         feeDiamond = Fee(payable(diamondAddress));
 
         feeViewsFacet = FeeViewsFacet(diamondAddress);

packages/libs/contracts-sdk/test/fees/MorphoFee.t.sol

@@ -37,7 +37,7 @@ contract FeeTest is Test {
 
         DeployFeeDiamond deployScript = new DeployFeeDiamond();
 
-        address diamondAddress = deployScript.deployToNetwork("test");
+        address diamondAddress = deployScript.deployToNetwork("test", keccak256("testSalt"));
         feeDiamond = Fee(payable(diamondAddress));
 
         feeViewsFacet = FeeViewsFacet(diamondAddress);

packages/libs/contracts-sdk/test/fees/MorphoFeeForkTest.t.sol

@@ -47,7 +47,7 @@ contract FeeForkTest is Test {
 
         DeployFeeDiamond deployScript = new DeployFeeDiamond();
 
-        address diamondAddress = deployScript.deployToNetwork("test");
+        address diamondAddress = deployScript.deployToNetwork("test", keccak256("testSalt"));
         feeDiamond = Fee(payable(diamondAddress));
 
         feeViewsFacet = FeeViewsFacet(diamondAddress);