Revert "upgrade solady with new CREATE3 impl"

storyprotocol · Dec 13, 2024 · c94c50c · c94c50c
1 parent 9020512
commit c94c50c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "lib/solady"]
 	path = lib/solady
 	url = https://github.com/vectorized/solady
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/contracts/Create3Deployer.sol b/contracts/Create3Deployer.sol
@@ -7,11 +7,11 @@ import { ICreate3Deployer } from "./ICreate3Deployer.sol";
 contract Create3Deployer is ICreate3Deployer {
     /// @inheritdoc	ICreate3Deployer
     function deploy(bytes32 salt, bytes calldata creationCode) external payable returns (address) {
-        return CREATE3.deployDeterministic(creationCode, salt);
+        return CREATE3.deploy(salt, creationCode, msg.value);
     }
 
     /// @inheritdoc	ICreate3Deployer
     function getDeployed(bytes32 salt) external view returns (address) {
-        return CREATE3.predictDeterministicAddress(salt);
+        return CREATE3.getDeployed(salt);
     }
 }
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/script/Counter.s.sol b/script/Counter.s.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import { Script } from "forge-std/Script.sol";
+
+contract CounterScript is Script {
+    function setUp() public {}
+
+    function run() public {
+        vm.broadcast();
+    }
+}
+12 −6		.github/workflows/ci.yml
+1 −3		.github/workflows/sync.yml
+0 −193		CONTRIBUTING.md
+1 −17		README.md
+1 −1		package.json
+1 −12		scripts/vm.py
+2 −15		src/StdChains.sol
+5 −5		src/StdCheats.sol
+3 −18		src/StdInvariant.sol
+0 −104		src/StdJson.sol
+1 −1		src/StdStorage.sol
+0 −104		src/StdToml.sol
+1 −1		src/StdUtils.sol
+67 −643		src/Vm.sol
+608 −635		src/console.sol
+1,555 −1		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+5 −1		src/mocks/MockERC721.sol
+4 −693		src/safeconsole.sol
+1 −1		test/StdAssertions.t.sol
+16 −22		test/StdChains.t.sol
+10 −10		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+1 −1		test/StdJson.t.sol
+14 −4		test/StdMath.t.sol
+5 −13		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+1 −1		test/StdToml.t.sol
+12 −12		test/StdUtils.t.sol
+6 −9		test/Vm.t.sol