feat: Sync layer stable #672

kelemeno · 2024-07-31T13:30:16Z

What ❔

Why ❔

Checklist

PR title corresponds to the body of PR (we generate changelog entries from PRs).
Tests for the changes have been added / updated.
Documentation comments have been added / updated.

vladbochok · 2024-08-19T10:19:32Z

da-contracts/contracts/IL1DAValidator.sol

+ bytes32 _l2DAValidatorOutputHash,
+ bytes calldata _operatorDAInput,
+ uint256 _maxBlobsSupported
+ ) external returns (L1DAValidatorOutput memory output);


Are you sure you want to make it non-static? This opens many questions on the call trace control (like reentrancy) but I don't think a stateful DA contract is popular

Suggested change

) external returns (L1DAValidatorOutput memory output);

) external view returns (L1DAValidatorOutput memory output);

@vladbochok The reason it is non-static is because on gateway we relay the calldata to L1 in this method.

vladbochok · 2024-08-19T10:20:53Z

da-contracts/contracts/IL1DAValidator.sol

+pragma solidity 0.8.24;
+
+struct L1DAValidatorOutput {
+ /// @dev The hash of the uncompressed state diff.


Please use standard natspec with param notation similar to this:

https://github.com/matter-labs/era-contracts/blob/main/l1-contracts/contracts/governance/IGovernance.sol#L10

vladbochok · 2024-08-19T10:23:00Z

da-contracts/contracts/IL1DAValidator.sol

+ bytes32[] blobsOpeningCommitments;
+}
+
+interface IL1DAValidator {


Why are these contracts stored in a separate directory? Wouldn't it be better to store it in l1-contracts dir?

Because of compilation reasons. They use the blobHash opcode, which is not supported for hardhat zk compilation. This was the easiest solution that we saw

vladbochok · 2024-08-19T10:24:19Z

da-contracts/contracts/IL1DAValidator.sol

+
+pragma solidity 0.8.24;
+
+struct L1DAValidatorOutput {


The convention we use for people who find a bug in the contract can find our contact quickly.

Suggested change

struct L1DAValidatorOutput {

/// @author Matter Labs

/// @custom:security-contact [email protected]

struct L1DAValidatorOutput {

da-contracts/contracts/CalldataDA.sol

da-contracts/contracts/ValidiumL1DAValidator.sol

l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol

vladbochok · 2024-08-19T12:06:25Z

l1-contracts/contracts/state-transition/data-availability/CalldataDA.sol

+
+/// @notice Contract that contains the functionality for process the calldata DA.
+/// @dev The expected l2DAValidator that should be used with it `RollupL2DAValidator`.
+abstract contract CalldataDA {


Why does this abstract contract exist? Wouldn't be better to just have it internal functions in the RollupL1DAValidator?

This is functionality reused in RollupL1DAValidator and CalldataDAGateway. In the perfect world we would've put those into the same folder but we can not for compilation reasons

l1-contracts/contracts/state-transition/ValidatorTimelock.sol

vladbochok · 2024-08-19T13:06:34Z

l1-contracts/contracts/state-transition/ValidatorTimelock.sol

@@ -180,15 +181,19 @@ contract ValidatorTimelock is IExecutor, Ownable2Step {

 /// @dev Check that batches were committed at least X time ago and
 /// make a call to the hyperchain diamond contract with the same calldata.
- function executeBatches(StoredBatchInfo[] calldata _newBatchesData) external onlyValidator(ERA_CHAIN_ID) {
- _executeBatchesInner(ERA_CHAIN_ID, _newBatchesData);
+ function executeBatches(


ValidatorTimelock should be backward compatible with all chain version from now and later, so I propose adding function executeBatches(StoredBatchInfo[] calldata _newBatchesData) so chains that haven't update yet would work as expected.

Better to make the one interface to not redeploy contract in the future at all, but let discuss it

…contracts into kl/message-root-update

…contracts into kl/sync-layer-reorg

Signed-off-by: Danil <[email protected]> Co-authored-by: Neo <[email protected]> Co-authored-by: tommysr <[email protected]> Co-authored-by: Rahul Saxena <[email protected]> Co-authored-by: Artem Makhortov <[email protected]> Co-authored-by: Bence Haromi <[email protected]> Co-authored-by: Zach Kolodny <[email protected]> Co-authored-by: Stanislav Bezkorovainyi <[email protected]> Co-authored-by: Vlad Bochok <[email protected]> Co-authored-by: perekopskiy <[email protected]> Co-authored-by: perekopskiy <[email protected]> Co-authored-by: Danil <[email protected]> Co-authored-by: Ivan Schasny <[email protected]> Co-authored-by: Raid5594 <[email protected]> Co-authored-by: Raid Ateir <[email protected]>

kelemeno · 2024-08-22T11:07:28Z

l2-contracts/contracts/L2ContractHelper.sol

+/// @dev The contract responsible for handling tokens native to a single chain.
+IL2NativeTokenVault constant L2_NATIVE_TOKEN_VAULT = IL2NativeTokenVault(address(USER_CONTRACTS_OFFSET + 0x04));
+
+uint256 constant L1_CHAIN_ID = 1;


lets not forget to remove

…a-contracts into kl/l2-native-token

…led deposits for bridged tokens, add forwarding function to L1AR for SDK

…2-l1-bridging

…-contracts into ra/l2-native

Merge reorg stable

fix: Ra/l2 native

fix: l2-native-token, bridge fixes

feat: periodic merge with multiple fixes

github-actions · 2024-10-08T10:12:11Z

Coverage after merging sync-layer-stable into dev will be

85.84%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
../da-contracts/contracts
RollupL1DAValidator.sol	64.94%	37.50%	83.33%	70.91%	145, 148, 148, 148, 150, 183–184, 187–188, 27, 27–28, 30, 30–31, 34, 36–37, 41–42, 65, 67, 67, 67–68, 70
contracts/bridge
BridgeHelper.sol	93.33%	50%	100%	100%	22
BridgedStandardERC20.sol	74.03%	25%	92.31%	76.79%	121–122, 127–128, 140–141, 165–166, 207, 207, 214, 214, 221, 221, 232, 62–63, 94–95
L1ERC20Bridge.sol	93.18%	80%	100%	93.75%	188–189, 264
L1Nullifier.sol	77.23%	58.82%	80%	83.22%	116–117, 132, 132–133, 140, 140–141, 148, 148–149, 178–179, 238–239, 241–242, 251–252, 260–261, 263, 429, 431–432, 432, 432, 434–435, 435, 435, 460–461, 482–483, 522, 617, 652–653, 706, 708, 710, 723, 737, 742
contracts/bridge/asset-router
AssetRouterBase.sol	83.78%	40%	100%	88%	138–139, 57–58, 85–86
L1AssetRouter.sol	88.75%	72%	88.89%	92.59%	204–205, 241, 250, 252, 255, 350, 57–58, 603, 622, 73–74, 81–82
contracts/bridge/ntv
L1NativeTokenVault.sol	78.91%	61.76%	93.33%	83.54%	137, 142, 145–146, 146, 146–148, 148, 148–150, 150, 150–151, 153, 205, 214, 216, 216, 216–217, 219, 254, 254–255
NativeTokenVault.sol	87.26%	68%	90.48%	90.99%	202, 204, 222–223, 230–231, 384, 386, 398–399, 433–434, 437–438, 464, 469, 67–68
contracts/bridgehub
Bridgehub.sol	79.12%	48.48%	89.36%	85.90%	114, 114–115, 121–122, 129–130, 136–137, 143, 143–144, 173, 188–189, 235–236, 236, 236–237, 244–245, 247–248, 251–252, 262–263, 277–278, 327–328, 330–331, 388–389, 404–405, 435–436, 442, 519–520, 601, 700, 703–704, 708–709, 744–745, 758, 801–802, 804–805, 807–808, 842–843, 846–847, 849–850, 885, 890
CTMDeploymentTracker.sol	79.07%	50%	90%	94.74%	115, 119, 34, 41, 64, 91, 94, 96
MessageRoot.sol	91.07%	63.64%	100%	96.97%	116–117, 148, 69, 87
contracts/common
ReentrancyGuard.sol	90%	66.67%	100%	92.86%	78–79
contracts/common/libraries
DataEncoding.sol	77.14%	50%	100%	80%	108, 112, 119, 129, 131, 134, 75, 83
DynamicIncrementalMerkle.sol	74.42%	100%	80%	72.22%	67–70, 72–74, 76–78
FullMerkle.sol	100%	100%	100%	100%
L2ContractHelper.sol	55.56%	0%	66.67%	64%	100, 100–101, 109, 68–69, 74–75, 78–79, 93, 95, 95–96
Merkle.sol	96.61%	90.91%	100%	97.67%	80–81
MessageHashing.sol	100%	100%	100%	100%
SemVer.sol	100%	100%	100%	100%
SystemContractsCaller.sol	0%	0%	0%	0%	114, 122–125, 135–138, 138–139, 141, 141–142, 33, 33–34, 37, 45, 47, 49, 51, 53, 66, 66, 66, 69, 72, 75, 78, 89, 91, 93, 96, 98
UncheckedMath.sol	100%	100%	100%	100%
UnsafeBytes.sol	84.21%	100%	83.33%	84.62%	35–36
contracts/governance
AccessControlRestriction.sol	100%	100%	100%	100%
ChainAdmin.sol	95.12%	80%	100%	96.15%	27–28
Governance.sol	98.15%	94.74%	100%	98.55%	45–46
L2ProxyAdminDeployer.sol	0%	100%	0%	0%	17–18, 20
PermanentRestriction.sol	89.43%	82.61%	100%	89.41%	110, 110–111, 138, 201, 201–202, 205, 207, 207–208, 248–249
TransitionaryOwner.sol	0%	100%	0%	0%	17, 22–23
contracts/state-transition
ChainTypeManager.sol	70.99%	33.33%	68.57%	80.58%	108, 135–136, 138–139, 141–142, 144–145, 200–201, 252, 276, 295, 302, 309, 317, 324, 332, 339, 355, 357, 419, 438, 438, 438, 441, 441, 441, 443, 456, 461, 486, 74, 87–88
TestnetVerifier.sol	77.78%	66.67%	100%	75%	16, 28
ValidatorTimelock.sol	95.08%	83.33%	100%	95.24%	200, 82–83
Verifier.sol	89.90%	40%	96.30%	90.93%	1674–1675, 287–302, 305–308, 311–318, 321–328, 331–332, 335–336, 339, 383–384, 394–395, 405–406, 416–417, 427–428, 443–444, 453, 453–454, 905–906
contracts/state-transition/chain-deps
DiamondInit.sol	80.43%	50%	100%	88.24%	39–40, 42–43, 45–46, 48–49, 73
DiamondProxy.sol	92.31%	75%	100%	100%	16, 27
contracts/state-transition/chain-deps/facets
Admin.sol	80.56%	50%	95.45%	91.18%	104–105, 115–116, 130, 130–131, 133–134, 157–158, 239, 241, 254–255, 261, 266, 284, 295–296, 301, 313, 315, 315, 315, 321, 321, 321–322, 322, 322–323, 325, 354, 356, 360, 369, 379, 383, 40, 40
Executor.sol	81.61%	62.34%	96%	87.02%	120–121, 173, 178, 183, 188, 193, 198, 202–203, 208–210, 212–213, 227–228, 246–247,

kelemeno requested review from vladbochok and StanislavBreadless as code owners July 31, 2024 13:30

kelemeno changed the base branch from kl/sync-layer-reorg to kl/custom-asset-bridging July 31, 2024 14:08

kelemeno changed the base branch from kl/custom-asset-bridging to dev August 8, 2024 11:30

kelemeno requested a review from Deniallugo as a code owner August 8, 2024 11:30

kelemeno mentioned this pull request Aug 12, 2024

feat: add custom asset bridging #484

Closed

3 tasks

vladbochok reviewed Aug 19, 2024

View reviewed changes

kelemeno and others added 16 commits August 21, 2024 16:10

Merge branch 'sync-layer-stable' of ssh://github.com/matter-labs/era-…

70a0660

…contracts into kl/message-root-update

foundry tests pass (though some were commented out)

2b2af24

Merge branch 'sync-layer-stable' of ssh://github.com/matter-labs/era-…

d1b5149

…contracts into kl/sync-layer-reorg

partial l1 test fix

00f7d8e

forceDeploymetns data

8421abc

bad merge

095a55a

merge kl reorg branch

4e084b7

foundry tests pass

ab605b2

make more tests pass

9e0c329

fmt

377d0aa

Merge branch 'kl/sync-layer-reorg-dev' into kl/sync-layer-reorg-foundry

9a168a6

message root fix

a80a667

renaming and some fixes

4255c63

lint

51d5dc4

kelemeno commented Aug 22, 2024

View reviewed changes

StanislavBreadless and others added 6 commits August 22, 2024 13:13

wip

f741346

erc20 tests in foundry work

f617301

aggregated root return value

0d7ee23

cover most of weth tsts

d2f83db

port the rest of the tests

ebfb6d2

remove old tests

c90c9f6

kelemeno and others added 29 commits September 30, 2024 13:58

Merge branch 'kl/sync-layer-reorg' of ssh://github.com/matter-labs/er…

0b0e4a7

…a-contracts into kl/l2-native-token

l1 test fixes

aa87952

gateway -> l1 migration fix

f6e3538

stas issue fixes

ffcc50f

rename l2 dummy tests

40a556a

renamed the dummy-tests folder

b88b1b6

(fix): support in Nullifier L2 native tokens, correct recovery of fai…

5e55954

…led deposits for bridged tokens, add forwarding function to L1AR for SDK

Merge commit '90b517394e222c98ea99713e1ce9b5a1c4e0870e' into ra/fix-l…

47ed94c

…2-l1-bridging

(merge): fix

0199a62

(fix): merger

905cc0d

(fix): formatting

ec73c3f

(test)

885605e

(fix): merge newer commit

069a34f

(fix): typo

d79b32b

missing broadcast

37dc6cd

contract ad vm.broadcast

340d506

zks fmt

8e7af17

Merge branch 'kl/l2-native-token' of ssh://github.com/matter-labs/era…

21185a2

…-contracts into ra/l2-native

Merge pull request #831 from matter-labs/sb-merge-reorg-stable

a3ba4b3

Merge reorg stable

Merge pull request #837 from matter-labs/ra/l2-native

6bbcb1d

fix: Ra/l2 native

hopefully final cleanup

5d60926

sys hashes

4c9b96c

stas issue fixes

fa030cd

compilation and test

6afd801

fmt

1d1e732

stas issues 2

24f6464

error selector typo

28c91ad

Merge pull request #811 from matter-labs/kl/l2-native-token

53b0283

fix: l2-native-token, bridge fixes

Merge pull request #842 from matter-labs/kl/sync-layer-reorg

9e4a192

feat: periodic merge with multiple fixes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Sync layer stable #672

feat: Sync layer stable #672

kelemeno commented Jul 31, 2024

vladbochok Aug 19, 2024

StanislavBreadless Aug 20, 2024

vladbochok Aug 19, 2024

vladbochok Aug 19, 2024

kelemeno Aug 19, 2024

vladbochok Aug 19, 2024

vladbochok Aug 19, 2024

StanislavBreadless Aug 26, 2024 •

edited

Loading

vladbochok Aug 19, 2024

kelemeno Aug 22, 2024

github-actions bot commented Oct 8, 2024

	) external returns (L1DAValidatorOutput memory output);
	) external view returns (L1DAValidatorOutput memory output);

feat: Sync layer stable #672

Are you sure you want to change the base?

feat: Sync layer stable #672

Conversation

kelemeno commented Jul 31, 2024

What ❔

Why ❔

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StanislavBreadless Aug 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Oct 8, 2024

StanislavBreadless Aug 26, 2024 •

edited

Loading