feat: include msg.sender in create2 salt

sablier-labs · Jun 18, 2024 · fa7eb77 · fa7eb77
1 parent f940d22
commit fa7eb77
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/src/SablierV2MerkleLockupFactory.sol b/src/SablierV2MerkleLockupFactory.sol
@@ -33,6 +33,7 @@ contract SablierV2MerkleLockupFactory is ISablierV2MerkleLockupFactory {
         // Hash the parameters to generate a salt.
         bytes32 salt = keccak256(
             abi.encodePacked(
+                msg.sender,
                 baseParams.asset,
                 baseParams.cancelable,
                 baseParams.expiration,
@@ -76,6 +77,7 @@ contract SablierV2MerkleLockupFactory is ISablierV2MerkleLockupFactory {
         // Hash the parameters to generate a salt.
         bytes32 salt = keccak256(
             abi.encodePacked(
+                msg.sender,
                 baseParams.asset,
                 baseParams.cancelable,
                 baseParams.expiration,

diff --git a/test/Base.t.sol b/test/Base.t.sol
@@ -286,6 +286,7 @@ abstract contract Base_Test is
     {
         bytes32 salt = keccak256(
             abi.encodePacked(
+                users.alice,
                 address(asset_),
                 defaults.CANCELABLE(),
                 expiration,
@@ -330,6 +331,7 @@ abstract contract Base_Test is
     {
         bytes32 salt = keccak256(
             abi.encodePacked(
+                users.alice,
                 address(asset_),
                 defaults.CANCELABLE(),
                 expiration,

diff --git a/test/integration/merkle-lockup/factory/create-merkle-ll/createMerkleLL.t.sol b/test/integration/merkle-lockup/factory/create-merkle-ll/createMerkleLL.t.sol
@@ -12,6 +12,9 @@ import { MerkleLockup_Integration_Test } from "../../MerkleLockup.t.sol";
 contract CreateMerkleLL_Integration_Test is MerkleLockup_Integration_Test {
     function setUp() public override {
         MerkleLockup_Integration_Test.setUp();
+
+        // Make alice the caller of createMerkleLT.
+        resetPrank(users.alice);
     }
 
     function test_RevertWhen_CampaignNameTooLong() external {

diff --git a/test/integration/merkle-lockup/factory/create-merkle-lt/createMerkleLT.t.sol b/test/integration/merkle-lockup/factory/create-merkle-lt/createMerkleLT.t.sol
@@ -10,6 +10,9 @@ import { MerkleLockup_Integration_Test } from "../../MerkleLockup.t.sol";
 contract CreateMerkleLT_Integration_Test is MerkleLockup_Integration_Test {
     function setUp() public override {
         MerkleLockup_Integration_Test.setUp();
+
+        // Make alice the caller of createMerkleLT.
+        resetPrank(users.alice);
     }
 
     function test_RevertWhen_CampaignNameTooLong() external {