From 5aa689513bd32f24a0d01fcf1bebc3ed17cea084 Mon Sep 17 00:00:00 2001
From: Ryan Pate <ryantpate97@gmail.com>
Date: Fri, 15 Dec 2023 12:32:08 -0800
Subject: [PATCH] fix(ct): Remove dependency on @openzeppelin/contracts in
 SphinxUtils

---
 .changeset/olive-birds-drop.md                |  6 +++++
 docs/cli-existing-project.md                  |  1 +
 .../contracts/foundry/SphinxUtils.sol         | 25 +++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/olive-birds-drop.md

diff --git a/.changeset/olive-birds-drop.md b/.changeset/olive-birds-drop.md
new file mode 100644
index 000000000..6ea0daef1
--- /dev/null
+++ b/.changeset/olive-birds-drop.md
@@ -0,0 +1,6 @@
+---
+'@sphinx-labs/contracts': patch
+'@sphinx-labs/plugins': patch
+---
+
+Remove dependency on @openzeppelin/contracts in SphinxUtils
diff --git a/docs/cli-existing-project.md b/docs/cli-existing-project.md
index 5f853d220..e56fdfdb5 100644
--- a/docs/cli-existing-project.md
+++ b/docs/cli-existing-project.md
@@ -80,6 +80,7 @@ ffi = true
 build_info = true
 extra_output = ['storageLayout']
 fs_permissions = [{ access = "read-write", path = "./"}]
+allow_paths = ["../.."]
 ```
 
 ## 6. Add remappings
diff --git a/packages/contracts/contracts/foundry/SphinxUtils.sol b/packages/contracts/contracts/foundry/SphinxUtils.sol
index ed75e6fb3..081e2ff20 100644
--- a/packages/contracts/contracts/foundry/SphinxUtils.sol
+++ b/packages/contracts/contracts/foundry/SphinxUtils.sol
@@ -30,7 +30,6 @@ import { IGnosisSafeProxyFactory } from "./interfaces/IGnosisSafeProxyFactory.so
 import { IGnosisSafe } from "./interfaces/IGnosisSafe.sol";
 import { IMultiSend } from "./interfaces/IMultiSend.sol";
 import { IEnum } from "./interfaces/IEnum.sol";
-import { Clones } from "@openzeppelin/contracts/proxy/Clones.sol";
 
 contract SphinxUtils is SphinxConstants, StdUtils {
     Vm private constant vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
@@ -922,11 +921,33 @@ contract SphinxUtils is SphinxConstants, StdUtils {
         return addr;
     }
 
+    /**
+     * @dev Computes the address of a clone deployed using {Clones-cloneDeterministic}.
+     *
+     * Note: Copied from openzeppelin/contracts
+     */
+    function predictDeterministicAddress(
+        address implementation,
+        bytes32 salt,
+        address deployer
+    ) internal pure returns (address predicted) {
+        assembly {
+            let ptr := mload(0x40)
+            mstore(add(ptr, 0x38), deployer)
+            mstore(add(ptr, 0x24), 0x5af43d82803e903d91602b57fd5bf3ff)
+            mstore(add(ptr, 0x14), implementation)
+            mstore(ptr, 0x3d602d80600a3d3981f3363d3d373d3d3d363d73)
+            mstore(add(ptr, 0x58), salt)
+            mstore(add(ptr, 0x78), keccak256(add(ptr, 0x0c), 0x37))
+            predicted := keccak256(add(ptr, 0x43), 0x55)
+        }
+    }
+
     function getSphinxModuleAddress(SphinxConfig memory _config) public pure returns (address) {
         address safeProxyAddress = getSphinxSafeAddress(_config);
         bytes32 saltNonce = bytes32(0);
         bytes32 salt = keccak256(abi.encode(safeProxyAddress, safeProxyAddress, saltNonce));
-        address addr = Clones.predictDeterministicAddress(
+        address addr = predictDeterministicAddress(
             sphinxModuleImplAddress,
             salt,
             sphinxModuleProxyFactoryAddress