Skip to content

N-09: fix naming inconsistencies for v31 #2127

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
valera-grinenko-ai wants to merge 3 commits into
base: draft-v31
Choose a base branch
from
Open

N-09: fix naming inconsistencies for v31 #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f94ba4a
N-09: rename l1AssetHandler to assetHandler in AssetRouterBase._burn
Apr 7, 2026
0cd8fa0
N-09: replace NotHyperchain with NotAZKChain in Mailbox
Apr 7, 2026
cfb22e3
N-09: remove obsolete NotHyperchain error definition
Apr 7, 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
8 changes: 4 additions & 4 deletions l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable,
bool _passValue,
address _nativeTokenVault
) internal returns (bytes memory bridgeMintCalldata) {
address l1AssetHandler = assetHandlerAddress[_assetId];
if (l1AssetHandler == address(0)) {
address assetHandler = assetHandlerAddress[_assetId];
if (assetHandler == address(0)) {
// As a UX feature, whenever an asset handler is not present, we always try to register asset within native token vault.
// The Native Token Vault is trusted to revert in an asset does not belong to it.
//
Expand All @@ -265,11 +265,11 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable,
// We do not do any additional transformations here (like setting `assetHandler` in the mapping),
// because we expect that all those happened inside `tryRegisterTokenFromBurnData`

l1AssetHandler = _nativeTokenVault;
assetHandler = _nativeTokenVault;
}

uint256 msgValue = _passValue ? msg.value : 0;
bridgeMintCalldata = IAssetHandler(l1AssetHandler).bridgeBurn{value: msgValue}({
bridgeMintCalldata = IAssetHandler(assetHandler).bridgeBurn{value: msgValue}({
_chainId: _chainId,
_msgValue: _nextMsgValue,
_assetId: _assetId,
Expand Down
2 changes: 0 additions & 2 deletions l1-contracts/contracts/state-transition/L1StateTransitionErrors.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ error NotEnoughSignatures();
error NotEraChain();
// 0xa7050bf6
error NotHistoricalRoot(bytes32);
// 0x32ddf9a2
error NotHyperchain();
// 0x87470e36
error NotL1(uint256 blockChainId);
// 0x1e9f6a9e
Expand Down
5 changes: 3 additions & 2 deletions l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@ import {
GasPerPubdataMismatch,
InvalidChainId,
MsgValueTooLow,
NotAZKChain,
NotAssetRouter,
OnlyEraSupported,
TooManyFactoryDeps,
TransactionNotAllowed,
ZeroAddress
} from "../../../common/L1ContractErrors.sol";
import {DepositsPaused, NotHyperchain, NotL1, NotSettlementLayer} from "../../L1StateTransitionErrors.sol";
import {DepositsPaused, NotL1, NotSettlementLayer} from "../../L1StateTransitionErrors.sol";

// While formally the following import is not used, it is needed to inherit documentation from it
import {IZKChainBase} from "../../chain-interfaces/IZKChainBase.sol";
Expand Down Expand Up @@ -307,7 +308,7 @@ contract MailboxFacet is ZKChainBase, IMailboxImpl, MessageVerification, IMailbo
revert NotSettlementLayer();
}
if (IBridgehubBase(s.bridgehub).getZKChain(_chainId) != msg.sender) {
revert NotHyperchain();
revert NotAZKChain(msg.sender);
}
// Note during the upgrade to V31 no chain will be on GW.

Expand Down
3 changes: 1 addition & 2 deletions ...foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/MailboxExtended.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ import {IChainAssetHandlerBase} from "contracts/core/chain-asset-handler/IChainA

import {IEIP7702Checker} from "contracts/state-transition/chain-interfaces/IEIP7702Checker.sol";

import {AddressNotZero, ZeroAddress} from "contracts/common/L1ContractErrors.sol";
import {AddressNotZero, NotAZKChain, ZeroAddress} from "contracts/common/L1ContractErrors.sol";
Copy link
Copy Markdown
Collaborator

@StanislavBreadless StanislavBreadless Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it appears that this error is never tested, right? we added it here inside the imports and never ended up using it

import {
DepositsPaused,
NotHyperchain,
NotL1,
NotSettlementLayer
} from "contracts/state-transition/L1StateTransitionErrors.sol";
Expand Down