Skip to content

fix: fix re-use string for user-ops sender/to #465

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

Merged
ccharly merged 7 commits into from
Feb 9, 2026
Merged

fix: fix re-use string for user-ops sender/to #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af83e7b
fix: fix re-use string for user-ops sender/to
ccharly Feb 6, 2026
689db16
chore: update changelog
ccharly Feb 9, 2026
0af7a1e
chore: update changelog + add EthAddressStrictStruct
ccharly Feb 9, 2026
d6f08ea
chore: revert
ccharly Feb 9, 2026
d405575
chore: better changelog
ccharly Feb 9, 2026
2b1eb24
chore: better changelog
ccharly Feb 9, 2026
67374c9
chore: rename struct
ccharly Feb 9, 2026
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
12 changes: 12 additions & 0 deletions packages/keyring-api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Add `EthAddressStrictStruct` struct and `EthAddressStrict` types ([#465](https://github.com/MetaMask/accounts/pull/465))
- This is a stricter variant of `EthAddressStruct` which uses `Hex` instead of `string` for its inferred type.

### Changed

- Re-use `string` for ERC4337 address-like fields ([#465](https://github.com/MetaMask/accounts/pull/465))
- This change reverts that and keeps using `string` for all address-like types.
- Changes in [#405](https://github.com/MetaMask/accounts/pull/405) updated the associated type for `EthAddressStruct` from `string` to `Hex`, this was actually a small breaking change that went unnoticed and that would require some effort to adapt in upstream clients/controllers, for this reason, we are undoing this change for now.
- Version [21.4.0] will be marked as **YANKED**, consumers are expected to use this new version that reverts this breaking change.

## [21.4.0]

### Added
Expand Down
8 changes: 6 additions & 2 deletions packages/keyring-api/src/eth/rpc/params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ import {
unknown,
} from '@metamask/superstruct';

import { EthAddressStruct, EthBytesStruct } from '../types';
import {
EthAddressStrictStruct,
EthAddressStruct,
EthBytesStruct,
} from '../types';

/**
* A struct for validating Ethereum transaction data.
Expand Down Expand Up @@ -118,7 +122,7 @@ export type EthEncryptedData = Infer<typeof EthEncryptedDataStruct>;
*/
export const EthEip7702AuthorizationStruct = tuple([
number(), // chainId
EthAddressStruct, // address (contract to delegate to)
EthAddressStrictStruct, // address (contract to delegate to)
number(), // nonce
]);

Expand Down
9 changes: 6 additions & 3 deletions packages/keyring-api/src/eth/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ import {

export const EthBytesStruct = definePattern('EthBytes', /^0x[0-9a-f]*$/iu);

export const EthAddressStruct = definePattern<Hex>(
'EthAddress',
/^0x[0-9a-f]{40}$/iu,
const ETH_ADDRESS_REGEX = /^0x[0-9a-f]{40}$/iu;
export const EthAddressStruct = definePattern('EthAddress', ETH_ADDRESS_REGEX);
// Stricter struct that uses `Hex` as final type.
export const EthAddressStrictStruct = definePattern<Hex>(
'EthAddressStrict',
ETH_ADDRESS_REGEX,
);

export const EthUint256Struct = definePattern(
Expand Down
Loading