From c76fcd117aa9f1f0821934d30a11ac7b89c1baf6 Mon Sep 17 00:00:00 2001 From: wojciech-turek Date: Tue, 5 Sep 2023 14:37:40 +0200 Subject: [PATCH 1/4] Fix typos --- packages/asset/contracts/Asset.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/asset/contracts/Asset.sol b/packages/asset/contracts/Asset.sol index fc708773ae..c52018c91e 100644 --- a/packages/asset/contracts/Asset.sol +++ b/packages/asset/contracts/Asset.sol @@ -267,7 +267,7 @@ contract Asset is /// @param to address to which the token will be transfered. /// @param id the token type transfered. /// @param amount amount of token transfered. - /// @param data aditional data accompanying the transfer. + /// @param data additional data accompanying the transfer. function safeTransferFrom( address from, address to, @@ -285,7 +285,7 @@ contract Asset is /// @notice could be used to deploy splitter and set tokens royalties /// @param tokenId the id of the token for which the EIP2981 royalty is set for. /// @param recipient the royalty recipient for the splitter of the creator. - /// @param creator the creactor of the tokens. + /// @param creator the creator of the tokens. function setTokenRoyalties( uint256 tokenId, address payable recipient, @@ -336,7 +336,7 @@ contract Asset is return TokenIdUtils.isBridged(tokenId); } - /// @notice This function is used to register Asset contract on the Operator Filterer Registry of Opensea.can only be called by admin. + /// @notice This function is used to register Asset contract on the Operator Filterer Registry of OpenSea. Can only be called by admin. /// @dev used to register contract and subscribe to the subscriptionOrRegistrantToCopy's black list. /// @param subscriptionOrRegistrantToCopy registration address of the list to subscribe. /// @param subscribe bool to signify subscription "true"" or to copy the list "false". From e3e9b80e585abcf129a99710210aa49f73ea47cc Mon Sep 17 00:00:00 2001 From: wojciech-turek Date: Tue, 12 Sep 2023 08:24:24 +0200 Subject: [PATCH 2/4] Fix missed typo --- packages/asset/contracts/Asset.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asset/contracts/Asset.sol b/packages/asset/contracts/Asset.sol index c52018c91e..87618c480a 100644 --- a/packages/asset/contracts/Asset.sol +++ b/packages/asset/contracts/Asset.sol @@ -239,7 +239,7 @@ contract Asset is /// @param to address to which the token will be transfered. /// @param ids ids of each token type transfered. /// @param amounts amount of each token type transfered. - /// @param data aditional data accompanying the transfer. + /// @param data additional data accompanying the transfer. function safeBatchTransferFrom( address from, address to, From 0c1fed4febdd649b1b8de2269e81de985fb8ba48 Mon Sep 17 00:00:00 2001 From: wojciech-turek Date: Fri, 15 Sep 2023 11:37:36 +0200 Subject: [PATCH 3/4] Fix format and rm bad rule from solhint --- packages/asset/.solhint.json | 1 - packages/asset/contracts/Asset.sol | 2 +- packages/dependency-operator-filter/.solhint.json | 1 - packages/dependency-royalty-management/.solhint.json | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/asset/.solhint.json b/packages/asset/.solhint.json index 2febeccc35..d722fc1342 100644 --- a/packages/asset/.solhint.json +++ b/packages/asset/.solhint.json @@ -8,7 +8,6 @@ "endOfLine": "auto" } ], - "custom-errors": "off", "compiler-version": ["error", "^0.8.0"], "func-visibility": ["error", {"ignoreConstructors": true}], "reason-string": ["warn", {"maxLength": 64}] diff --git a/packages/asset/contracts/Asset.sol b/packages/asset/contracts/Asset.sol index 48337e8a20..0332dc94ae 100644 --- a/packages/asset/contracts/Asset.sol +++ b/packages/asset/contracts/Asset.sol @@ -376,4 +376,4 @@ contract Asset is } uint256[49] private __gap; -} +} \ No newline at end of file diff --git a/packages/dependency-operator-filter/.solhint.json b/packages/dependency-operator-filter/.solhint.json index 2febeccc35..d722fc1342 100644 --- a/packages/dependency-operator-filter/.solhint.json +++ b/packages/dependency-operator-filter/.solhint.json @@ -8,7 +8,6 @@ "endOfLine": "auto" } ], - "custom-errors": "off", "compiler-version": ["error", "^0.8.0"], "func-visibility": ["error", {"ignoreConstructors": true}], "reason-string": ["warn", {"maxLength": 64}] diff --git a/packages/dependency-royalty-management/.solhint.json b/packages/dependency-royalty-management/.solhint.json index 2febeccc35..d722fc1342 100644 --- a/packages/dependency-royalty-management/.solhint.json +++ b/packages/dependency-royalty-management/.solhint.json @@ -8,7 +8,6 @@ "endOfLine": "auto" } ], - "custom-errors": "off", "compiler-version": ["error", "^0.8.0"], "func-visibility": ["error", {"ignoreConstructors": true}], "reason-string": ["warn", {"maxLength": 64}] From e5ef998a7673456274e9aac3203ff3412e4550e2 Mon Sep 17 00:00:00 2001 From: wojciech-turek Date: Fri, 15 Sep 2023 11:42:16 +0200 Subject: [PATCH 4/4] Format fix --- packages/asset/contracts/Asset.sol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/asset/contracts/Asset.sol b/packages/asset/contracts/Asset.sol index 0332dc94ae..a9695818b5 100644 --- a/packages/asset/contracts/Asset.sol +++ b/packages/asset/contracts/Asset.sol @@ -355,7 +355,6 @@ contract Asset is return TokenIdUtils.isBridged(tokenId); } - /// @notice This function is used to register Asset contract on the Operator Filterer Registry of OpenSea. Can only be called by admin. /// @dev used to register contract and subscribe to the subscriptionOrRegistrantToCopy's black list. /// @param subscriptionOrRegistrantToCopy registration address of the list to subscribe. @@ -376,4 +375,4 @@ contract Asset is } uint256[49] private __gap; -} \ No newline at end of file +}