Replace Create3 with ZeframLou/create3-factory (#1387)

* create3

* forge install: create3-factory

* replace create3 w/ external module

* fix naming issues

* create3 factory re-addition to address #1387 (comment)

---------

Co-authored-by: Trajan0x <trajan0x@users.noreply.github.com>

.gitmodules

@@ -11,6 +11,6 @@
 [submodule "services/cctp-relayer/external/synapse-contracts"]
 	path = services/cctp-relayer/external/synapse-contracts
 	url = https://github.com/synapsecns/synapse-contracts
-[submodule "packages/contracts-core/lib/solmate"]
-	path = packages/contracts-core/lib/solmate
-	url = https://github.com/transmissions11/solmate
+[submodule "packages/contracts-core/lib/create3-factory"]
+	path = packages/contracts-core/lib/create3-factory
+	url = https://github.com/zeframlou/create3-factory

packages/contracts-core/remappings.txt

@@ -1,2 +1,3 @@
 forge-std=lib/forge-std/src
-ds-test=lib/forge-std/lib/ds-test/src
+ds-test=lib/forge-std/lib/ds-test/src
+create3=lib/create3-factory/src

packages/contracts-core/script/DeployCREATE3.sol → packages/contracts-core/script/DeployCREATE3Factory.sol

@@ -7,10 +7,10 @@ import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 // ═════════════════════════════ INTERNAL IMPORTS ══════════════════════════════
 import {DeployerUtils} from "./utils/DeployerUtils.sol";
 
-import {CREATE3Factory} from "../contracts/create3/CREATE3Factory.sol";
+import {CREATE3Factory} from "create3/CREATE3Factory.sol";
 
-// TODO: remove this script, I don't think we need it since we handle the devnet create3 deploy in setupDevnetIfEnabled();
-contract DeployCREATE3 is DeployerUtils {
+// TODO: move this to a common deployer-utils package, as this is not specific to SIN
+contract DeployCREATE3Factory is DeployerUtils {
     using stdJson for string;
     using Strings for uint256;
 

packages/contracts-core/script/utils/DeployerUtils.sol

@@ -5,7 +5,7 @@ import {console, Script, stdJson} from "forge-std/Script.sol";
 
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
-import {CREATE3Factory} from "../../contracts/create3/CREATE3Factory.sol";
+import {CREATE3Factory} from "create3/CREATE3Factory.sol";
 
 interface ICreate3Factory {
     function deploy(bytes32 salt, bytes memory creationCode) external payable returns (address deployed);