Skip to content

Fall back to the raw token ID for an unknown NFT collection - #21

Merged
llbartekll merged 8 commits into
llbartekll:mainfrom
manuelwedler:fix/nft-name-raw-fallback
Oct 21, 2026
Merged

llbartekll merged 8 commits into
llbartekll:mainfrom
manuelwedler:fix/nft-name-raw-fallback

Conversation

@manuelwedler

Copy link
Copy Markdown
Contributor

Problem

The ERC-7730 nftName format reads: "Display value as a specific NFT in a collection, if found by wallet, or fallback to a raw int token ID if not".

When the wallet does not know the collection, both flows show #<id>:

  • calldata: when the provider returns no collection name
  • EIP-712: also when no collection address resolves

The spec asks for the raw token ID, and the Sourcify runner shows the raw token ID. Thus the registry CI shows the Rust job red on ethereum/clear-signing-erc7730-registry#3116 (Gondi LoanOffer v3_2: expected 5016, Rust shows #5016).

Change

  • format_nft_name (calldata) and the EIP-712 nftName branch now return the raw token ID when the collection name is not found.
  • A known collection still shows {name} #{id}.
  • The diagnostics do not change.

Spec test change: please review

test_eip712_nft_name_format in spec_compliance.rs expected #42. I changed it to 42, because the spec text above asks for the raw token ID. This is a change to a spec compliance assertion, so please confirm that you agree with it.

Tests

  • I added test_nft_name_unknown_collection_falls_back_to_raw_token_id_calldata_eip712_parity.
  • cargo test --workspace --locked passes.
  • I ran cs-test on all testsv2 files of registry master. The change causes no new failures.
  • With Render calldata fields on array paths as nested calls #20, all 74 cases of registry #3116 pass.

Note: this PR and #20 both add tests at the end of spec_compliance.rs, so the second merge has a simple conflict in that file.

ERC-7730 nftName: 'fallback to a raw int token ID if not' found. Both
flows rendered '#<id>' when the collection name was unknown, and the
EIP-712 flow did so also when no collection address resolved.
manuelwedler and others added 7 commits October 21, 2026 15:18
Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).
…tekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.
…l#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.
…lbartekll#22)

* fix: match an interpolation placeholder for one element of an array field

A placeholder such as {_swapData.[0].fromAmount} did not match the
display field _swapData.[].fromAmount, so the whole interpolatedIntent
was dropped. When no field matches exactly, match the array field and
format the named element with its format and element-scoped params.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>
…lbartekll#23)

* fix: accept definitions without a label and apply the $ref label

A display definition without label failed to parse ('data did not match
any variant of untagged enum DisplayField'), so the whole descriptor was
rejected. The schema does not require label, and a reference's label
overrides the definition's. Make Simple.label default to empty, and add
the optional label to Reference and apply it when the reference expands.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

* Match an interpolation placeholder for one element of an array field (llbartekll#22)

* fix: match an interpolation placeholder for one element of an array field

A placeholder such as {_swapData.[0].fromAmount} did not match the
display field _swapData.[].fromAmount, so the whole interpolatedIntent
was dropped. When no field matches exactly, match the array field and
format the named element with its format and element-scoped params.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Render chainId values with EIP-155 reference names (llbartekll#14)

The spec defines the chainId format as converting the value "to a
Blockchain name using EIP-155 reference values", with "Ethereum Mainnet"
as the example for 1. Use the `name` fields from the chainid.network
EIP-155 list, so 137 renders as "Polygon Mainnet" instead of "Polygon"
and matches @ethereum-sourcify/clear-signing.

Adds a calldata/EIP-712 parity test for the chainId format.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

* Match an interpolation placeholder for one element of an array field (llbartekll#22)

* fix: match an interpolation placeholder for one element of an array field

A placeholder such as {_swapData.[0].fromAmount} did not match the
display field _swapData.[].fromAmount, so the whole interpolatedIntent
was dropped. When no field matches exactly, match the array field and
format the named element with its format and element-scoped params.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>

* Accept definitions without a label and apply the $ref label override (llbartekll#23)

* fix: accept definitions without a label and apply the $ref label

A display definition without label failed to parse ('data did not match
any variant of untagged enum DisplayField'), so the whole descriptor was
rejected. The schema does not require label, and a reference's label
overrides the definition's. Make Simple.label default to empty, and add
the optional label to Reference and apply it when the reference expands.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

* Match an interpolation placeholder for one element of an array field (llbartekll#22)

* fix: match an interpolation placeholder for one element of an array field

A placeholder such as {_swapData.[0].fromAmount} did not match the
display field _swapData.[].fromAmount, so the whole interpolatedIntent
was dropped. When no field matches exactly, match the array field and
format the named element with its format and element-scoped params.

* ci: update android-actions/setup-android to v4 (llbartekll#24)

Google no longer serves the legacy SDK package 'tools'. setup-android v3
installs 'tools platform-tools' by default, so sdkmanager fails with
"Failed to find package 'tools'" and the Android job is red on every PR.
v4 installs only 'platform-tools' (fix in v4.0.2).

* fix: take native currency metadata from the EIP-155 chain list (llbartekll#19)

native_token_meta used a short hand-written table. Chain 137 rendered as
MATIC (now POL), and chains not in the table, such as Celo (42220) and
Gnosis (100), rendered as ETH. Generate the table from
chainid.network/chains_mini.json, the source that the Sourcify runner uses.

* fix: render calldata fields on array paths as nested calls (llbartekll#20)

A calldata field with an array path (calls.[].data) went through
format_value and rendered raw hex, and the resolver did not load the
descriptors of the inner calls. Render each element with the nested
calldata renderer in the calldata and EIP-712 flows, expand array data
paths in the resolver, and scope all element-relative path params
(calleePath, amountPath, spenderPath, selectorPath, chainIdPath,
collectionPath) to the element, not only tokenPath.

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>

---------

Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

* style: cargo fmt

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Manuel Wedler <manuel@wedler.dev>
Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Resolve the spec_compliance.rs conflict with llbartekll#20, llbartekll#22, llbartekll#23 and llbartekll#18: keep the tests from both sides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@llbartekll
llbartekll merged commit 65af228 into llbartekll:main Oct 21, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants