Add overrideable _generateSalt to BaseAccountFactory (#392)

* Add _generateSalt to BaseAccountFactory

* docs update

* package update

Author: nkrishang

contracts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/contracts",
   "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

contracts/smart-wallet/utils/BaseAccountFactory.sol

@@ -47,7 +47,7 @@ abstract contract BaseAccountFactory is IAccountFactory, Multicall {
     /// @notice Deploys a new Account for admin.
     function createAccount(address _admin, bytes calldata _data) external virtual override returns (address) {
         address impl = accountImplementation;
-        bytes32 salt = keccak256(abi.encode(_admin));
+        bytes32 salt = _generateSalt(_admin, _data);
         address account = Clones.predictDeterministicAddress(impl, salt);
 
         if (account.code.length > 0) {
@@ -115,6 +115,11 @@ abstract contract BaseAccountFactory is IAccountFactory, Multicall {
                             Internal functions
     //////////////////////////////////////////////////////////////*/
 
+    /// @dev Returns the salt used when deploying an Account.
+    function _generateSalt(address _admin, bytes calldata) internal view virtual returns (bytes32) {
+        return keccak256(abi.encode(_admin));
+    }
+
     /// @dev Called in `createAccount`. Initializes the account contract created in `createAccount`.
     function _initializeAccount(
         address _account,

docs/Account.md

@@ -323,6 +323,29 @@ Initializes the smart contract wallet.
 | _defaultAdmin | address | undefined |
 | _1 | bytes | undefined |
 
+### isValidSignature
+
+```solidity
+function isValidSignature(bytes32 _hash, bytes _signature) external view returns (bytes4 magicValue)
+```
+
+See EIP-1271
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _hash | bytes32 | undefined |
+| _signature | bytes | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| magicValue | bytes4 | undefined |
+
 ### isValidSigner
 
 ```solidity

docs/AccountCore.md

@@ -123,6 +123,29 @@ Initializes the smart contract wallet.
 | _defaultAdmin | address | undefined |
 | _1 | bytes | undefined |
 
+### isValidSignature
+
+```solidity
+function isValidSignature(bytes32 _hash, bytes _signature) external view returns (bytes4 magicValue)
+```
+
+See EIP-1271
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _hash | bytes32 | undefined |
+| _signature | bytes | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| magicValue | bytes4 | undefined |
+
 ### isValidSigner
 
 ```solidity

docs/DynamicAccount.md

@@ -300,6 +300,29 @@ Initializes the smart contract wallet.
 | _defaultAdmin | address | undefined |
 | _1 | bytes | undefined |
 
+### isValidSignature
+
+```solidity
+function isValidSignature(bytes32 _hash, bytes _signature) external view returns (bytes4 magicValue)
+```
+
+See EIP-1271
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _hash | bytes32 | undefined |
+| _signature | bytes | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| magicValue | bytes4 | undefined |
+
 ### isValidSigner
 
 ```solidity

docs/ERC1271.md

@@ -0,0 +1,38 @@
+# ERC1271
+
+
+
+
+
+
+
+
+
+## Methods
+
+### isValidSignature
+
+```solidity
+function isValidSignature(bytes32 _hash, bytes _signature) external view returns (bytes4 magicValue)
+```
+
+
+
+*Should return whether the signature provided is valid for the provided hash*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _hash | bytes32 | Hash of the data to be signed |
+| _signature | bytes | Signature byte array associated with _hash MUST return the bytes4 magic value 0x1626ba7e when function passes. MUST NOT modify state (using STATICCALL for solc < 0.5, view modifier for solc > 0.5) MUST allow external calls |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| magicValue | bytes4 | undefined |
+
+
+
+

docs/ManagedAccount.md

@@ -162,6 +162,29 @@ Initializes the smart contract wallet.
 | _defaultAdmin | address | undefined |
 | _1 | bytes | undefined |
 
+### isValidSignature
+
+```solidity
+function isValidSignature(bytes32 _hash, bytes _signature) external view returns (bytes4 magicValue)
+```
+
+See EIP-1271
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _hash | bytes32 | undefined |
+| _signature | bytes | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| magicValue | bytes4 | undefined |
+
 ### isValidSigner
 
 ```solidity