Add determineAddress tests

0xsequence · May 14, 2024 · 44af096 · 44af096
1 parent ea8a562
commit 44af096
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 27 deletions.
diff --git a/test/tokens/ERC1155/presets/ERC1155Items.t.sol b/test/tokens/ERC1155/presets/ERC1155Items.t.sol
@@ -104,6 +104,28 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
         assertTrue(token.hasRole(keccak256("ROYALTY_ADMIN_ROLE"), owner));
     }
 
+    function testFactoryDetermineAddress(
+        address _proxyOwner,
+        address tokenOwner,
+        string memory name,
+        string memory baseURI,
+        string memory contractURI,
+        address royaltyReceiver,
+        uint96 royaltyFeeNumerator
+    ) public {
+        vm.assume(_proxyOwner != address(0));
+        vm.assume(tokenOwner != address(0));
+        vm.assume(royaltyReceiver != address(0));
+        royaltyFeeNumerator = uint96(bound(royaltyFeeNumerator, 0, 10_000));
+        ERC1155ItemsFactory factory = new ERC1155ItemsFactory(address(this));
+        address deployedAddr =
+            factory.deploy(_proxyOwner, tokenOwner, name, baseURI, contractURI, royaltyReceiver, royaltyFeeNumerator);
+        address predictedAddr = factory.determineAddress(
+            _proxyOwner, tokenOwner, name, baseURI, contractURI, royaltyReceiver, royaltyFeeNumerator
+        );
+        assertEq(deployedAddr, predictedAddr);
+    }
+
     //
     // Metadata
     //
@@ -128,7 +150,10 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
 
         vm.expectRevert(
             abi.encodePacked(
-                "AccessControl: account ", Strings.toHexString(caller), " is missing role ", vm.toString(keccak256("MINTER_ROLE"))
+                "AccessControl: account ",
+                Strings.toHexString(caller),
+                " is missing role ",
+                vm.toString(keccak256("MINTER_ROLE"))
             )
         );
         vm.prank(caller);
@@ -140,7 +165,10 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
         amounts[0] = 1;
         vm.expectRevert(
             abi.encodePacked(
-                "AccessControl: account ", Strings.toHexString(caller), " is missing role ", vm.toString(keccak256("MINTER_ROLE"))
+                "AccessControl: account ",
+                Strings.toHexString(caller),
+                " is missing role ",
+                vm.toString(keccak256("MINTER_ROLE"))
             )
         );
         vm.prank(caller);
@@ -265,9 +293,7 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
         uint256[] memory tokenIds,
         uint256[] memory amounts,
         uint256[] memory burnAmounts
-    )
-        public
-    {
+    ) public {
         assumeSafeAddress(caller);
         vm.assume(caller != owner);
         vm.assume(caller != proxyOwner);
@@ -426,9 +452,7 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
         address receiver,
         uint96 feeNumerator,
         uint256 salePrice
-    )
-        public
-    {
+    ) public {
         vm.assume(feeNumerator <= 10000);
         vm.assume(receiver != address(0));
         vm.assume(caller != owner);
@@ -460,9 +484,7 @@ contract ERC1155ItemsTest is TestHelper, IERC1155ItemsSignals {
         address receiver,
         uint96 feeNumerator,
         uint256 salePrice
-    )
-        public
-    {
+    ) public {
         vm.assume(feeNumerator <= 10000);
         vm.assume(receiver != address(0));
         vm.assume(caller != owner);

diff --git a/test/tokens/ERC1155/utility/sale/ERC1155SaleBase.t.sol b/test/tokens/ERC1155/utility/sale/ERC1155SaleBase.t.sol
@@ -88,6 +88,15 @@ contract ERC1155SaleTest is TestHelper, IERC1155SaleSignals, IERC1155SupplySigna
         checkSelectorCollision(0x4782f779); // withdrawETH(address,uint256)
     }
 
+    function testFactoryDetermineAddress(address _proxyOwner, address tokenOwner, address items) public {
+        vm.assume(_proxyOwner != address(0));
+        vm.assume(tokenOwner != address(0));
+        ERC1155SaleFactory factory = new ERC1155SaleFactory(address(this));
+        address deployedAddr = factory.deploy(_proxyOwner, tokenOwner, items);
+        address predictedAddr = factory.determineAddress(_proxyOwner, tokenOwner, items);
+        assertEq(deployedAddr, predictedAddr);
+    }
+
     //
     // Withdraw
     //
@@ -113,10 +122,7 @@ contract ERC1155SaleTest is TestHelper, IERC1155SaleSignals, IERC1155SupplySigna
     }
 
     // Withdraw success ETH
-    function testWithdrawETH(bool useFactory, address withdrawTo, uint256 amount)
-        public
-        withFactory(useFactory)
-    {
+    function testWithdrawETH(bool useFactory, address withdrawTo, uint256 amount) public withFactory(useFactory) {
         assumeSafeAddress(withdrawTo);
 
         address _sale = address(sale);
@@ -131,10 +137,7 @@ contract ERC1155SaleTest is TestHelper, IERC1155SaleSignals, IERC1155SupplySigna
     }
 
     // Withdraw success ERC20
-    function testWithdrawERC20(bool useFactory, address withdrawTo, uint256 amount)
-        public
-        withFactory(useFactory)
-    {
+    function testWithdrawERC20(bool useFactory, address withdrawTo, uint256 amount) public withFactory(useFactory) {
         assumeSafeAddress(withdrawTo);
 
         address _sale = address(sale);

diff --git a/test/tokens/ERC20/ERC20Items.t.sol b/test/tokens/ERC20/ERC20Items.t.sol
@@ -90,6 +90,21 @@ contract ERC20ItemsTest is TestHelper, IERC20ItemsSignals {
         assertEq(token.decimals(), DECIMALS);
     }
 
+    function testFactoryDetermineAddress(
+        address _proxyOwner,
+        address tokenOwner,
+        string memory name,
+        string memory symbol,
+        uint8 decimals
+    ) public {
+        vm.assume(_proxyOwner != address(0));
+        vm.assume(tokenOwner != address(0));
+        ERC20ItemsFactory factory = new ERC20ItemsFactory(address(this));
+        address deployedAddr = factory.deploy(_proxyOwner, tokenOwner, name, symbol, decimals);
+        address predictedAddr = factory.determineAddress(_proxyOwner, tokenOwner, name, symbol, decimals);
+        assertEq(deployedAddr, predictedAddr);
+    }
+
     //
     // Minting
     //
@@ -99,7 +114,10 @@ contract ERC20ItemsTest is TestHelper, IERC20ItemsSignals {
 
         vm.expectRevert(
             abi.encodePacked(
-                "AccessControl: account ", Strings.toHexString(caller), " is missing role ", vm.toString(keccak256("MINTER_ROLE"))
+                "AccessControl: account ",
+                Strings.toHexString(caller),
+                " is missing role ",
+                vm.toString(keccak256("MINTER_ROLE"))
             )
         );
         vm.prank(caller);

diff --git a/test/tokens/ERC721/presets/ERC721Items.t.sol b/test/tokens/ERC721/presets/ERC721Items.t.sol
@@ -104,6 +104,30 @@ contract ERC721ItemsTest is TestHelper, IERC721ItemsSignals {
         assertTrue(token.hasRole(keccak256("ROYALTY_ADMIN_ROLE"), owner));
     }
 
+    function testFactoryDetermineAddress(
+        address _proxyOwner,
+        address tokenOwner,
+        string memory name,
+        string memory symbol,
+        string memory baseURI,
+        string memory contractURI,
+        address royaltyReceiver,
+        uint96 royaltyFeeNumerator
+    ) public {
+        vm.assume(_proxyOwner != address(0));
+        vm.assume(tokenOwner != address(0));
+        vm.assume(royaltyReceiver != address(0));
+        royaltyFeeNumerator = uint96(bound(royaltyFeeNumerator, 0, 10_000));
+        ERC721ItemsFactory factory = new ERC721ItemsFactory(address(this));
+        address deployedAddr = factory.deploy(
+            _proxyOwner, tokenOwner, name, symbol, baseURI, contractURI, royaltyReceiver, royaltyFeeNumerator
+        );
+        address predictedAddr = factory.determineAddress(
+            _proxyOwner, tokenOwner, name, symbol, baseURI, contractURI, royaltyReceiver, royaltyFeeNumerator
+        );
+        assertEq(deployedAddr, predictedAddr);
+    }
+
     //
     // Metadata
     //
@@ -155,7 +179,10 @@ contract ERC721ItemsTest is TestHelper, IERC721ItemsSignals {
 
         vm.expectRevert(
             abi.encodePacked(
-                "AccessControl: account ", Strings.toHexString(caller), " is missing role ", vm.toString(keccak256("MINTER_ROLE"))
+                "AccessControl: account ",
+                Strings.toHexString(caller),
+                " is missing role ",
+                vm.toString(keccak256("MINTER_ROLE"))
             )
         );
         vm.prank(caller);
@@ -357,9 +384,7 @@ contract ERC721ItemsTest is TestHelper, IERC721ItemsSignals {
         address receiver,
         uint96 feeNumerator,
         uint256 salePrice
-    )
-        public
-    {
+    ) public {
         vm.assume(feeNumerator <= 10000);
         vm.assume(receiver != address(0));
         vm.assume(caller != owner);
@@ -391,9 +416,7 @@ contract ERC721ItemsTest is TestHelper, IERC721ItemsSignals {
         address receiver,
         uint96 feeNumerator,
         uint256 salePrice
-    )
-        public
-    {
+    ) public {
         vm.assume(feeNumerator <= 10000);
         vm.assume(receiver != address(0));
         vm.assume(caller != owner);

diff --git a/test/tokens/ERC721/utility/sale/ERC721SaleBase.t.sol b/test/tokens/ERC721/utility/sale/ERC721SaleBase.t.sol
@@ -81,6 +81,15 @@ contract ERC721SaleTest is TestHelper, IERC721SaleSignals {
         checkSelectorCollision(0x4782f779); // withdrawETH(address,uint256)
     }
 
+    function testFactoryDetermineAddress(address _proxyOwner, address tokenOwner, address items) public {
+        vm.assume(_proxyOwner != address(0));
+        vm.assume(tokenOwner != address(0));
+        ERC721SaleFactory factory = new ERC721SaleFactory(address(this));
+        address deployedAddr = factory.deploy(_proxyOwner, tokenOwner, items);
+        address predictedAddr = factory.determineAddress(_proxyOwner, tokenOwner, items);
+        assertEq(deployedAddr, predictedAddr);
+    }
+
     //
     // Withdraw
     //