Repository navigation
Accept definitions without a label and apply the $ref label override - #23
Merged
llbartekll merged 6 commits intoOct 21, 2026
Merged
Conversation
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.
This was referenced Oct 21, 2026
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>
Resolve the spec_compliance.rs conflict with llbartekll#20 and llbartekll#22: keep the tests from both sides. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
llbartekll
added a commit
to RyukTheCoder/clear-signing
that referenced
this pull request
Oct 21, 2026
Resolve the spec_compliance.rs conflict with llbartekll#20, llbartekll#22 and llbartekll#23: keep the tests from both sides. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
llbartekll
added a commit
that referenced
this pull request
Oct 21, 2026
* Render chainId values with EIP-155 reference names (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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>
llbartekll
added a commit
to manuelwedler/llbartekll-clear-signing
that referenced
this pull request
Oct 21, 2026
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
added a commit
that referenced
this pull request
Oct 21, 2026
* fix: fall back to the raw token ID for an unknown NFT collection 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. * ci: update android-actions/setup-android to v4 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#18) * Render chainId values with EIP-155 reference names (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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> --------- Co-authored-by: Bartosz Rozwarski <bartus000@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: RyukTheCoder <154742563+RyukTheCoder@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
label:DisplayField::Simplerequireslabel. Thus a definition such as"ucdAmount": { "format": "tokenAmount", "params": { … } }does not parse ("data did not match any variant of untagged enum DisplayField"), and Rust rejects the whole descriptor. The v2 schema does not requirelabelon a field format. A definition that is used only through$refgets its label from the referencing field.labelon a reference:DisplayField::Referencehas nolabelfield, so Rust drops the label of the referencing field. The schema says: "This value overrides the label in the referenced definition if set."The Sourcify runner accepts these descriptors. Thus the registry CI shows the Rust job red and the Sourcify job green on ethereum/clear-signing-erc7730-registry#2883 (Diamond Hands
PositionManager). There, the Rust runner stops with exit status 2.Change
DisplayField::Simple.labelgets#[serde(default)], so a missing label becomes an empty string. The type staysString, so the public API does not change.DisplayField::Referencegetslabel: Option<String>.expand_display_fieldsapplies that label over the label of the definition.prepend_scope_pathkeeps the label.merge_ref_with_definitiondoes not change its signature.Tests
I added
test_reference_label_overrides_definition_label_calldata_eip712_parity. It checks:labelthat a reference withlabeluseslabelthat overrides the definition labellabelthat keeps the definition labelWithout the fix, the test fails with the same parse error as the registry CI.
cargo test --workspace --lockedpasses.I ran
cs-teston alltestsv2files of registrymaster. The change causes no new failures.Registry #2883: all 20 cases pass. Before,
PositionManagerstopped the runner.