Skip to content

Render chainId values with EIP-155 reference names - #18

Merged
llbartekll merged 8 commits into
llbartekll:mainfrom
RyukTheCoder:fix/chain-id-eip155-names
Oct 21, 2026
Merged

llbartekll merged 8 commits into
llbartekll:mainfrom
RyukTheCoder:fix/chain-id-eip155-names

Conversation

@RyukTheCoder

@RyukTheCoder RyukTheCoder commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

Fixes #14

Summary

The chainId format converts the value "to a Blockchain name using EIP-155 reference values", and the spec's example is Ethereum Mainnet for chain 1. chain_name used shorter names, so chain 137 rendered as Polygon where @ethereum-sourcify/clear-signing renders Polygon Mainnet. Because of that mismatch, the registry's Rust CI job fails on ethereum/clear-signing-erc7730-registry#2590.

This PR changes every entry in the table to the name field from the EIP-155 chain list at chainid.network:

chain before after
1 Ethereum Ethereum Mainnet
10 Optimism OP Mainnet
14 Flare Flare Mainnet
19 Songbird Songbird Canary-Network
56 BNB Chain BNB Smart Chain Mainnet
137 Polygon Polygon Mainnet
250 Fantom Fantom Opera
324 zkSync Era zkSync Mainnet
43114 Avalanche Avalanche C-Chain

Gnosis, Base, Arbitrum One, Arbitrum Nova, Linea, Scroll and Zora already matched. Unknown chains still fall back to Chain {id}. The native-currency names used for token amounts are unchanged.

Calldata and EIP-712 both go through chain_name, so this fixes both paths.

Tests

  • Updated test_chain_name to the new names and added a check for 42161.
  • Added test_chain_id_format_uses_eip155_reference_names_calldata_eip712_parity to spec_compliance.rs. It renders chains 1, 137 and 42161 through both calldata and EIP-712 and checks that the two paths agree.

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.
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>
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>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@llbartekll
llbartekll merged commit 05ddcaa into llbartekll:main 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, 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>
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.

chainId format renders chain 137 as "Polygon" rather than the EIP-155 reference name "Polygon Mainnet"

3 participants