Repository navigation
Render calldata fields on array paths as nested calls - #20
Merged
llbartekll merged 1 commit intoOct 21, 2026
Merged
Conversation
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.
This was referenced Oct 21, 2026
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: keep the tests from both sides.
llbartekll
added a commit
that referenced
this pull request
Oct 21, 2026
…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>
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 and llbartekll#22: 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
…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>
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
A field with
"format": "calldata"on an array path, for examplecalls.[].dataordata.[]in amulticall(bytes[]), renders as raw hex and not as a nested call. There are three causes:render_fields(calldata) andrender_typed_fields(EIP-712), the.[]branch sends each element toformat_value. Only the non-array branch callsrender_calldata_field.resolve_descriptors_for_txandresolve_descriptors_for_typed_datacallresolve_pathon the data path with.[]. That does not givebytes, so the resolver never loads the descriptors of the inner calls.index_array_paramschanges onlytokenPathto the element index. ThuscalleePath: "calls.[].target"does not resolve for an element. The same applies tocollectionPath: "collections.[]"on annftNamefield withtokenIds.[], which then shows the raw token ID.The Sourcify runner renders these as nested calls. Thus the registry CI shows the Rust job red and the Sourcify job green. Examples:
multicall(bytes[]), PurchaseBundlerexecutionData.[], UserVaultcollectionPath: "_collections.[]")executeBatch, pathcalls.[].data)PR #17 also had a fix for 1, but its author closed it, and it also changed nested interpolated intents and the bindings. This PR has only the fix for the array path.
Change
.[]branch now goes torender_calldata_field/render_typed_calldata_field. Each element becomes its ownDisplayEntry::Nested.CalldataFieldInfo::expand_arrayexpands a.[]data path into one field per element. It also sets the index in the callee, selector and chain ID paths.index_array_paramsnow sets the index in all element-relative path params:tokenPath,chainIdPath,selectorPath,calleePath,amountPath,spenderPathandcollectionPath. A path without.[]does not change.Tests
test_calldata_array_path_renders_each_element_nested_calldata_eip712_parity. It checks the calldata and EIP-712 parity forbatch((address,bytes)[]), where two calls go to two different callees.test_resolver_finds_nested_descriptors_for_calldata_array_path.test_index_array_params_scopes_all_element_paths.cargo test --workspace --lockedpasses.cs-teston alltestsv2files of registrymaster:aave/calldata-lpv3Generic ERC-20 handler so approve / transfer don't fall back to raw hex #8,serenita/calldata-EthVaultRestore legacy-tx decoding in cs-test #4)nftNamefallback for an unknown collection, which is a different problem.