Merge branch 'master' into add-erc-7531

ethereum · Nov 26, 2023 · ea12dbd · ea12dbd
2 parents dbeefea + 7cf426e
commit ea12dbd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/ERCS/erc-6909.md b/ERCS/erc-6909.md
@@ -325,7 +325,7 @@ The `safeTransfer` and `safeTransferFrom` naming conventions are misleading, esp
 
 ### Interface ID
 
-The interface ID is `0xb2e69f8a`.
+The interface ID is `0x0f632fb3`.
 
 ### Metadata Extension
 
@@ -542,7 +542,7 @@ contract ERC6909 {
     /// @param interfaceId The interface identifier, as specified in ERC-165.
     /// @return supported True if the contract implements `interfaceId`.
     function supportsInterface(bytes4 interfaceId) public pure returns (bool supported) {
-        return interfaceId == 0xb2e69f8a || interfaceId == 0x01ffc9a7;
+        return interfaceId == 0x0f632fb3 || interfaceId == 0x01ffc9a7;
     }
 
     function _mint(address receiver, uint256 id, uint256 amount) internal {

diff --git a/assets/eip-5564/minimal_poc.ipynb → assets/erc-5564/minimal_poc.ipynb b/assets/eip-5564/minimal_poc.ipynb → assets/erc-5564/minimal_poc.ipynb
diff --git a/assets/eip-5564/scheme_ids.md → assets/erc-5564/scheme_ids.md b/assets/eip-5564/scheme_ids.md → assets/erc-5564/scheme_ids.md
diff --git a/config/eipw.toml b/config/eipw.toml
@@ -68,10 +68,11 @@ mode = "excludes"
 pattern = '(?i)erc[\s]*[0-9]+'
 message = "proposals must be referenced with the form `ERC-N` (not `ERCN` or `ERC N`)"
 
-[lints.markdown-refs]
-kind = "markdown-proposal-ref"
-prefix = "erc-"
-suffix = ".md"
+## TODO: Disabled because half the files are in another repository.
+# [lints.markdown-refs]
+# kind = "markdown-proposal-ref"
+# prefix = "erc-"
+# suffix = ".md"
 
 [lints.preamble-req-withdrawal-reason]
 kind = "preamble-required-if-eq"
@@ -96,25 +97,26 @@ names = [
     "withdrawal-reason",
 ]
 
-[lints.preamble-requires-status]
-prefix = "erc-"
-suffix = ".md"
-kind = "preamble-requires-status"
-requires = "requires"
-status = "status"
-flow = [
-    [
-    "Draft",
-    "Stagnant",
-],
-    ["Review"],
-    ["Last Call"],
-    [
-    "Final",
-    "Withdrawn",
-    "Living",
-],
-]
+## TODO: Disabled because half the files are in another repository.
+# [lints.preamble-requires-status]
+# prefix = "erc-"
+# suffix = ".md"
+# kind = "preamble-requires-status"
+# requires = "requires"
+# status = "status"
+# flow = [
+#     [
+#         "Draft",
+#         "Stagnant",
+#     ],
+#     ["Review"],
+#     ["Last Call"],
+#     [
+#         "Final",
+#         "Withdrawn",
+#         "Living",
+#     ],
+# ]
 
 [lints.markdown-order-section]
 kind = "markdown-section-order"