add script for deterministic deployment, remove ffi, support stdJson, fix comment

foundry.toml

@@ -2,6 +2,7 @@
   auto_detect_solc = false
   bytecode_hash = "none"
   evm_version = "paris"
+  fs_permissions = [{access = "read", path = "package.json"}]
   gas_reports = ["*"]
   optimizer = true
   optimizer_runs = 1000

script/Base.s.sol

@@ -5,9 +5,11 @@ import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { console2 } from "forge-std/src/console2.sol";
 import { Script } from "forge-std/src/Script.sol";
+import { stdJson } from "forge-std/src/StdJson.sol";
 
 abstract contract BaseScript is Script {
     using Strings for uint256;
+    using stdJson for string;
 
     /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable.
     string internal constant TEST_MNEMONIC = "test test test test test test test test test test test junk";
@@ -49,18 +51,11 @@ abstract contract BaseScript is Script {
     ///
     /// Notes:
     /// - The salt format is "ChainID <chainid>, Version <version>".
-    /// - The version is obtained from `package.json` using the `ffi` cheatcode:
-    /// https://book.getfoundry.sh/cheatcodes/ffi
-    /// - Requires the `jq` CLI installed: https://jqlang.github.io/jq/
-    function constructCreate2Salt() public returns (bytes32) {
+    /// - The version is obtained from `package.json`.
+    function constructCreate2Salt() public view returns (bytes32) {
         string memory chainId = block.chainid.toString();
-        string[] memory inputs = new string[](4);
-        inputs[0] = "jq";
-        inputs[1] = "-r";
-        inputs[2] = ".version";
-        inputs[3] = "./package.json";
-        bytes memory result = vm.ffi(inputs);
-        string memory version = string(result);
+        string memory json = vm.readFile("package.json");
+        string memory version = json.readString(".version");
         string memory create2Salt = string.concat("ChainID ", chainId, ", Version ", version);
         console2.log("The CREATE2 salt is \"%s\"", create2Salt);
         return bytes32(abi.encodePacked(create2Salt));

script/DeployOpenEndedDeterministic.s.sol → script/DeployDeterministicOpenEnded.s.sol

@@ -7,7 +7,7 @@ import { BaseScript } from "./Base.s.sol";
 
 /// @notice Deploys {SablierV2OpenEnded} at a deterministic address across chains.
 /// @dev Reverts if the contract has already been deployed.
-contract DeployOpenEnded is BaseScript {
+contract DeployDeterministicOpenEnded is BaseScript {
     function run() public broadcast returns (SablierV2OpenEnded openEnded) {
         openEnded = new SablierV2OpenEnded{ salt: constructCreate2Salt() }();
     }

script/DeployOpenEnded.s.sol

@@ -5,6 +5,7 @@ import { SablierV2OpenEnded } from "src/SablierV2OpenEnded.sol";
 
 import { BaseScript } from "./Base.s.sol";
 
+/// @notice Deploys {SablierV2OpenEnded}.
 contract DeployOpenEnded is BaseScript {
     function run() public broadcast returns (SablierV2OpenEnded openEnded) {
         openEnded = new SablierV2OpenEnded();

src/SablierV2OpenEnded.sol

@@ -576,8 +576,8 @@ contract SablierV2OpenEnded is ISablierV2OpenEnded, NoDelegateCall, SablierV2Ope
         // Retrieve the recipient from storage.
         address recipient = _streams[streamId].recipient;
 
-        // Check: if `msg.sender` is neither the stream's recipient, the withdrawal address must be the recipient.
-        if (to != recipient && !(msg.sender == recipient)) {
+        // Check: if `msg.sender` is not the stream's recipient, the withdrawal address must be the recipient.
+        if (to != recipient && msg.sender != recipient) {
             revert Errors.SablierV2OpenEnded_WithdrawalAddressNotRecipient(streamId, msg.sender, to);
         }