Fix review

script/RumpelWalletFactory.s.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Script, console} from "forge-std/Script.sol";
 import {PointTokenVault} from "point-tokenization-vault/PointTokenVault.sol";

src/InitializationScript.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {ISafe} from "./interfaces/external/ISafe.sol";
 import {Enum} from "./interfaces/external/ISafe.sol";

src/RumpelGuard.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 

src/RumpelModule.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
@@ -14,7 +14,6 @@ contract RumpelModule is Ownable {
     struct Call {
         ISafe safe;
         address to;
-        uint256 value;
         bytes data;
         Enum.Operation operation;
     }
@@ -49,13 +48,13 @@ contract RumpelModule is Ownable {
                 }
             }
 
-            bool success = call.safe.execTransactionFromModule(call.to, call.value, call.data, call.operation);
+            bool success = call.safe.execTransactionFromModule(call.to, 0, call.data, call.operation);
 
             if (!success) {
                 revert ExecFailed(call.safe, call.to, call.data);
             }
 
-            emit ExecutionFromModule(call.safe, call.to, call.value, call.data);
+            emit ExecutionFromModule(call.safe, call.to, 0, call.data);
 
             unchecked {
                 ++i;

src/RumpelWalletFactory.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";
@@ -45,6 +45,9 @@ contract RumpelWalletFactory is Ownable, Pausable {
         uint256 threshold,
         InitializationScript.InitCall[] calldata initCalls
     ) external whenNotPaused returns (address) {
+        // Calculate a unique salt based on the sender's address and nonce.
+        uint256 salt = uint256(keccak256(abi.encodePacked(msg.sender, saltNonce[msg.sender]++)));
+
         address safe = proxyFactory.createProxyWithNonce(
             safeSingleton,
             abi.encodeWithSelector(
@@ -58,16 +61,22 @@ contract RumpelWalletFactory is Ownable, Pausable {
                 0, // payment
                 address(0) // paymentReceiver
             ),
-            saltNonce[msg.sender]++ // For deterministic address generation
+            salt // For deterministic address generation
         );
 
         emit SafeCreated(safe, owners, threshold);
 
         return safe;
     }
 
-    function precomputeAddress(bytes memory _initializer, uint256 _saltNonce) external view returns (address) {
-        bytes32 salt = keccak256(abi.encodePacked(keccak256(_initializer), _saltNonce));
+    function precomputeAddress(bytes memory _initializer, address _sender, uint256 _saltNonce)
+        external
+        view
+        returns (address)
+    {
+        bytes32 salt = keccak256(
+            abi.encodePacked(keccak256(_initializer), uint256(keccak256(abi.encodePacked(_sender, _saltNonce))))
+        );
 
         bytes memory deploymentData =
             abi.encodePacked(proxyFactory.proxyCreationCode(), uint256(uint160(safeSingleton)));
@@ -88,6 +97,7 @@ contract RumpelWalletFactory is Ownable, Pausable {
         else if (what == "RUMPEL_MODULE") rumpelModule = data;
         else if (what == "RUMPEL_GUARD") rumpelGuard = data;
         else if (what == "INITIALIZATION_SCRIPT") initializationScript = data;
+        else if (what == "COMPATIBILITY_FALLBACK") compatibilityFallback = data;
         else revert UnrecognizedParam(what);
         emit ParamChanged(what, data);
     }

src/external/CompatibilityFallbackHandler.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.9.0;
+pragma solidity =0.8.24;
 
 import "safe-smart-account/contracts/handler/TokenCallbackHandler.sol";
 import "safe-smart-account/contracts/Safe.sol";

src/interfaces/external/IGuard.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Enum} from "./ISafe.sol";
 

src/interfaces/external/ISafe.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 library Enum {
     enum Operation {

src/interfaces/external/ISafeProxyFactory.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 interface ISafeProxyFactory {
     function createProxyWithNonce(address _singleton, bytes memory _initializer, uint256 _saltNonce)

src/interfaces/external/ISignMessageLib.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 interface ISignMessageLib {
     function signMessage(bytes calldata digest) external;

test/RumpelWallet.t.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity =0.8.24;
 
 import {Test, console} from "forge-std/Test.sol";
 import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
@@ -90,20 +90,23 @@ contract RumpelWalletTest is Test {
         address newScript = makeAddr("newScript");
         address newSingleton = makeAddr("newSingleton");
         address newProxyFactory = makeAddr("newProxyFactory");
+        address newCompatibilityFallback = makeAddr("newCompatibilityFallback");
 
         vm.startPrank(admin);
         rumpelWalletFactory.setParam("RUMPEL_GUARD", newGuard);
         rumpelWalletFactory.setParam("RUMPEL_MODULE", newModule);
         rumpelWalletFactory.setParam("INITIALIZATION_SCRIPT", newScript);
         rumpelWalletFactory.setParam("SAFE_SINGLETON", newSingleton);
         rumpelWalletFactory.setParam("PROXY_FACTORY", newProxyFactory);
+        rumpelWalletFactory.setParam("COMPATIBILITY_FALLBACK", newCompatibilityFallback);
         vm.stopPrank();
 
         assertEq(rumpelWalletFactory.rumpelGuard(), newGuard);
         assertEq(rumpelWalletFactory.rumpelModule(), newModule);
         assertEq(rumpelWalletFactory.initializationScript(), newScript);
         assertEq(rumpelWalletFactory.safeSingleton(), newSingleton);
         assertEq(address(rumpelWalletFactory.proxyFactory()), newProxyFactory);
+        assertEq(rumpelWalletFactory.compatibilityFallback(), newCompatibilityFallback);
     }
 
     function testFuzz_createWalletOwners(uint256 ownersLength, uint256 threshold) public {
@@ -157,11 +160,13 @@ contract RumpelWalletTest is Test {
             address(0)
         );
 
+        vm.startPrank(alice);
         uint256 saltNonce = 0; // First wallet for this sender
-        address expectedAddress = rumpelWalletFactory.precomputeAddress(initializer, saltNonce);
+        address expectedAddress = rumpelWalletFactory.precomputeAddress(initializer, alice, saltNonce);
 
         // Create the wallet
         address actualAddress = rumpelWalletFactory.createWallet(owners, 1, initCalls);
+        vm.stopPrank();
 
         // Check if the actual address matches the expected address
         assertEq(actualAddress, expectedAddress, "Actual address does not match expected address");
@@ -522,7 +527,6 @@ contract RumpelWalletTest is Test {
             safe: safe,
             to: address(mockToken),
             data: abi.encodeCall(ERC20.transfer, (RUMPEL_VAULT, 1.1e18)),
-            value: 0,
             operation: Enum.Operation.Call
         });
 
@@ -548,7 +552,6 @@ contract RumpelWalletTest is Test {
             safe: safe,
             to: address(mockToken),
             data: abi.encodeCall(ERC20.transfer, (RUMPEL_VAULT, 1.1e18)),
-            value: 0,
             operation: Enum.Operation.Call
         });
         rumpelModule.exec(calls);
@@ -574,7 +577,6 @@ contract RumpelWalletTest is Test {
             safe: safe,
             to: address(rumpelModule.signMessageLib()),
             data: abi.encodeCall(ISignMessageLib.signMessage, (abi.encode(keccak256(message)))),
-            value: 0,
             operation: Enum.Operation.DelegateCall
         });
         rumpelModule.exec(calls);
@@ -618,7 +620,6 @@ contract RumpelWalletTest is Test {
             safe: safe,
             to: address(mockToken),
             data: abi.encodeCall(ERC20.transfer, (RUMPEL_VAULT, 1e18)),
-            value: 0,
             operation: Enum.Operation.Call
         });
         rumpelModule.exec(calls);
@@ -646,7 +647,6 @@ contract RumpelWalletTest is Test {
             safe: safe,
             to: address(safe),
             data: abi.encodeCall(ISafe.enableModule, (address(newRumpelModule))),
-            value: 0,
             operation: Enum.Operation.Call
         });
         rumpelModule.exec(calls);