Module Core Refactor #145

GWSzeto · 2024-08-31T04:19:04Z

No description provided.

GWSzeto · 2024-09-03T17:36:19Z

src/core/token/ERC1155Core.sol

+        bytes memory signature
+    ) external payable {
+        address signer = _hashTypedData(
+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC1155, to, tokenId, value, keccak256(bytes(baseURI)), data))


keccack256 the data part here

GWSzeto · 2024-09-03T17:37:10Z

src/core/token/ERC1155Core.sol

+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC1155, to, tokenId, value, keccak256(bytes(baseURI)), data))
+        ).recover(signature);
+
+        if (!OwnableRoles(address(this)).hasAllRoles(signer, Role._MINTER_ROLE)) {


remove the OwnableRoles(address(this)) part as it's already the core contract

GWSzeto · 2024-09-03T17:38:30Z

src/core/token/ERC1155CoreInitializable.sol

+        bytes memory signature
+    ) external payable {
+        address signer = _hashTypedData(
+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC1155, to, tokenId, value, keccak256(bytes(baseURI)), data))


keccack256(data)

GWSzeto · 2024-09-03T17:39:42Z

src/core/token/ERC721Core.sol

+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC721, to, quantity, keccak256(bytes(baseURI)), data))
+        ).recover(signature);
+
+        if (!OwnableRoles(address(this)).hasAllRoles(signer, Role._MINTER_ROLE)) {


remove OwnableRoles(address(this))

GWSzeto · 2024-09-03T17:39:48Z

src/core/token/ERC721Core.sol

+        bytes memory signature
+    ) external payable {
+        address signer = _hashTypedData(
+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC721, to, quantity, keccak256(bytes(baseURI)), data))


keccack256(Data)

GWSzeto · 2024-09-03T17:40:08Z

src/core/token/ERC721CoreInitializable.sol

+        bytes memory signature
+    ) external payable {
+        address signer = _hashTypedData(
+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC721, to, quantity, keccak256(bytes(baseURI)), data))


keccack256(data)

GWSzeto · 2024-09-03T17:40:12Z

src/core/token/ERC721CoreInitializable.sol

+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC721, to, quantity, keccak256(bytes(baseURI)), data))
+        ).recover(signature);
+
+        if (!OwnableRoles(address(this)).hasAllRoles(signer, Role._MINTER_ROLE)) {


jakeloo · 2024-09-03T17:48:12Z

src/module/token/metadata/BatchMetadataERC721.sol

+        _batchMetadataStorage().tokenIdRangeEnd.push(rangeEndNonInclusive);
+        _batchMetadataStorage().baseURIOfTokenIdRange[rangeEndNonInclusive] = _baseURI;
+
+        emit NewMetadataBatch(rangeStart, rangeEndNonInclusive, _baseURI);


remove this, "BatchMetadataUpdate" is part of the spec

GWSzeto · 2024-09-03T17:52:22Z

src/core/token/ERC1155CoreInitializable.sol

+            keccak256(abi.encode(TYPEHASH_SIGNATURE_MINT_ERC1155, to, tokenId, value, keccak256(bytes(baseURI)), data))
+        ).recover(signature);
+
+        if (!OwnableRoles(address(this)).hasAllRoles(signer, Role._MINTER_ROLE)) {


move to module

GWSzeto · 2024-09-03T17:53:52Z

src/module/token/metadata/BatchMetadataERC721.sol

-        _batchMetadataStorage().baseURIOfTokenIdRange[rangeEndNonInclusive] = _baseURI;
-
-        emit NewMetadataBatch(rangeStart, rangeEndNonInclusive, _baseURI);
-        emit BatchMetadataUpdate(rangeStart, rangeEndNonInclusive - 1);


Look into the spec around this event UpdateMetadata spec

GWSzeto · 2024-09-03T17:54:19Z

src/module/token/minting/ClaimableERC1155.sol

-contract ClaimableERC1155 is Module, EIP712, BeforeMintCallbackERC1155, IInstallationCallback {
+contract ClaimableERC1155 is
+    Module,
+    EIP712,


Remove this

GWSzeto · 2024-09-03T17:59:17Z

src/core/token/ERC1155Core.sol

     *  @param data ABI encoded data to pass to the beforeMint hook.
     */
-    function mint(address to, uint256 tokenId, uint256 value, bytes memory data) external payable {
+    function mint(address to, uint256 tokenId, uint256 value, string calldata baseURI, bytes memory data)


rename to either amount or quantity, just make the naming consistent

GWSzeto · 2024-09-03T18:01:34Z

src/module/token/minting/ClaimableERC1155.sol

@@ -86,11 +93,8 @@ contract ClaimableERC1155 is Module, EIP712, BeforeMintCallbackERC1155, IInstall
     *  @param uid A unique identifier for the minting request.
     */
    struct ClaimRequestERC1155 {


ClaimSignatureParams

joaquim-verges · 2024-09-04T00:15:24Z

src/core/token/ERC1155Core.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;

+import "forge-std/console.sol";


joaquim-verges · 2024-09-04T00:35:07Z

src/core/token/ERC1155Core.sol

+        _mint(to, tokenId, amount, "");
+    }
+
+    receive() external payable {}


joaquim-verges · 2024-09-04T00:37:50Z

src/core/token/ERC1155Core.sol

+            )
+        ).recover(signature);
+        console.log("signer");
+        console.logAddress(signer);


joaquim-verges · 2024-09-04T00:39:06Z

src/core/token/ERC1155Core.sol

+                    TYPEHASH_SIGNATURE_MINT_ERC1155, to, tokenId, amount, keccak256(bytes(baseURI)), keccak256(data)
+                )
+            )
+        ).recover(signature);


you're not checking that the signer has minter role here?

joaquim-verges · 2024-09-04T00:49:11Z

src/callback/BeforeMintWithSignatureCallbackERC1155.sol

+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+contract BeforeMintWithSignatureCallbackERC1155 {


kinda weird that these are not abstract/interfaces

* separated out metadata functionality from mintable module * built in signature mint into the core erc721 contract * implemented in Mintable * Implemented updateMetadata * simplified parameters and structs * all tests pass * updated ERC721 initializable to match ERC721Core * addressed the PR issues * updated 1155 versions to now match 721 implementations * completed all the tests * Implemented parity in the ERC1155Initializable contract * unified naming from quantity and value to amount * slapped on a keccak256 * move OwnableRoles check on the signature * removed double events being emitted * tests pass * updated ERC20 core * implemented Claimable and Mintable on the ERC20 side * tests pass * updated based on PR feedback

* [L-4] Wrong function selector returned for the transfer validation function (#150) * [L-4] Wrong function selector returned for the transfer validation function * [Q-3] Move interface identifier for ERC165 to Core * [Q-5] Royalty modules should inherit ICreatorToken interface * [Q-6] Nitpicks * removes duplicate supportsInterface (#156) * renamed to nextTokenIdToMint in BatchMetadata (#141) * fix: expectRevert on low-level call (#136) * update batchMetadata logic to make each batchUris independent (#144) * update batchMetadata logic to make each batchUris independent * format * Module Core Refactor (#145) * separated out metadata functionality from mintable module * built in signature mint into the core erc721 contract * implemented in Mintable * Implemented updateMetadata * simplified parameters and structs * all tests pass * updated ERC721 initializable to match ERC721Core * addressed the PR issues * updated 1155 versions to now match 721 implementations * completed all the tests * Implemented parity in the ERC1155Initializable contract * unified naming from quantity and value to amount * slapped on a keccak256 * move OwnableRoles check on the signature * removed double events being emitted * tests pass * updated ERC20 core * implemented Claimable and Mintable on the ERC20 side * tests pass * updated based on PR feedback * Fix getSupportedCallbackFunctions ub ERC721CoreInitializable (#149) * implmented delayed functionality into batchMetadata (#148) * implmented delayed functionality into batchMetadata * created tests for BatchMetadata * updated ERC1155 tests and updated from batchStartId to batchRange * Implement tokenIdERC1155 module to handle tokenId management (#147) * initial commit * created tests for tokenIdERC1155 * updated to be optional * updated naming and tests * Transfer validator has roles (#143) * created hasRole function in the roylaty module * created tests * Optimzed callback execution (#135) * gas benchmark * optimize execute callback function * fix typo * optimize execute callback view function * optimize callback mode loop * Implement Max per wallet (#151) * implemented maxMintPerWallet * tests pass * maxMintPerWalletExceeded tests pass * introduced base contracts for core and initilizable to inherit * rename commit * rename commit * renamed from core to coreInitializable for the ERC1155 (#152) * updated to now use 1e18 divided (#153) * Remove double initializer in ERC721CoreInitializable (#154) --------- Co-authored-by: Pranav Garg <[email protected]> Co-authored-by: Joaquim Verges <[email protected]>

* renamed to nextTokenIdToMint in BatchMetadata (#141) * fix: expectRevert on low-level call (#136) * update batchMetadata logic to make each batchUris independent (#144) * update batchMetadata logic to make each batchUris independent * format * Module Core Refactor (#145) * separated out metadata functionality from mintable module * built in signature mint into the core erc721 contract * implemented in Mintable * Implemented updateMetadata * simplified parameters and structs * all tests pass * updated ERC721 initializable to match ERC721Core * addressed the PR issues * updated 1155 versions to now match 721 implementations * completed all the tests * Implemented parity in the ERC1155Initializable contract * unified naming from quantity and value to amount * slapped on a keccak256 * move OwnableRoles check on the signature * removed double events being emitted * tests pass * updated ERC20 core * implemented Claimable and Mintable on the ERC20 side * tests pass * updated based on PR feedback * Fix getSupportedCallbackFunctions ub ERC721CoreInitializable (#149) * implmented delayed functionality into batchMetadata (#148) * implmented delayed functionality into batchMetadata * created tests for BatchMetadata * updated ERC1155 tests and updated from batchStartId to batchRange * Implement tokenIdERC1155 module to handle tokenId management (#147) * initial commit * created tests for tokenIdERC1155 * updated to be optional * updated naming and tests * Transfer validator has roles (#143) * created hasRole function in the roylaty module * created tests * Optimzed callback execution (#135) * gas benchmark * optimize execute callback function * fix typo * optimize execute callback view function * optimize callback mode loop * Implement Max per wallet (#151) * implemented maxMintPerWallet * tests pass * maxMintPerWalletExceeded tests pass * introduced base contracts for core and initilizable to inherit * rename commit * rename commit * renamed from core to coreInitializable for the ERC1155 (#152) * updated to now use 1e18 divided (#153) * Remove double initializer in ERC721CoreInitializable (#154) * rebase off of main (#157) * [L-4] Wrong function selector returned for the transfer validation function (#150) * [L-4] Wrong function selector returned for the transfer validation function * [Q-3] Move interface identifier for ERC165 to Core * [Q-5] Royalty modules should inherit ICreatorToken interface * [Q-6] Nitpicks * removes duplicate supportsInterface (#156) * renamed to nextTokenIdToMint in BatchMetadata (#141) * fix: expectRevert on low-level call (#136) * update batchMetadata logic to make each batchUris independent (#144) * update batchMetadata logic to make each batchUris independent * format * Module Core Refactor (#145) * separated out metadata functionality from mintable module * built in signature mint into the core erc721 contract * implemented in Mintable * Implemented updateMetadata * simplified parameters and structs * all tests pass * updated ERC721 initializable to match ERC721Core * addressed the PR issues * updated 1155 versions to now match 721 implementations * completed all the tests * Implemented parity in the ERC1155Initializable contract * unified naming from quantity and value to amount * slapped on a keccak256 * move OwnableRoles check on the signature * removed double events being emitted * tests pass * updated ERC20 core * implemented Claimable and Mintable on the ERC20 side * tests pass * updated based on PR feedback * Fix getSupportedCallbackFunctions ub ERC721CoreInitializable (#149) * implmented delayed functionality into batchMetadata (#148) * implmented delayed functionality into batchMetadata * created tests for BatchMetadata * updated ERC1155 tests and updated from batchStartId to batchRange * Implement tokenIdERC1155 module to handle tokenId management (#147) * initial commit * created tests for tokenIdERC1155 * updated to be optional * updated naming and tests * Transfer validator has roles (#143) * created hasRole function in the roylaty module * created tests * Optimzed callback execution (#135) * gas benchmark * optimize execute callback function * fix typo * optimize execute callback view function * optimize callback mode loop * Implement Max per wallet (#151) * implemented maxMintPerWallet * tests pass * maxMintPerWalletExceeded tests pass * introduced base contracts for core and initilizable to inherit * rename commit * rename commit * renamed from core to coreInitializable for the ERC1155 (#152) * updated to now use 1e18 divided (#153) * Remove double initializer in ERC721CoreInitializable (#154) --------- Co-authored-by: Pranav Garg <[email protected]> Co-authored-by: Joaquim Verges <[email protected]> * Duplicate constant (#161) * [L-4] Wrong function selector returned for the transfer validation function (#150) * [L-4] Wrong function selector returned for the transfer validation function * [Q-3] Move interface identifier for ERC165 to Core * [Q-5] Royalty modules should inherit ICreatorToken interface * [Q-6] Nitpicks * removes duplicate supportsInterface (#156) * Has roles (#158) * created hasRole function in the roylaty module * created tests * removed duplicate constant in royaltyERC721 * removed .vscode * case sensitivity issue --------- Co-authored-by: Pranav Garg <[email protected]> Co-authored-by: Joaquim Verges <[email protected]>

GWSzeto mentioned this pull request Aug 31, 2024

Implement mintWithSignature, remove URI from mintable and implement updateMetadata #142

Closed

GWSzeto commented Sep 3, 2024

View reviewed changes

jakeloo reviewed Sep 3, 2024

View reviewed changes

GWSzeto commented Sep 3, 2024

View reviewed changes

GWSzeto force-pushed the ERC-1155-refactor branch from 0666385 to b9c9510 Compare September 3, 2024 18:28

GWSzeto changed the title ~~Erc 1155 refactor~~ Module Core Refactor Sep 4, 2024

joaquim-verges reviewed Sep 4, 2024

View reviewed changes

GWSzeto added 13 commits September 3, 2024 21:20

separated out metadata functionality from mintable module

f8018b8

built in signature mint into the core erc721 contract

c1ef767

implemented in Mintable

2fc137e

Implemented updateMetadata

283b33b

simplified parameters and structs

f761a49

all tests pass

4499b7f

updated ERC721 initializable to match ERC721Core

277f98f

addressed the PR issues

d9255f3

updated 1155 versions to now match 721 implementations

37ad293

completed all the tests

04c123d

Implemented parity in the ERC1155Initializable contract

d0adbda

unified naming from quantity and value to amount

1c1eff2

slapped on a keccak256

7040834

GWSzeto added 7 commits September 3, 2024 21:20

move OwnableRoles check on the signature

4a2d6b9

removed double events being emitted

dd912ea

tests pass

219b826

updated ERC20 core

eb93967

implemented Claimable and Mintable on the ERC20 side

c0fd3f9

tests pass

d86fc69

updated based on PR feedback

6f3039c

GWSzeto force-pushed the ERC-1155-refactor branch from 9c57d1e to 6f3039c Compare September 4, 2024 01:20

joaquim-verges approved these changes Sep 4, 2024

View reviewed changes

GWSzeto merged commit 76655aa into main Sep 4, 2024
5 checks passed

GWSzeto deleted the ERC-1155-refactor branch September 4, 2024 02:34

kumaryash90 restored the ERC-1155-refactor branch September 4, 2024 16:03

joaquim-verges deleted the ERC-1155-refactor branch September 4, 2024 22:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Module Core Refactor #145

Module Core Refactor #145

GWSzeto commented Aug 31, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

jakeloo Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

GWSzeto Sep 3, 2024

joaquim-verges Sep 4, 2024

joaquim-verges Sep 4, 2024

joaquim-verges Sep 4, 2024

joaquim-verges Sep 4, 2024

joaquim-verges Sep 4, 2024

Module Core Refactor #145

Module Core Refactor #145

Conversation

GWSzeto commented Aug 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment