refactor: put lsp4TokenType param before lsp8TokenIdType on deplo…

…yment

contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol

@@ -47,17 +47,18 @@ abstract contract LSP7DigitalAsset is
 {
     /**
      * @notice Sets the token-Metadata
-     * @param name_ The name of the token
-     * @param symbol_ The symbol of the token
-     * @param newOwner_ The owner of the the token-Metadata
-     * @param isNonDivisible_ Specify if the LSP7 token is a fungible or non-fungible token
+     * @param name_ The name of the token.
+     * @param symbol_ The symbol of the token.
+     * @param newOwner_ The owner of the the token-Metadata.
+     * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param isNonDivisible_ Specify if the LSP7 token is a fungible or non-fungible token.
      */
     constructor(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        bool isNonDivisible_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        bool isNonDivisible_
     ) LSP4DigitalAssetMetadata(name_, symbol_, newOwner_, lsp4TokenType_) {
         _isNonDivisible = isNonDivisible_;
     }

contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol

@@ -46,17 +46,17 @@ abstract contract LSP7DigitalAssetInitAbstract is
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        bool isNonDivisible_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        bool isNonDivisible_
     ) internal virtual onlyInitializing {
-        _isNonDivisible = isNonDivisible_;
-
         LSP4DigitalAssetMetadataInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
             lsp4TokenType_
         );
+
+        _isNonDivisible = isNonDivisible_;
     }
 
     // fallback function

contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol

@@ -34,7 +34,7 @@ abstract contract LSP7CompatibleERC20 is IERC20Metadata, LSP7DigitalAsset {
         string memory symbol_,
         address newOwner_,
         uint256 lsp4TokenType_
-    ) LSP7DigitalAsset(name_, symbol_, newOwner_, false, lsp4TokenType_) {}
+    ) LSP7DigitalAsset(name_, symbol_, newOwner_, lsp4TokenType_, false) {}
 
     /**
      * @inheritdoc IERC20Metadata

contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20InitAbstract.sol

@@ -45,8 +45,8 @@ abstract contract LSP7CompatibleERC20InitAbstract is
             name_,
             symbol_,
             newOwner_,
-            false,
-            lsp4TokenType_
+            lsp4TokenType_,
+            false
         );
     }
 

contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol

@@ -21,20 +21,21 @@ contract LSP7Mintable is LSP7DigitalAsset, ILSP7Mintable {
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param isNonDivisible_ Specify if the LSP7 token is a fungible or non-fungible token.
      */
     constructor(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        bool isNonDivisible_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        bool isNonDivisible_
     )
         LSP7DigitalAsset(
             name_,
             symbol_,
             newOwner_,
-            isNonDivisible_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            isNonDivisible_
         )
     {}
 

contracts/LSP7DigitalAsset/presets/LSP7MintableInit.sol

@@ -24,20 +24,21 @@ contract LSP7MintableInit is LSP7MintableInitAbstract {
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param isNonDivisible_ Specify if the LSP7 token is a fungible or non-fungible token.
      */
     function initialize(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        bool isNonDivisible_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        bool isNonDivisible_
     ) external virtual initializer {
         LSP7MintableInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            isNonDivisible_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            isNonDivisible_
         );
     }
 }

contracts/LSP7DigitalAsset/presets/LSP7MintableInitAbstract.sol

@@ -25,20 +25,21 @@ abstract contract LSP7MintableInitAbstract is
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param isNonDivisible_ Specify if the LSP7 token is a fungible or non-fungible token.
      */
     function _initialize(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        bool isNonDivisible_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        bool isNonDivisible_
     ) internal virtual override onlyInitializing {
         LSP7DigitalAssetInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            isNonDivisible_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            isNonDivisible_
         );
     }
 

contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol

@@ -57,17 +57,17 @@ abstract contract LSP8IdentifiableDigitalAsset is
 {
     /**
      * @notice Deploying a LSP8IdentifiableDigitalAsset with name `name_`, symbol `symbol_`, owned by address `newOwner_`
-     * with tokenId type `tokenIdType_`.
+     * with tokenId type `lsp8TokenIdType_`.
      *
      * @dev Deploy a `LSP8IdentifiableDigitalAsset` contract and set the tokenId type inside the ERC725Y storage of the contract.
      * This will also set the token `name_` and `symbol_` under the ERC725Y data keys `LSP4TokenName` and `LSP4TokenSymbol`.
      *
      * @param name_ The name of the token
      * @param symbol_ The symbol of the token
      * @param newOwner_ The owner of the the token-Metadata
-     * @param tokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
-     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      *
      * @custom:warning Make sure the tokenId type provided on deployment is correct, as it can only be set once
      * and cannot be changed in the ERC725Y storage after the contract has been deployed.
@@ -76,12 +76,12 @@ abstract contract LSP8IdentifiableDigitalAsset is
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) LSP4DigitalAssetMetadata(name_, symbol_, newOwner_, lsp4TokenType_) {
         LSP4DigitalAssetMetadata._setData(
             _LSP8_TOKENID_TYPE_KEY,
-            abi.encode(tokenIdType_)
+            abi.encode(lsp8TokenIdType_)
         );
     }
 

contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol

@@ -62,9 +62,9 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
      * @param name_ The name of the token
      * @param symbol_ The symbol of the token
      * @param newOwner_ The owner of the the token-Metadata
-     * @param tokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
-     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      *
      * @custom:warning Make sure the tokenId type provided on deployment is correct, as it can only be set once
      * and cannot be changed in the ERC725Y storage after the contract has been initialized.
@@ -73,8 +73,8 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) internal virtual onlyInitializing {
         LSP4DigitalAssetMetadataInitAbstract._initialize(
             name_,
@@ -85,7 +85,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
 
         LSP4DigitalAssetMetadataInitAbstract._setData(
             _LSP8_TOKENID_TYPE_KEY,
-            abi.encode(tokenIdType_)
+            abi.encode(lsp8TokenIdType_)
         );
     }
 

contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol

@@ -65,20 +65,22 @@ abstract contract LSP8CompatibleERC721 is
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
     constructor(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     )
         LSP8IdentifiableDigitalAsset(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         )
     {}
 

contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol

@@ -65,21 +65,23 @@ abstract contract LSP8CompatibleERC721InitAbstract is
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
 
     function _initialize(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) internal virtual override onlyInitializing {
         LSP8IdentifiableDigitalAssetInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         );
     }
 

contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol

@@ -15,20 +15,22 @@ contract LSP8CompatibleERC721Mintable is LSP8CompatibleERC721 {
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
     constructor(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     )
         LSP8CompatibleERC721(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         )
     {}
 

contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721MintableInit.sol

@@ -27,20 +27,22 @@ contract LSP8CompatibleERC721MintableInit is
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
     function initialize(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) external virtual initializer {
         LSP8CompatibleERC721MintableInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         );
     }
 }

contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721MintableInitAbstract.sol

@@ -19,15 +19,15 @@ contract LSP8CompatibleERC721MintableInitAbstract is
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) internal virtual override onlyInitializing {
         LSP8CompatibleERC721InitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         );
     }
 

contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol

@@ -22,20 +22,22 @@ contract LSP8Mintable is LSP8IdentifiableDigitalAsset, ILSP8Mintable {
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
     constructor(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     )
         LSP8IdentifiableDigitalAsset(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         )
     {}
 

contracts/LSP8IdentifiableDigitalAsset/presets/LSP8MintableInit.sol

@@ -24,20 +24,22 @@ contract LSP8MintableInit is LSP8MintableInitAbstract {
      * @param symbol_ The symbol of the token.
      * @param newOwner_ The owner of the token contract.
      * @param lsp4TokenType_ The type of token this digital asset contract represents (`1` = Token, `2` = NFT, `3` = Collection).
+     * @param lsp8TokenIdType_ The type of tokenIds (= NFTs) that this contract will create.
+     * Available options are: NUMBER = `0`; STRING = `1`; UNIQUE_ID = `2`; HASH = `3`; ADDRESS = `4`.
      */
     function initialize(
         string memory name_,
         string memory symbol_,
         address newOwner_,
-        uint256 tokenIdType_,
-        uint256 lsp4TokenType_
+        uint256 lsp4TokenType_,
+        uint256 lsp8TokenIdType_
     ) external virtual initializer {
         LSP8MintableInitAbstract._initialize(
             name_,
             symbol_,
             newOwner_,
-            tokenIdType_,
-            lsp4TokenType_
+            lsp4TokenType_,
+            lsp8TokenIdType_
         );
     }
 }