Merge pull request #687 from AnakinSkywalkeer/development-1

fix: removed the tags and added the branch in .gitmodules

.gitmodules

@@ -1,40 +1,33 @@
 [submodule "packages/contracts/lib/Uniswap/v2-periphery"]
 	path = packages/contracts/lib/Uniswap/v2-periphery
 	url = https://github.com/Uniswap/v2-periphery.git
-	tag = v1.0.0-beta.0
+	branch= master
 [submodule "packages/contracts/lib/Uniswap/v2-core"]
 	path = packages/contracts/lib/Uniswap/v2-core
 	url = https://github.com/Uniswap/v2-core.git
-	tag = v1.0.1
+	branch= master
 [submodule "packages/contracts/lib/solidity-linked-list"]
 	path = packages/contracts/lib/solidity-linked-list
 	url = https://github.com/vittominacori/solidity-linked-list
-	tag = v5.1.0
+	branch= master
 [submodule "packages/contracts/lib/openzeppelin-contracts"]
 	path = packages/contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-	tag = v4.9.0
+	branch = release-v4.9
 [submodule "packages/contracts/lib/forge-std"]
 	path = packages/contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	tag = v1.5.6
+	branch = chore/v1.5.6
 [submodule "packages/contracts/lib/abdk-libraries-solidity"]
 	path = packages/contracts/lib/abdk-libraries-solidity
 	url = https://github.com/abdk-consulting/abdk-libraries-solidity
-	tag = v3.2
+	branch= master
 [submodule "packages/contracts/lib/operator-filter-registry"]
 	path = packages/contracts/lib/operator-filter-registry
 	url = https://github.com/ProjectOpenSea/operator-filter-registry
-	tag = v1.4.1
+	branch= v1.4.0
 [submodule "packages/contracts/lib/Uniswap/v3-periphery"]
 	path = packages/contracts/lib/Uniswap/v3-periphery
 	url = https://github.com/Uniswap/v3-periphery.git
-	tag = v1.3.0
-[submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-periphery"]
-	path = packages/contracts/packages/contracts/lib/Uniswap/v2-periphery
-	url = https://github.com/Uniswap/v2-periphery.git
-	tag = v1.0.0-beta.0
-[submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-core"]
-	path = packages/contracts/packages/contracts/lib/Uniswap/v2-core
-	url = https://github.com/Uniswap/v2-core
-	tag = v1.0.1
+	branch= main
+

packages/contracts/src/ubiquistick/UbiquiStick.sol

@@ -33,16 +33,16 @@ contract UbiquiStick is
     address public minter;
 
     string private _tokenURI;
-    uint256 private constant STANDARD_TYPE = 0;
+    uint256 private constant _STANDARD_TYPE = 0;
 
     string private _goldTokenURI;
     mapping(uint256 => bool) public gold;
-    uint256 private constant GOLD_FREQ = 64;
-    uint256 private constant GOLD_TYPE = 1;
+    uint256 private constant _GOLD_FREQ = 64;
+    uint256 private constant _GOLD_TYPE = 1;
 
     string private _invisibleTokenURI;
-    uint256 private constant INVISIBLE_TOKEN_ID = 42;
-    uint256 private constant INVISIBLE_TYPE = 2;
+    uint256 private constant _INVISIBLE_TOKEN_ID = 42;
+    uint256 private constant _INVISIBLE_TYPE = 2;
 
     modifier onlyMinter() {
         require(msg.sender == minter, "Not minter");
@@ -61,7 +61,7 @@ contract UbiquiStick is
             gold[tokenId]
                 ? _goldTokenURI
                 : (
-                    tokenId == INVISIBLE_TOKEN_ID
+                    tokenId == _INVISIBLE_TOKEN_ID
                         ? _invisibleTokenURI
                         : _tokenURI
                 );
@@ -71,11 +71,11 @@ contract UbiquiStick is
         uint256 ntype,
         string memory tokenURI_
     ) public onlyMinter {
-        if (ntype == STANDARD_TYPE) {
+        if (ntype == _STANDARD_TYPE) {
             _tokenURI = tokenURI_;
-        } else if (ntype == GOLD_TYPE) {
+        } else if (ntype == _GOLD_TYPE) {
             _goldTokenURI = tokenURI_;
-        } else if (ntype == INVISIBLE_TYPE) {
+        } else if (ntype == _INVISIBLE_TYPE) {
             _invisibleTokenURI = tokenURI_;
         }
     }
@@ -89,8 +89,8 @@ contract UbiquiStick is
         tokenIdNext += 1;
 
         // Gold one
-        if (random() % uint256(GOLD_FREQ) == 0) {
-            if (tokenId != INVISIBLE_TOKEN_ID) {
+        if (_random() % uint256(_GOLD_FREQ) == 0) {
+            if (tokenId != _INVISIBLE_TOKEN_ID) {
                 gold[tokenId] = true;
             }
         }
@@ -103,7 +103,7 @@ contract UbiquiStick is
         }
     }
 
-    function random() private view returns (uint256) {
+    function _random() private view returns (uint256) {
         return
             uint256(
                 keccak256(
@@ -120,17 +120,18 @@ contract UbiquiStick is
     function _beforeTokenTransfer(
         address from,
         address to,
-        uint256 tokenId
+        uint256 tokenId,
+        uint256 batchSize
     ) internal override(ERC721, ERC721Enumerable) {
-        super._beforeTokenTransfer(from, to, tokenId);
+        super._beforeTokenTransfer(from, to, tokenId, batchSize);
     }
 
     function _beforeConsecutiveTokenTransfer(
         address,
         address,
         uint256,
         uint96
-    ) internal override(ERC721, ERC721Enumerable) {
+    ) internal {
         revert("ERC721Enumerable: consecutive transfers not supported");
     }