feat: add proxy deployment also

Author: howydev

script/Deploy.s.sol

@@ -2,19 +2,33 @@
 pragma solidity ^0.8.13;
 
 import {AlchemyProxyLoader} from "../src/AlchemyProxyLoader.sol";
+import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Script} from "forge-std/Script.sol";
 
 contract DeployScript is Script {
     address public create2Factory = address(0);
     address public proxyLoaderOwner = 0xDdF32240B4ca3184De7EC8f0D5Aba27dEc8B7A5C;
-    address public expectedDeployAddress = 0xea8ea085589afBA8C5DA2808F150AC14fA10BA78;
+    address public expectedDeployAddress = 0x658ce9D45885BCE9682e5c07c9E7982610c7aB37;
+
+    bytes32 public proxySalt = 0; // TODO
+    address public proxyAddress = address(0); // TODO
 
     function run() public {
-        address deployed = address(new AlchemyProxyLoader{salt: 0}(proxyLoaderOwner));
+        address proxyLoader = address(new AlchemyProxyLoader{salt: 0}(proxyLoaderOwner));
+
+        if (proxyLoader != expectedDeployAddress) {
+            revert(
+                string(
+                    abi.encodePacked("Proxy loader deployed to: ", proxyLoader, " instead of ", expectedDeployAddress)
+                )
+            );
+        }
+
+        address proxy = address(new ERC1967Proxy{salt: proxySalt}(proxyLoader, ""));
 
-        if (deployed != expectedDeployAddress) {
-            revert(string(abi.encodePacked("Attempted to deploy to address: ", deployed)));
+        if (proxy != proxyAddress) {
+            revert(string(abi.encodePacked("Proxy deployed to: ", proxy, " instead of ", proxyAddress)));
         }
     }
 }

test/AlchemyProxyLoader.t.sol

@@ -54,13 +54,23 @@ contract AlchemyProxyLoaderTest is Test {
 
     function test_getDeployedAddress() public pure {
         bytes32 bytecodeHash = keccak256(
-            abi.encode(
+            abi.encodePacked(
                 type(AlchemyProxyLoader).creationCode,
                 bytes32(uint256(uint160(0xDdF32240B4ca3184De7EC8f0D5Aba27dEc8B7A5C)))
             )
         );
 
         address predicted = Create2.computeAddress(bytes32(0), bytecodeHash, CREATE2_FACTORY);
-        assertEq(predicted, 0xea8ea085589afBA8C5DA2808F150AC14fA10BA78);
+        assertEq(predicted, 0x658ce9D45885BCE9682e5c07c9E7982610c7aB37);
+    }
+
+    function test_getDeployedProxyInitcode() public pure {
+        bytes32 bytecodeHash = keccak256(
+            abi.encodePacked(
+                type(ERC1967Proxy).creationCode,
+                abi.encodePacked(address(0xea8ea085589afBA8C5DA2808F150AC14fA10BA78), "")
+            )
+        );
+        assertEq(bytecodeHash, 0xb3fd145a437320ebc1cf7ad1887a3a263ce4003431505352568badf1e3be92cc);
     }
 }