Add nonce to 721salefactory

Author: ScreamingHawk

src/tokens/ERC721/utility/sale/ERC721SaleFactory.sol

@@ -23,13 +23,14 @@ contract ERC721SaleFactory is IERC721SaleFactory, SequenceProxyFactory {
 
     /// @inheritdoc IERC721SaleFactoryFunctions
     function deploy(
+        uint256 nonce,
         address proxyOwner,
         address tokenOwner,
         address items,
         address implicitModeValidator,
         bytes32 implicitModeProjectId
     ) external returns (address proxyAddr) {
-        bytes32 salt = keccak256(abi.encode(tokenOwner, items, implicitModeValidator, implicitModeProjectId));
+        bytes32 salt = keccak256(abi.encode(nonce, tokenOwner, items, implicitModeValidator, implicitModeProjectId));
         proxyAddr = _createProxy(salt, proxyOwner, "");
         ERC721Sale(proxyAddr).initialize(tokenOwner, items, implicitModeValidator, implicitModeProjectId);
         emit ERC721SaleDeployed(proxyAddr);
@@ -38,13 +39,14 @@ contract ERC721SaleFactory is IERC721SaleFactory, SequenceProxyFactory {
 
     /// @inheritdoc IERC721SaleFactoryFunctions
     function determineAddress(
+        uint256 nonce,
         address proxyOwner,
         address tokenOwner,
         address items,
         address implicitModeValidator,
         bytes32 implicitModeProjectId
     ) external view returns (address proxyAddr) {
-        bytes32 salt = keccak256(abi.encode(tokenOwner, items, implicitModeValidator, implicitModeProjectId));
+        bytes32 salt = keccak256(abi.encode(nonce, tokenOwner, items, implicitModeValidator, implicitModeProjectId));
         return _computeProxyAddress(salt, proxyOwner, "");
     }
 

src/tokens/ERC721/utility/sale/IERC721SaleFactory.sol

@@ -5,6 +5,7 @@ interface IERC721SaleFactoryFunctions {
 
     /**
      * Creates an ERC-721 Sale for given token contract
+     * @param nonce Nonce for randomizing the deployment address.
      * @param proxyOwner The owner of the ERC-721 Sale proxy
      * @param tokenOwner The owner of the ERC-721 Sale implementation
      * @param items The ERC-721 Items contract address
@@ -14,6 +15,7 @@ interface IERC721SaleFactoryFunctions {
      * @notice The deployed contract must be granted the MINTER_ROLE on the ERC-721 Items contract.
      */
     function deploy(
+        uint256 nonce,
         address proxyOwner,
         address tokenOwner,
         address items,
@@ -23,6 +25,7 @@ interface IERC721SaleFactoryFunctions {
 
     /**
      * Computes the address of a proxy instance.
+     * @param nonce Nonce for randomizing the deployment address.
      * @param proxyOwner The owner of the ERC-721 Sale proxy
      * @param tokenOwner The owner of the ERC-721 Sale implementation
      * @param items The ERC-721 Items contract address
@@ -31,6 +34,7 @@ interface IERC721SaleFactoryFunctions {
      * @return proxyAddr The address of the ERC-721 Sale Proxy
      */
     function determineAddress(
+        uint256 nonce,
         address proxyOwner,
         address tokenOwner,
         address items,

test/tokens/ERC721/utility/sale/ERC721SaleBase.t.sol

@@ -46,7 +46,7 @@ contract ERC721SaleBaseTest is TestHelper, IERC721SaleSignals {
 
     function setUpFromFactory() public {
         ERC721SaleFactory factory = new ERC721SaleFactory(address(this));
-        sale = ERC721Sale(factory.deploy(proxyOwner, address(this), address(token), address(0), bytes32(0)));
+        sale = ERC721Sale(factory.deploy(0, proxyOwner, address(this), address(token), address(0), bytes32(0)));
         token.grantRole(keccak256("MINTER_ROLE"), address(sale));
     }
 
@@ -85,6 +85,7 @@ contract ERC721SaleBaseTest is TestHelper, IERC721SaleSignals {
     }
 
     function testFactoryDetermineAddress(
+        uint256 nonce,
         address _proxyOwner,
         address tokenOwner,
         address items,
@@ -95,9 +96,10 @@ contract ERC721SaleBaseTest is TestHelper, IERC721SaleSignals {
         vm.assume(tokenOwner != address(0));
         ERC721SaleFactory factory = new ERC721SaleFactory(address(this));
         address deployedAddr =
-            factory.deploy(_proxyOwner, tokenOwner, items, implicitModeValidator, implicitModeProjectId);
-        address predictedAddr =
-            factory.determineAddress(_proxyOwner, tokenOwner, items, implicitModeValidator, implicitModeProjectId);
+            factory.deploy(nonce, _proxyOwner, tokenOwner, items, implicitModeValidator, implicitModeProjectId);
+        address predictedAddr = factory.determineAddress(
+            nonce, _proxyOwner, tokenOwner, items, implicitModeValidator, implicitModeProjectId
+        );
         assertEq(deployedAddr, predictedAddr);
     }
 

test/tokens/ERC721/utility/sale/ERC721SaleMint.t.sol

@@ -40,7 +40,7 @@ contract ERC721SaleMintTest is TestHelper, IERC721SaleSignals, IMerkleProofSingl
 
     function setUpFromFactory() public {
         ERC721SaleFactory factory = new ERC721SaleFactory(address(this));
-        sale = ERC721Sale(factory.deploy(proxyOwner, address(this), address(token), address(0), bytes32(0)));
+        sale = ERC721Sale(factory.deploy(0, proxyOwner, address(this), address(token), address(0), bytes32(0)));
         token.grantRole(keccak256("MINTER_ROLE"), address(sale));
     }