updated to better work with forge

.gas-snapshot

@@ -1,3 +1,3 @@
-SafeSingletonDeployerTest:test_deploy_createsAtExpectedAddress() (gas: 113482)
-SafeSingletonDeployerTest:test_deploy_createsContractCorrectly() (gas: 106035)
-SafeSingletonDeployerTest:test_deploy_reverts() (gas: 43784)
+SafeSingletonDeployerTest:test_deploy_createsAtExpectedAddress() (gas: 110747)
+SafeSingletonDeployerTest:test_deploy_createsContractCorrectly() (gas: 100784)
+SafeSingletonDeployerTest:test_deploy_reverts() (gas: 41137)

scripts/ExampleDeploy.s.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.13;
+
+import {Script, console2} from "forge-std/Script.sol";
+
+import {SafeSingletonDeployer} from "../src/SafeSingletonDeployer.sol";
+import {Mock} from "../test/Mock.sol";
+
+contract ExampleDeployScript is Script {
+  function run() public {
+    SafeSingletonDeployer.broadcastDeploy({
+      deployer: address(1),
+      creationCode: type(Mock).creationCode,
+      args: abi.encode(1),
+      salt: bytes32("0x1234")
+    });
+  }
+}

src/SafeSingletonDeployer.sol

@@ -23,7 +23,46 @@ library SafeSingletonDeployer {
         });
     }
 
-    function deploy(bytes memory creationCode, bytes memory args, bytes32 salt) public returns (address) {
+    function broadcastDeploy(address deployer, bytes memory creationCode, bytes memory args, bytes32 salt)
+        internal
+        returns (address)
+    {
+        VM.broadcast(deployer);
+        return _deploy(creationCode, args, salt);
+    }
+
+    function broadcastDeploy(address deployer, bytes memory creationCode, bytes32 salt) internal returns (address) {
+        VM.broadcast(deployer);
+        return _deploy(creationCode, "", salt);
+    }
+
+    function broadcastDeploy(uint256 deployerPrivateKey, bytes memory creationCode, bytes memory args, bytes32 salt)
+        internal
+        returns (address)
+    {
+        VM.broadcast(deployerPrivateKey);
+        return _deploy(creationCode, args, salt);
+    }
+
+    function broadcastDeploy(uint256 deployerPrivateKey, bytes memory creationCode, bytes32 salt)
+        internal
+        returns (address)
+    {
+        VM.broadcast(deployerPrivateKey);
+        return _deploy(creationCode, "", salt);
+    }
+
+    /// @dev Allows calling without Forge broadcast
+    function deploy(bytes memory creationCode, bytes memory args, bytes32 salt) internal returns (address) {
+        return _deploy(creationCode, args, salt);
+    }
+
+    /// @dev Allows calling without Forge broadcast
+    function deploy(bytes memory creationCode, bytes32 salt) internal returns (address) {
+        return _deploy(creationCode, "", salt);
+    }
+
+    function _deploy(bytes memory creationCode, bytes memory args, bytes32 salt) private returns (address) {
         bytes memory callData = abi.encodePacked(salt, creationCode, args);
 
         (bool success, bytes memory result) = SAFE_SINGLETON_FACTORY.call(callData);

test/SafeSingletonDeployer.t.sol

@@ -44,7 +44,7 @@ contract SafeSingletonDeployerTest is Test {
     }
 
     function test_deploy_reverts() public {
-        vm.expectRevert(SafeSingletonDeployer.DeployFailed.selector);
+        vm.expectRevert();
         SafeSingletonDeployer.deploy({
             creationCode: type(MockReverting).creationCode,
             args: abi.encode(1),