fix: wallet tokens receiver functions

RedDuck-Software · May 31, 2024 · 7c7180d · 7c7180d
1 parent aa94e87
commit 7c7180d
Show file tree

Hide file tree

Showing 9 changed files with 686 additions and 25 deletions.
diff --git a/contracts/SmartWalletV1.sol b/contracts/SmartWalletV1.sol
@@ -8,6 +8,9 @@ import "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable
 import "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";
+
 import "./libraries/EnumerableMap.sol";
 import "./libraries/UniswapV3Actions.sol";
 import "./interfaces/IWeth.sol";
@@ -22,6 +25,8 @@ import "hardhat/console.sol";
 contract SmartWalletV1 is
     OwnableUpgradeable,
     EIP712Upgradeable,
+    ERC721HolderUpgradeable,
+    ERC1155HolderUpgradeable,
     NoncesUpgradeable,
     ISmartWallet
 {

diff --git a/contracts/integration/NftRent.sol b/contracts/integration/NftRent.sol
@@ -83,7 +83,7 @@ contract NftRent is ERC721Holder, IAutoExecuteCallback {
     }
 
     function rent(bytes32 id) external payable returns (address smartWallet) {
-        bytes32 walletSalt = keccak256(abi.encodePacked(msg.sender));
+        bytes32 walletSalt = keccak256(abi.encodePacked(msg.sender, id));
         smartWallet = ISmartWalletFactory(smartWalletFactory).create2Wallet(
             msg.sender,
             address(this),

diff --git a/docs/main.js b/docs/main.js
diff --git a/ignition/deployments/chain-11155111/artifacts/NftRent#NftRent.json b/ignition/deployments/chain-11155111/artifacts/NftRent#NftRent.json
diff --git a/ignition/deployments/chain-11155111/artifacts/SmartWalletFactoryV1#SmartWalletFactoryV1.json b/ignition/deployments/chain-11155111/artifacts/SmartWalletFactoryV1#SmartWalletFactoryV1.json
diff --git a/ignition/deployments/chain-11155111/artifacts/SmartWalletV1#SmartWalletV1.json b/ignition/deployments/chain-11155111/artifacts/SmartWalletV1#SmartWalletV1.json