Skip to content

Refactor ERC‑7930 EVM format helpers to reuse shared encoder #6040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor ERC‑7930 EVM format helpers to reuse shared encoder #6040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions contracts/utils/draft-InteroperableAddress.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: MIT
// OpenZeppelin Contracts (last updated v5.5.0) (utils/draft-InteroperableAddress.sol)

pragma solidity ^0.8.26;

Expand Down Expand Up @@ -46,23 +45,21 @@ library InteroperableAddress {
* address (version 1) for a given chainid and ethereum address.
*/
function formatEvmV1(uint256 chainid, address addr) internal pure returns (bytes memory) {
bytes memory chainReference = _toChainReference(chainid);
return abi.encodePacked(bytes4(0x00010000), uint8(chainReference.length), chainReference, uint8(20), addr);
return formatV1(0x0000, _toChainReference(chainid), abi.encodePacked(addr));
}

/**
* @dev Variant of {formatV1-bytes2-bytes-bytes-} that specifies an EVM chain without an address.
*/
function formatEvmV1(uint256 chainid) internal pure returns (bytes memory) {
bytes memory chainReference = _toChainReference(chainid);
return abi.encodePacked(bytes4(0x00010000), uint8(chainReference.length), chainReference, uint8(0));
return formatV1(0x0000, _toChainReference(chainid), new bytes(0));
}

/**
* @dev Variant of {formatV1-bytes2-bytes-bytes-} that specifies an EVM address without a chain reference.
*/
function formatEvmV1(address addr) internal pure returns (bytes memory) {
return abi.encodePacked(bytes6(0x000100000014), addr);
return formatV1(0x0000, new bytes(0), abi.encodePacked(addr));
}

/**
Expand Down
Loading