chore: nft rent with permit, factory salt depends on sender

contracts/SmartWalletFactoryV1.sol

@@ -45,8 +45,9 @@ contract SmartWalletFactoryV1 is ISmartWalletFactory {
     function create2Wallet(
         address owner,
         address allowlistOperator,
-        bytes32 salt
+        bytes32 baseSalt
     ) public returns (address) {
+        bytes32 salt = getSalt(msg.sender, baseSalt);
         SmartWalletV1 wallet = SmartWalletV1(
             payable(Clones.cloneDeterministic(implementation, salt))
         );
@@ -69,8 +70,11 @@ contract SmartWalletFactoryV1 is ISmartWalletFactory {
     }
 
     function predictCreate2Wallet(
-        bytes32 salt
+        address sender,
+        bytes32 baseSalt
     ) external view returns (address) {
+        bytes32 salt = getSalt(sender, baseSalt);
+
         return
             Clones.predictDeterministicAddress(
                 implementation,
@@ -87,4 +91,11 @@ contract SmartWalletFactoryV1 is ISmartWalletFactory {
         );
         return expectedAddress == wallet;
     }
+
+    function getSalt(
+        address sender,
+        bytes32 baseSalt
+    ) public pure returns (bytes32) {
+        return keccak256(abi.encodePacked(sender, baseSalt));
+    }
 }

contracts/integration/NftRent.sol

@@ -107,7 +107,7 @@ contract NftRent is ERC721Holder, IAutoExecuteCallback {
         _resetSmartWallet(listInfo, msg.sender);
     }
 
-    function _rent(bytes32 id, address smartWallet) private {
+    function _rent(bytes32 id, address smartWallet) internal {
         require(
             ISmartWalletFactory(smartWalletFactory).validateWallet(smartWallet),
             "NR: not a smart wallet"

contracts/integration/NftRentWithPermit.sol

@@ -0,0 +1,25 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.23;
+
+import "./NftRent.sol";
+
+contract NftRentWithPermit is NftRent {
+    constructor(address _smartWalletFactory) NftRent(_smartWalletFactory) {}
+
+    function rentExternalWithPermit(
+        bytes32 id,
+        uint256 deadline,
+        uint8 v,
+        bytes32 r,
+        bytes32 s
+    ) external payable {
+        ISmartWallet(msg.sender).addToAllowlistWithPermit(
+            address(this),
+            deadline,
+            v,
+            r,
+            s
+        );
+        _rent(id, msg.sender);
+    }
+}

contracts/interfaces/ISmartWalletFactory.sol

@@ -24,7 +24,10 @@ interface ISmartWalletFactory {
         bytes32 salt
     ) external returns (address);
 
-    function predictCreate2Wallet(bytes32 salt) external view returns (address);
+    function predictCreate2Wallet(
+        address sender,
+        bytes32 baseSalt
+    ) external view returns (address);
 
     function validateWallet(address wallet) external view returns (bool);
 }