t

Signed-off-by: Adam Wolf <wolfynft@gmail.com>

Author: wolfy-nft

contracts/factory/MagicDropCloneFactory.sol

@@ -138,6 +138,15 @@ contract MagicDropCloneFactory is Ownable {
     =                      PUBLIC VIEW METHODS                     =
     ==============================================================*/
 
+
+    /// @notice Calculates the address of a deployed contract via create2
+    /// @param _sender The account that deploys the contract.
+    /// @param _bytecodeHash The correctly formatted hash of the bytecode.
+    /// @param _salt The create2 salt.
+    /// @param _input The constructor data.
+    /// @return newAddress The derived address of the account.
+
+
     /// @notice Predicts the deployment address of a proxy contract
     /// @param salt The salt used for address generation
     /// @return The predicted proxy deployment address
@@ -146,21 +155,26 @@ contract MagicDropCloneFactory is Ownable {
         bytes memory constructorArgs = abi.encode(implementation);
         bytes memory deploymentBytecode = bytes.concat(bytecode, constructorArgs);
 
-        (bool success, bytes memory result) = CONTRACT_DEPLOYER.staticcall(
-            abi.encodeWithSignature(
-                "getNewAddressCreate2(address,bytes32,bytes32,bytes)",
-                address(this),
-                keccak256(deploymentBytecode),
-                salt,
-                constructorArgs
-            )
-        );
-
-        if (!success) {
-            revert("Failed to predict deployment address");
-        }
-
-        return abi.decode(result, (address));
+        // (bool success, bytes memory result) = CONTRACT_DEPLOYER.staticcall(
+        //     abi.encodeWithSignature(
+        //         "getNewAddressCreate2(address,bytes32,bytes32,bytes)",
+        //         address(this),
+        //         keccak256(deploymentBytecode),
+        //         salt,
+        //         constructorArgs
+        //     )
+        // );
+
+        ContractDeployer deployer = ContractDeployer(CONTRACT_DEPLOYER);
+        address predictedAddress =
+            deployer.getNewAddressCreate2(address(this), keccak256(deploymentBytecode), salt, deploymentBytecode);
+
+        // if (!success) {
+        //     revert("Failed to predict deployment address");
+        // }
+
+        // return abi.decode(result, (address));
+        return predictedAddress;
     }
 
     /*==============================================================

foundry.toml

@@ -8,6 +8,9 @@ solc_version = "0.8.22"
 evm_version = "cancun"
 via_ir = true
 optimizer_runs = 777
+fallback_oz = true
+is_system = true # Note: NonceHolder and the ContractDeployer system contracts can only be called with a special isSystem flag as true
+mode = "3"
 
 [etherscan]
 apechain = {key = "${VERIFICATION_API_KEY_APECHAIN}", chain = 33139, url = "https://api.apescan.io/api"}

test/factory/MagicDropCloneFactoryTestV2.t.sol

@@ -43,8 +43,13 @@ contract MagicDropCloneFactoryTestV2 is Test {
 
     function testPredictDeploymentAddress() public {
         bytes32 salt = bytes32(uint256(0));
-        address contractAddress = factory.predictDeploymentAddress(salt);
-        vm.assertEq(contractAddress, contractAddress);
+        address expectedAddress = factory.predictDeploymentAddress(salt);
+
+        vm.startPrank(user);
+        address contractAddress = factory.createContractDeterministic("TestNFT", "TNFT", TokenStandard.ERC721, payable(user), 0, salt);
+        vm.stopPrank();
+
+        vm.assertEq(contractAddress, expectedAddress);
     }
 
     function testFailWithdrawToNonOwner() public {