refactor(script): use create2 for deployments, prompt user for version

sense-finance · Apr 25, 2024 · ebc9c85 · ebc9c85
1 parent aed4f4a
commit ebc9c85
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 29 deletions.
diff --git a/contracts/script/PointTokenVault.s.sol b/contracts/script/PointTokenVault.s.sol
@@ -29,17 +29,11 @@ contract PointTokenVaultScripts is BatchScript {
     function run() public returns (address) {
         uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
 
+        string memory version = vm.prompt("Enter PointTokenVault version:");
+
         vm.startBroadcast(deployerPrivateKey);
 
-        PointTokenVault pointTokenVaultImplementation = new PointTokenVault();
-
-        PointTokenVault pointTokenVault = PointTokenVault(
-            address(
-                new ERC1967Proxy(
-                    address(pointTokenVaultImplementation), abi.encodeCall(PointTokenVault.initialize, (msg.sender))
-                )
-            )
-        );
+        PointTokenVault pointTokenVault = run(version);
 
         // Set roles
         pointTokenVault.grantRole(pointTokenVault.MERKLE_UPDATER_ROLE(), SEOPLIA_MERKLE_BOT_SAFE);
@@ -56,23 +50,15 @@ contract PointTokenVaultScripts is BatchScript {
         return address(pointTokenVault);
     }
 
-    function deployPointTokenVault(address admin, string memory version) public returns (PointTokenVault) {
-        PointTokenVault pointTokenVaultImplementation = PointTokenVault(
-            CREATE3.deploy(
-                keccak256(bytes(string.concat("PointTokenVault", "-v", version))), type(PointTokenVault).creationCode, 0
-            )
-        );
+    function run(string memory version) public returns (PointTokenVault) {
+        PointTokenVault pointTokenVaultImplementation = new PointTokenVault{salt: keccak256(abi.encode(version))}();
 
         PointTokenVault pointTokenVault = PointTokenVault(
-            CREATE3.deploy(
-                keccak256(bytes(string.concat("PointTokenVaultProxy", "-v", version))),
-                abi.encodePacked(
-                    type(ERC1967Proxy).creationCode,
-                    abi.encode(
-                        address(pointTokenVaultImplementation), abi.encodeCall(PointTokenVault.initialize, (admin))
-                    )
-                ),
-                0
+            address(
+                new ERC1967Proxy{salt: keccak256(abi.encode(version))}(
+                    address(pointTokenVaultImplementation),
+                    abi.encodeCall(PointTokenVault.initialize, (msg.sender)) // msg.sender is admin
+                )
             )
         );
 

diff --git a/contracts/test/PointTokenVault.t.sol b/contracts/test/PointTokenVault.t.sol
@@ -35,7 +35,7 @@ contract PointTokenVaultTest is Test {
         PointTokenVaultScripts scripts = new PointTokenVaultScripts();
 
         // Deploy the PointTokenVault
-        pointTokenVault = scripts.deployPointTokenVault(address(this), "0.0.1");
+        pointTokenVault = scripts.run("0.0.1");
 
         pointTokenVault.grantRole(pointTokenVault.DEFAULT_ADMIN_ROLE(), admin);
         pointTokenVault.grantRole(pointTokenVault.MERKLE_UPDATER_ROLE(), merkleUpdater);

diff --git a/foundry.toml b/foundry.toml
@@ -5,6 +5,7 @@ test = 'contracts/test'
 out = "contracts/out"
 libs = ["lib"]
 ffi = true
+evm_version = "cancun"
 
 [rpc_endpoints]
 sepolia = "${SEPOLIA_RPC_URL}"

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/lib/solady b/lib/solady
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+2 −2		foundry.toml
+1 −1		src/StdAssertions.sol
+7 −7		src/StdChains.sol
+1 −1		src/StdUtils.sol
+6 −0		src/Vm.sol
+7 −7		test/StdChains.t.sol
+1 −1		test/StdCheats.t.sol
+1 −1		test/Vm.t.sol
+676 −664		.gas-snapshot
+1 −0		README.md
+1 −1		package.json
+42 −26		src/accounts/ERC1271.sol
+19 −2		src/accounts/ERC4337.sol
+38 −17		src/accounts/ERC6551.sol
+4 −3		src/utils/DeploylessPredeployQueryer.sol
+630 −0		src/utils/EnumerableSetLib.sol
+3 −3		src/utils/LibString.sol
+5 −0		src/utils/SafeCastLib.sol
+1 −1		test/DeploylessPredeployQueryer.t.sol
+24 −0		test/ERC4337.t.sol
+30 −29		test/ERC6551.t.sol
+647 −0		test/EnumerableSetLib.t.sol
+1 −8		test/LibClone.t.sol
+0 −10		test/LibERC6551.t.sol
+9 −0		test/SafeCastLib.t.sol
+0 −7		test/SafeTransferLib.t.sol
+184 −0		test/utils/Brutalizer.sol
+11 −160		test/utils/TestPlus.sol
+2 −8		test/utils/mocks/MockERC1155.sol
+2 −8		test/utils/mocks/MockERC20.sol
+2 −15		test/utils/mocks/MockERC2981.sol
+2 −8		test/utils/mocks/MockERC4337.sol
+21 −8		test/utils/mocks/MockERC6551.sol
+2 −8		test/utils/mocks/MockERC6909.sol
+2 −15		test/utils/mocks/MockERC721.sol
+8 −20		test/utils/mocks/MockOwnable.sol
+14 −26		test/utils/mocks/MockOwnableRoles.sol
+2 −8		test/utils/mocks/MockUUPSImplementation.sol