Skip to content
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.

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

Port some commits from kl/sync-layer-reorg #697

Merged
merged 28 commits into from
Aug 14, 2024

Conversation

StanislavBreadless
Copy link
Collaborator

What ❔

Port some commits from kl/sync-layer-reorg into the stable branch

Corresponding zksync-era pr here: matter-labs/zksync-era#2650

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.

Copy link

Changes to gas cost

Generated at commit: fd7e9b8b166cbb929b2cf767d99e74ef5327110b, compared to commit: 2b3d4af22ab50625db6f24df659b0bd1f10ce036

🧾 Summary (100% most significant diffs)

Contract Method Avg (+/-) %
TransparentUpgradeableProxy acceptOwnership
addToken
assetHandlerAddress
bridgeMint
bridgeRecoverFailedTransfer
bridgehubConfirmL2Transaction
bridgehubDeposit
bridgehubDepositBaseToken
claimFailedDeposit
createNewChain
depositHappened
depositLegacyErc20Bridge
finalizeWithdrawal
finalizeWithdrawalLegacyErc20Bridge
getChainAdmin
getERC20Getters
legacyBridge
nativeTokenVault
owner
pause
paused
registerToken
requestL2TransactionDirect
setAssetHandlerAddressOnCounterPart
setChainCreationParams
setL1Erc20Bridge
setNewVersionUpgrade
setUpgradeDiamondCut
setValidatorTimelock
sharedBridge
stateTransitionManagerIsRegistered
transferFundsFromSharedBridge
transferTokenToNTV
unpause
validatorTimelock
+33 ❌
+1,145 ❌
-495 ✅
-76,813 ✅
+1,398 ❌
+44 ❌
-640 ✅
+4,839 ❌
+232 ❌
+1,166,511 ❌
+10 ❌
+52,899 ❌
+47 ❌
+85 ❌
+22 ❌
+808 ❌
-11 ✅
-3,075 ✅
-8 ✅
-43 ✅
-66 ✅
-48 ✅
+1,473 ❌
+35 ❌
+312 ❌
+10 ❌
+751 ❌
+312 ❌
-3,231 ✅
-1,000 ✅
-22 ✅
+6 ❌
+22 ❌
-67 ✅
+625 ❌
+0.09%
+2.14%
-28.55%
-2.04%
+1.85%
+0.09%
-0.75%
+6.39%
+0.30%
+1699.31%
+0.41%
+65.52%
+0.05%
+0.07%
+0.75%
+8.36%
-0.54%
-60.32%
-0.29%
-0.08%
-6.20%
-0.04%
+0.55%
+0.09%
+0.32%
+0.02%
+0.37%
+0.32%
-8.15%
-32.98%
-1.77%
+0.01%
+0.07%
-0.21%
+11.74%
L1AssetRouter acceptOwnership
assetHandlerAddress
bridgeRecoverFailedTransfer
bridgehubConfirmL2Transaction
bridgehubDeposit
bridgehubDepositBaseToken
chainBalance
claimFailedDeposit
depositHappened
depositLegacyErc20Bridge
finalizeWithdrawal
finalizeWithdrawalLegacyErc20Bridge
pause
setAssetHandlerAddressOnCounterPart
setL1Erc20Bridge
transferTokenToNTV
unpause
+66 ❌
-109 ✅
+1,398 ❌
+44 ❌
+4,682 ❌
+4,414 ❌
+11 ❌
+903 ❌
+11 ❌
+59,299 ❌
+47 ❌
+85 ❌
-43 ✅
+35 ❌
+9 ❌
+32 ❌
-67 ✅
+0.55%
-15.20%
+2.97%
+0.20%
+5.17%
+8.10%
+1.14%
+1.70%
+1.23%
+112.03%
+0.08%
+0.09%
-0.17%
+0.33%
+0.04%
+0.34%
-0.77%
Bridgehub acceptAdmin
addStateTransitionManager
addToken
bridgeBurn
bridgeMint
createNewChain
removeStateTransitionManager
requestL2TransactionDirect
requestL2TransactionTwoBridges
setPendingAdmin
stateTransitionManager
stateTransitionManagerIsRegistered
-22 ✅
+815 ❌
-889 ✅
+4,879 ❌
-76,460 ✅
-61,049 ✅
+282 ❌
+1,473 ❌
+11,320 ❌
-101 ✅
+22 ❌
-22 ✅
-0.05%
+2.02%
-2.39%
+3.15%
-2.05%
-1.58%
+1.12%
+0.61%
+2.08%
-0.27%
+2.24%
-1.72%
L1NativeTokenVault bridgeBurn
bridgeMint
bridgeRecoverFailedTransfer
getERC20Getters
initialize
transferFundsFromSharedBridge
+4,715 ❌
-22 ✅
+73 ❌
+784 ❌
+15 ❌
+6 ❌
+17.09%
-0.06%
+0.24%
+31.64%
+0.03%
+0.03%
StateTransitionManager createNewChain
forwardedBridgeBurn
forwardedBridgeMint
getChainAdmin
initialize
setChainCreationParams
setNewVersionUpgrade
setUpgradeDiamondCut
setValidatorTimelock
-27,062 ✅
+5,627 ❌
-53,144 ✅
+22 ❌
-6,818 ✅
+189 ❌
+628 ❌
+189 ❌
-3,239 ✅
-0.86%
+20.75%
-1.60%
+0.96%
-4.82%
+0.42%
+0.42%
+0.41%
-28.68%
STMDeploymentTracker bridgehubDeposit
registerSTMAssetOnL1
-5 ✅
-22,007 ✅
-0.19%
-28.67%
TestCalldataDA processCalldataDA
processL2RollupDAValidatorOutputHash
-179 ✅
-52 ✅
-20.53%
-3.09%
AdminFacet executeUpgrade
forwardedBridgeBurn
forwardedBridgeMint
genesisUpgrade
setPriorityTxMaxGasLimit
upgradeChainFromVersion
+47,049 ❌
-2,000 ✅
+2,370 ❌
-113 ✅
-22 ✅
-22 ✅
+15.76%
-3.34%
+2.65%
-0.10%
-0.47%
-0.21%
GettersFacetWrapper facetAddress
facetFunctionSelectors
getPriorityQueueSize
isEthWithdrawalFinalized
isFacetFreezable
storedBatchHash
util_setAdmin
util_setBridgehub
util_setFacets
util_setL2BootloaderBytecodeHash
util_setL2LogsRootHash
util_setPendingAdmin
util_setPriorityTxMaxGasLimit
util_setStateTransitionManager
util_setTotalBatchesVerified
util_setTotalPriorityTxs
util_setVerifierParams
+87 ❌
+88 ❌
-22 ✅
-22 ✅
-22 ✅
-22 ✅
-22 ✅
+89 ❌
-22 ✅
-22 ✅
+89 ❌
-22 ✅
-22 ✅
+88 ❌
-22 ✅
-22 ✅
-22 ✅
+12.81%
+4.89%
-0.45%
-3.27%
-1.05%
-4.02%
-0.05%
+0.20%
-0.02%
-0.05%
+0.20%
-0.05%
-0.05%
+0.20%
-0.05%
-0.05%
-0.02%
MessageRoot addNewChain
addNewChainIfNeeded
initialize
-16,557 ✅
-27,659 ✅
+22 ❌
-6.65%
-11.73%
+0.02%
DiamondProxy bridgehubRequestL2Transaction
executeUpgrade
getAdmin
setPriorityTxMaxGasLimit
upgradeChainFromVersion
-22 ✅
+27,016 ❌
+6 ❌
-22 ✅
-22 ✅
-0.02%
+9.57%
+0.40%
-0.07%
-0.05%
L1ERC20Bridge claimFailedDeposit
deposit(address,address,uint256,uint256,uint256)
deposit(address,address,uint256,uint256,uint256,address)
finalizeWithdrawal
initialize
isWithdrawalFinalized
+75 ❌
+3,691 ❌
-30 ✅
-21 ✅
-22 ✅
-22 ✅
+0.19%
+6.17%
-0.04%
-0.06%
-0.10%
-1.91%
TestExecutor commitBatches +2,035 ❌ +7.38%
RelayedSLDAValidator checkDA +1,884 ❌ +6.38%
GatewayScript moveChainToGateway
registerGateway
registerL2Contracts
run
+11,234 ❌
+1,545 ❌
+1,420 ❌
-47,068 ✅
+1.05%
+1.86%
+0.30%
-1.44%
Utils getGettersSelectors +109 ❌ +1.56%
DeployL1Script getInitialDiamondCutData
run
-4,450 ✅
+475,779 ❌
-1.55%
+0.99%
RegisterHyperchainScript run -87,574 ✅ -1.17%
DiamondCutTestContract diamondCut +1,270 ❌ +0.63%
MailboxFacet bridgehubRequestL2Transaction -233 ✅ -0.17%
DeployErc20Script run -1,663 ✅ -0.08%
L1GenesisUpgrade genesisUpgrade -53 ✅ -0.05%
DummySharedBridge setDataToBeReturnedInFinalizeWithdrawal -22 ✅ -0.02%
DummyStateTransitionManagerWBH setHyperchain -3 ✅ -0.00%
MerkleTest calculateRoot(bytes32[],uint256,bytes32) 0 ➖ 0.00%

Full diff report 👇
Contract Deployment Cost (+/-) Method Min (+/-) % Avg (+/-) % Median (+/-) % Max (+/-) % # Calls (+/-)
TransparentUpgradeableProxy 845,337 (+458) acceptOwnership
addToken
assetHandlerAddress
bridgeMint
bridgeRecoverFailedTransfer
bridgehubConfirmL2Transaction
bridgehubDeposit
bridgehubDepositBaseToken
chainBalance
claimFailedDeposit
createNewChain
depositHappened
depositLegacyErc20Bridge
finalizeWithdrawal
finalizeWithdrawalLegacyErc20Bridge
getChainAdmin
getERC20Getters
getHyperchain
legacyBridge
nativeTokenVault
owner
pause
paused
registerToken
requestL2TransactionDirect
setAssetHandlerAddressOnCounterPart
setChainCreationParams
setL1Erc20Bridge
setNativeTokenVault
setNewVersionUpgrade
setUpgradeDiamondCut
setValidatorTimelock
sharedBridge
stateTransitionManagerIsRegistered
tokenAddress
transferFundsFromSharedBridge
transferTokenToNTV
unpause
validatorTimelock
35,482 (+66)
54,627 (+1,145)
1,239 (+611)
3,696,856 (-76,813)
45,798 (+51)
34,170 (+44)
39,728 (-8,026)
30,029 (+50)
631 (0)
40,001 (-12,557)
54,649 (+110)
1,286 (+11)
39,992 (+22)
41,451 (+71)
114,037 (+103)
2,938 (+22)
10,471 (+808)
1,434 (0)
625 (0)
625 (0)
1,036 (+43)
53,932 (-43)
999 (-66)
29,012 (0)
268,860 (+1,473)
34,881 (+38)
97,584 (+312)
33,130 (+22)
33,105 (0)
202,927 (+751)
98,165 (+312)
33,178 (-6,461)
1,032 (-2,000)
1,220 (-22)
0 (0)
37,521 (-22)
31,194 (+22)
32,009 (-67)
1,075 (0)
+0.19%
+2.14%
+97.29%
-2.04%
+0.11%
+0.13%
-16.81%
+0.17%
0.00%
-23.89%
+0.20%
+0.86%
+0.06%
+0.17%
+0.09%
+0.75%
+8.36%
0.00%
0.00%
0.00%
+4.33%
-0.08%
-6.20%
0.00%
+0.55%
+0.11%
+0.32%
+0.07%
0.00%
+0.37%
+0.32%
-16.30%
-65.96%
-1.77%
+∞%
-0.06%
+0.07%
-0.21%
0.00%
35,504 (+33)
54,627 (+1,145)
1,239 (-495)
3,696,856 (-76,813)
76,920 (+1,398)
48,790 (+44)
84,260 (-640)
80,535 (+4,839)
1,603 (+5)
77,596 (+232)
1,235,157 (+1,166,511)
2,457 (+10)
133,634 (+52,899)
88,745 (+47)
122,658 (+85)
2,938 (+22)
10,471 (+808)
4,257 (-36)
2,042 (-11)
2,023 (-3,075)
2,720 (-8)
53,932 (-43)
999 (-66)
111,612 (-48)
268,860 (+1,473)
40,339 (+35)
97,584 (+312)
52,961 (+10)
52,917 (-12)
202,927 (+751)
98,165 (+312)
36,408 (-3,231)
2,032 (-1,000)
1,220 (-22)
2,984 (+1,642)
49,248 (+6)
31,194 (+22)
32,009 (-67)
5,950 (+625)
+0.09%
+2.14%
-28.55%
-2.04%
+1.85%
+0.09%
-0.75%
+6.39%
+0.31%
+0.30%
+1699.31%
+0.41%
+65.52%
+0.05%
+0.07%
+0.75%
+8.36%
-0.84%
-0.54%
-60.32%
-0.29%
-0.08%
-6.20%
-0.04%
+0.55%
+0.09%
+0.32%
+0.02%
-0.02%
+0.37%
+0.32%
-8.15%
-32.98%
-1.77%
+122.35%
+0.01%
+0.07%
-0.21%
+11.74%
35,504 (+33)
54,627 (+1,145)
1,239 (+33)
3,696,856 (-76,813)
74,695 (+1,398)
56,101 (+44)
88,510 (-1,172)
76,293 (+1,473)
1,358 (0)
82,428 (+5,497)
83,030 (+14,384)
1,286 (+11)
180,423 (+79,339)
94,943 (+44)
122,658 (+85)
2,938 (+22)
10,471 (+808)
3,118 (0)
1,031 (-12)
1,009 (-12)
3,070 (-22)
53,932 (-43)
999 (-66)
110,694 (-36)
268,860 (+1,473)
40,339 (+35)
97,584 (+312)
53,451 (+22)
53,407 (0)
202,927 (+751)
98,165 (+312)
36,408 (-3,231)
2,032 (-1,000)
1,220 (-22)
0 (0)
48,960 (0)
31,194 (+22)
32,009 (-67)
6,575 (+1,250)
+0.09%
+2.14%
+2.74%
-2.04%
+1.91%
+0.08%
-1.31%
+1.97%
0.00%
+7.15%
+20.95%
+0.86%
+78.49%
+0.05%
+0.07%
+0.75%
+8.36%
0.00%
-1.15%
-1.18%
-0.71%
-0.08%
-6.20%
-0.03%
+0.55%
+0.09%
+0.32%
+0.04%
0.00%
+0.37%
+0.32%
-8.15%
-32.98%
-1.77%
+∞%
0.00%
+0.07%
-0.21%
+23.47%
35,526 (0)
54,627 (+1,145)
1,239 (-8,467)
3,696,856 (-76,813)
112,495 (+2,745)
56,101 (+44)
126,997 (+1,097)
121,213 (-992)
9,858 (0)
102,352 (+1,137)
3,567,792 (+3,485,038)
9,786 (+11)
180,488 (+79,336)
124,847 (+45)
131,280 (+67)
2,938 (+22)
10,471 (+808)
22,618 (0)
9,531 (-12)
9,509 (-12)
9,613 (0)
53,932 (-43)
999 (-66)
113,550 (-36)
268,860 (+1,473)
45,798 (+33)
97,584 (+312)
53,451 (+22)
53,407 (0)
202,927 (+751)
98,165 (+312)
39,639 (0)
3,032 (0)
1,220 (-22)
9,683 (0)
60,030 (+25)
31,194 (+22)
32,009 (-67)
9,575 (0)
0.00%
+2.14%
-87.23%
-2.04%
+2.50%
+0.08%
+0.87%
-0.81%
0.00%
+1.12%
+4211.32%
+0.11%
+78.43%
+0.04%
+0.05%
+0.75%
+8.36%
0.00%
-0.13%
-0.13%
0.00%
-0.08%
-6.20%
-0.03%
+0.55%
+0.07%
+0.32%
+0.04%
0.00%
+0.37%
+0.32%
0.00%
0.00%
-1.77%
0.00%
+0.04%
+0.07%
-0.21%
0.00%
14 (0)
14 (0)
7 (-8)
3 (0)
4 (0)
3 (0)
11 (-1)
9 (-1)
2,707 (-66)
9 (+1)
3 (+1)
106 (0)
3 (0)
22 (0)
2 (0)
39 (+1)
1 (-1)
79 (+1)
8 (0)
8 (-19)
46 (0)
2 (0)
3 (0)
163 (-4)
1 (0)
2 (0)
1 (0)
83 (-2)
83 (-2)
1 (0)
1 (0)
2 (+1)
6 (0)
7 (0)
80 (-1)
5 (0)
1 (0)
1 (0)
4 (+2)
L1AssetRouter 4,220,994 (+124,817) acceptOwnership
assetHandlerAddress
bridgeRecoverFailedTransfer
bridgehubConfirmL2Transaction
bridgehubDeposit
bridgehubDepositBaseToken
chainBalance
claimFailedDeposit
depositHappened
depositLegacyErc20Bridge
finalizeWithdrawal
finalizeWithdrawalLegacyErc20Bridge
initialize
legacyBridge
nativeTokenVault
owner
pause
paused
setAssetHandlerAddressOnCounterPart
setL1Erc20Bridge
setNativeTokenVault
transferTokenToNTV
unpause
12,093 (+66)
608 (+33)
14,247 (+51)
4,936 (+44)
10,169 (-8,026)
646 (+50)
691 (+11)
9,503 (-12,557)
652 (+11)
10,315 (+22)
10,768 (+68)
91,095 (+103)
45,482 (0)
403 (-12)
381 (-12)
420 (+55)
25,743 (-43)
371 (-66)
5,051 (+38)
4,794 (+22)
4,763 (0)
2,618 (+22)
8,620 (-67)
+0.55%
+5.74%
+0.36%
+0.90%
-44.11%
+8.39%
+1.62%
-56.92%
+1.72%
+0.21%
+0.64%
+0.11%
0.00%
-2.89%
-3.05%
+15.07%
-0.17%
-15.10%
+0.76%
+0.46%
0.00%
+0.85%
-0.77%
12,093 (+66)
608 (-109)
48,473 (+1,398)
21,691 (+44)
95,164 (+4,682)
58,922 (+4,414)
979 (+11)
53,920 (+903)
907 (+11)
112,228 (+59,299)
61,562 (+47)
99,909 (+85)
140,148 (-23)
688 (-12)
666 (-727)
420 (+55)
25,743 (-43)
371 (-66)
10,514 (+35)
24,289 (+9)
24,245 (-13)
9,413 (+32)
8,620 (-67)
+0.55%
-15.20%
+2.97%
+0.20%
+5.17%
+8.10%
+1.14%
+1.70%
+1.23%
+112.03%
+0.08%
+0.09%
-0.02%
-1.71%
-52.19%
+15.07%
-0.17%
-15.10%
+0.33%
+0.04%
-0.05%
+0.34%
-0.77%
12,093 (+66)
608 (+33)
47,686 (+1,398)
24,880 (+44)
66,171 (+5,326)
65,209 (+5,058)
691 (+11)
64,115 (+11,590)
652 (+11)
163,159 (+88,939)
68,105 (+43)
99,909 (+85)
141,224 (0)
403 (-12)
381 (-1,012)
420 (+55)
25,743 (-43)
371 (-66)
10,514 (+35)
24,891 (+22)
24,847 (0)
10,129 (+22)
8,620 (-67)
+0.55%
+5.74%
+3.02%
+0.18%
+8.75%
+8.41%
+1.62%
+22.07%
+1.72%
+119.83%
+0.06%
+0.09%
0.00%
-2.89%
-72.65%
+15.07%
-0.17%
-15.10%
+0.33%
+0.09%
0.00%
+0.22%
-0.77%
12,093 (+66)
608 (-1,967)
84,275 (+2,745)
26,880 (+44)
304,366 (+15,949)
122,149 (-1,240)
2,691 (+11)
84,267 (+1,137)
2,652 (+11)
163,212 (+88,936)
99,513 (+42)
108,724 (+67)
141,224 (0)
2,403 (-12)
2,381 (-12)
420 (+55)
25,743 (-43)
371 (-66)
15,978 (+33)
24,891 (+22)
24,847 (0)
17,167 (+47)
8,620 (-67)
+0.55%
-76.39%
+3.37%
+0.16%
+5.53%
-1.00%
+0.41%
+1.37%
+0.42%
+119.74%
+0.04%
+0.06%
0.00%
-0.50%
-0.50%
+15.07%
-0.17%
-15.10%
+0.21%
+0.09%
0.00%
+0.27%
-0.77%
7 (0)
7 (-7)
4 (0)
5 (0)
13 (-1)
13 (-1)
1,136 (-28)
9 (+1)
94 (0)
3 (0)
22 (0)
2 (0)
89 (-2)
7 (0)
7 (-19)
7 (0)
2 (0)
3 (0)
2 (0)
90 (-2)
90 (-2)
5 (0)
1 (0)
Bridgehub 3,547,281 (+259,379) acceptAdmin
acceptOwnership
addStateTransitionManager
addToken
bridgeBurn
bridgeMint
createNewChain
initialize
owner
proveL1ToL2TransactionStatus
proveL2LogInclusion
removeStateTransitionManager
requestL2TransactionDirect
requestL2TransactionTwoBridges
setPendingAdmin
sharedBridge
stateTransitionManager
stateTransitionManagerIsRegistered
tokenIsRegistered
transferOwnership
46,892 (-22)
12,137 (0)
23,896 (+886)
24,024 (+1,102)
159,632 (+4,879)
3,659,854 (-76,460)
3,733,230 (-54,102)
24,232 (0)
442 (-22)
0 (0)
0 (0)
23,895 (0)
242,978 (+1,473)
383,937 (+1,420)
25,942 (-104)
404 (-2,000)
630 (+22)
589 (-22)
568 (0)
22,417 (0)
-0.05%
0.00%
+3.85%
+4.81%
+3.15%
-2.05%
-1.43%
0.00%
-4.74%
+∞%
+∞%
0.00%
+0.61%
+0.37%
-0.40%
-83.19%
+3.62%
-3.60%
0.00%
0.00%
46,892 (-22)
21,317 (+204)
41,122 (+815)
36,334 (-889)
159,632 (+4,879)
3,659,854 (-76,460)
3,795,066 (-61,049)
31,982 (-369)
2,292 (-29)
1,939 (-7)
2,063 (+5)
25,548 (+282)
242,978 (+1,473)
554,953 (+11,320)
37,892 (-101)
1,404 (-1,000)
1,005 (+22)
1,254 (-22)
1,398 (+136)
39,757 (+386)
-0.05%
+0.97%
+2.02%
-2.39%
+3.15%
-2.05%
-1.58%
-1.14%
-1.25%
-0.36%
+0.24%
+1.12%
+0.61%
+2.08%
-0.27%
-41.60%
+2.24%
-1.72%
+10.78%
+0.98%
46,892 (-22)
25,601 (0)
47,587 (+1,145)
26,242 (-19,896)
159,632 (+4,879)
3,659,854 (-76,460)
3,824,059 (-65,102)
24,232 (0)
2,442 (-22)
1,539 (-14)
1,679 (-3)
25,905 (+572)
242,978 (+1,473)
640,462 (+16,271)
37,858 (-101)
1,404 (-1,000)
630 (+22)
589 (-22)
568 (0)
47,849 (0)
-0.05%
0.00%
+2.47%
-43.12%
+3.15%
-2.05%
-1.67%
0.00%
-0.89%
-0.90%
-0.18%
+2.26%
+0.61%
+2.61%
-0.27%
-41.60%
+3.62%
-3.60%
0.00%
0.00%
46,892 (-22)
25,601 (0)
47,587 (+1,145)
47,499 (+1,145)
159,632 (+4,879)
3,659,854 (-76,460)
3,838,216 (-65,102)
48,591 (0)
2,442 (-22)
4,748 (-15)
5,026 (0)
26,362 (0)
242,978 (+1,473)
640,462 (+16,271)
49,762 (-110)
2,404 (0)
2,630 (+22)
2,589 (-22)
2,568 (0)
47,849 (0)
-0.05%
0.00%
+2.47%
+2.47%
+3.15%
-2.05%
-1.67%
0.00%
-0.89%
-0.31%
0.00%
0.00%
+0.61%
+2.61%
-0.22%
0.00%
+0.84%
-0.84%
0.00%
0.00%
256 (0)
22 (+1)
3,591 (0)
1,557 (-256)
2 (0)
3 (0)
19 (0)
22 (+1)
576 (+2)
512 (0)
512 (0)
2,048 (0)
1 (0)
3 (0)
512 (0)
6 (0)
4,096 (0)
3,079 (0)
1,313 (-256)
22 (+1)
L1NativeTokenVault 1,937,741 (+28,987) bridgeBurn
bridgeMint
bridgeRecoverFailedTransfer
getERC20Getters
initialize
registerToken
transferFundsFromSharedBridge
5,371 (-22)
7,498 (-22)
5,283 (+74)
3,262 (+784)
23,150 (+22)
484 (0)
8,945 (-22)
-0.41%
-0.29%
+1.42%
+31.64%
+0.10%
0.00%
-0.25%
32,301 (+4,715)
35,418 (-22)
30,650 (+73)
3,262 (+784)
50,020 (+15)
80,870 (-155)
21,730 (+6)
+17.09%
-0.06%
+0.24%
+31.64%
+0.03%
-0.19%
+0.03%
33,006 (+3,635)
29,576 (-22)
27,469 (+74)
3,262 (+784)
50,326 (+22)
82,362 (-36)
20,628 (0)
+12.38%
-0.07%
+0.27%
+31.64%
+0.04%
-0.04%
0.00%
71,494 (+18,476)
47,234 (-22)
45,242 (+74)
3,262 (+784)
50,326 (+22)
84,990 (-36)
33,597 (+25)
+34.85%
-0.05%
+0.16%
+31.64%
+0.04%
-0.04%
+0.07%
23 (+1)
14 (0)
9 (0)
1 (-1)
89 (-2)
202 (-2)
5 (0)
StateTransitionManager 4,194,166 (+68,720) createNewChain
forwardedBridgeBurn
forwardedBridgeMint
getChainAdmin
getHyperchain
initialize
setChainCreationParams
setNewVersionUpgrade
setUpgradeDiamondCut
setValidatorTimelock
1,271 (0)
32,750 (+5,627)
3,264,940 (-53,144)
2,307 (+22)
803 (0)
22,836 (0)
45,191 (+189)
151,084 (+628)
46,663 (+189)
4,818 (-6,477)
0.00%
+20.75%
-1.60%
+0.96%
0.00%
0.00%
+0.42%
+0.42%
+0.41%
-57.34%
3,110,301 (-27,062)
32,750 (+5,627)
3,264,940 (-53,144)
2,307 (+22)
1,487 (-14)
134,764 (-6,818)
45,191 (+189)
151,084 (+628)
46,663 (+189)
8,056 (-3,239)
-0.86%
+20.75%
-1.60%
+0.96%
-0.93%
-4.82%
+0.42%
+0.42%
+0.41%
-28.68%
3,408,515 (-51,179)
32,750 (+5,627)
3,264,940 (-53,144)
2,307 (+22)
803 (0)
209,161 (-176)
45,191 (+189)
151,084 (+628)
46,663 (+189)
8,056 (-3,239)
-1.48%
+20.75%
-1.60%
+0.96%
0.00%
-0.08%
+0.42%
+0.42%
+0.41%
-28.68%
3,514,235 (+37,441)
32,750 (+5,627)
3,264,940 (-53,144)
2,307 (+22)
5,084 (0)
209,526 (-13)
45,191 (+189)
151,084 (+628)
46,663 (+189)
11,295 (0)
+1.08%
+20.75%
-1.60%
+0.96%
0.00%
-0.01%
+0.42%
+0.42%
+0.41%
0.00%
22 (+1)
2 (0)
3 (0)
39 (+1)
48 (+1)
30 (+8)
1 (0)
1 (0)
1 (0)
2 (+1)
STMDeploymentTracker 0 (0) bridgehubDeposit
registerSTMAssetOnL1
2,614 (-5)
54,752 (-22,007)
-0.19%
-28.67%
2,614 (-5)
54,752 (-22,007)
-0.19%
-28.67%
2,614 (-5)
54,752 (-22,007)
-0.19%
-28.67%
2,614 (-5)
54,752 (-22,007)
-0.19%
-28.67%
1 (0)
7 (0)
TestCalldataDA 482,724 (-7,355) processCalldataDA
processL2RollupDAValidatorOutputHash
682 (-181)
637 (0)
-20.97%
0.00%
693 (-179)
1,633 (-52)
-20.53%
-3.09%
682 (-181)
1,467 (0)
-20.97%
0.00%
2,495 (0)
2,802 (-131)
0.00%
-4.47%
260 (0)
5 (0)
AdminFacet 3,218,316 (+7,234) executeUpgrade
forwardedBridgeBurn
forwardedBridgeMint
genesisUpgrade
setPriorityTxMaxGasLimit
upgradeChainFromVersion
2,684 (-22)
57,960 (-2,000)
91,783 (+2,370)
112,738 (-1,589)
2,564 (-22)
4,917 (-22)
-0.81%
-3.34%
+2.65%
-1.39%
-0.85%
-0.45%
345,509 (+47,049)
57,960 (-2,000)
91,783 (+2,370)
114,214 (-113)
4,652 (-22)
10,666 (-22)
+15.76%
-3.34%
+2.65%
-0.10%
-0.47%
-0.21%
550,011 (+76,612)
57,960 (-2,000)
91,783 (+2,370)
114,292 (-35)
2,577 (-22)
9,846 (-22)
+16.18%
-3.34%
+2.65%
-0.03%
-0.85%
-0.22%
552,761 (+79,312)
57,960 (-2,000)
91,783 (+2,370)
114,292 (-35)
8,816 (-22)
18,057 (-22)
+16.75%
-3.34%
+2.65%
-0.03%
-0.25%
-0.12%
5 (0)
2 (0)
3 (0)
20 (+1)
3 (0)
4 (0)
GettersFacetWrapper 1,710,995 (-18,387) facetAddress
facetFunctionSelectors
getPendingAdmin
getPriorityQueueSize
getTotalBatchesExecuted
getTotalBlocksVerified
isEthWithdrawalFinalized
isFacetFreezable
storedBatchHash
util_setAdmin
util_setBridgehub
util_setFacets
util_setL2BootloaderBytecodeHash
util_setL2LogsRootHash
util_setPendingAdmin
util_setPriorityTxMaxGasLimit
util_setStateTransitionManager
util_setTotalBatchesVerified
util_setTotalPriorityTxs
util_setVerifierParams
766 (+87)
1,889 (+88)
420 (-22)
4,879 (-22)
358 (-22)
359 (-22)
651 (-22)
1,407 (-22)
525 (-22)
44,001 (-22)
44,045 (+89)
128,426 (-22)
44,008 (-22)
44,273 (+89)
44,023 (-22)
43,650 (-22)
44,045 (+88)
43,732 (-22)
45,878 (-22)
89,376 (-22)
+12.81%
+4.89%
-4.98%
-0.45%
-5.79%
-5.77%
-3.27%
-1.54%
-4.02%
-0.05%
+0.20%
-0.02%
-0.05%
+0.20%
-0.05%
-0.05%
+0.20%
-0.05%
-0.05%
-0.02%
766 (+87)
1,889 (+88)
420 (-22)
4,879 (-22)
358 (-22)
359 (-22)
651 (-22)
2,081 (-22)
525 (-22)
44,001 (-22)
44,045 (+89)
128,426 (-22)
44,008 (-22)
44,273 (+89)
44,023 (-22)
43,650 (-22)
44,045 (+88)
43,732 (-22)
45,878 (-22)
89,376 (-22)
+12.81%
+4.89%
-4.98%
-0.45%
-5.79%
-5.77%
-3.27%
-1.05%
-4.02%
-0.05%
+0.20%
-0.02%
-0.05%
+0.20%
-0.05%
-0.05%
+0.20%
-0.05%
-0.05%
-0.02%
766 (+87)
1,889 (+88)
420 (-22)
4,879 (-22)
358 (-22)
359 (-22)
651 (-22)
2,081 (-22)
525 (-22)
44,001 (-22)
44,045 (+89)
128,426 (-22)
44,008 (-22)
44,273 (+89)
44,023 (-22)
43,650 (-22)
44,045 (+88)
43,732 (-22)
45,878 (-22)
89,376 (-22)
+12.81%
+4.89%
-4.98%
-0.45%
-5.79%
-5.77%
-3.27%
-1.05%
-4.02%
-0.05%
+0.20%
-0.02%
-0.05%
+0.20%
-0.05%
-0.05%
+0.20%
-0.05%
-0.05%
-0.02%
766 (+87)
1,889 (+88)
420 (-22)
4,879 (-22)
358 (-22)
359 (-22)
651 (-22)
2,755 (-22)
525 (-22)
44,001 (-22)
44,045 (+89)
128,426 (-22)
44,008 (-22)
44,273 (+89)
44,023 (-22)
43,650 (-22)
44,045 (+88)
43,732 (-22)
45,878 (-22)
89,376 (-22)
+12.81%
+4.89%
-4.98%
-0.45%
-5.79%
-5.77%
-3.27%
-0.79%
-4.02%
-0.05%
+0.20%
-0.02%
-0.05%
+0.20%
-0.05%
-0.05%
+0.20%
-0.05%
-0.05%
-0.02%
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
2 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
1 (0)
2 (0)
1 (0)
1 (0)
MessageRoot 1,281,716 (-10,715) addNewChain
addNewChainIfNeeded
initialize
21,860 (-154,547)
208,230 (-27,659)
133,489 (+22)
-87.61%
-11.73%
+0.02%
232,486 (-16,557)
208,230 (-27,659)
133,489 (+22)
-6.65%
-11.73%
+0.02%
284,336 (0)
208,230 (-27,659)
133,489 (+22)
0.00%
-11.73%
+0.02%
298,493 (0)
208,230 (-27,659)
133,489 (+22)
0.00%
-11.73%
+0.02%
23 (+4)
3 (0)
7 (0)
DiamondProxy 1,939,824 (-516,860) bridgehubRequestL2Transaction
commitBatches
executeUpgrade
getAdmin
setPriorityTxMaxGasLimit
upgradeChainFromVersion
48,038 (-22)
0 (0)
31,872 (-22)
1,190 (+22)
31,080 (-22)
34,251 (-22)
-0.05%
+∞%
-0.07%
+1.88%
-0.07%
-0.06%
124,499 (-22)
32,731 (+958)
309,332 (+27,016)
1,488 (+6)
33,157 (-22)
40,000 (-22)
-0.02%
+3.02%
+9.57%
+0.40%
-0.07%
-0.05%
148,524 (-22)
0 (0)
468,572 (+43,591)
1,190 (+22)
31,097 (-22)
39,179 (-22)
-0.01%
+∞%
+10.26%
+1.88%
-0.07%
-0.06%
152,910 (-22)
90,739 (+2,256)
470,772 (+45,741)
9,690 (+22)
37,294 (-22)
47,391 (-22)
-0.01%
+2.55%
+10.76%
+0.23%
-0.06%
-0.05%
4 (0)
34 (0)
5 (0)
57 (+3)
3 (0)
4 (0)
L1ERC20Bridge 1,116,643 (+13,804) claimFailedDeposit
deposit(address,address,uint256,uint256,uint256)
deposit(address,address,uint256,uint256,uint256,address)
finalizeWithdrawal
initialize
isWithdrawalFinalized
l2TokenBeacon
l2TokenProxyBytecodeHash
31,389 (+45)
27,946 (+45)
28,120 (-22)
30,285 (-22)
22,359 (-22)
559 (-22)
425 (+66)
328 (-22)
+0.14%
+0.16%
-0.08%
-0.07%
-0.10%
-3.79%
+18.38%
-6.29%
38,734 (+75)
63,490 (+3,691)
72,795 (-30)
36,837 (-21)
22,517 (-22)
1,130 (-22)
925 (+66)
828 (-22)
+0.19%
+6.17%
-0.04%
-0.06%
-0.10%
-1.91%
+7.68%
-2.59%
41,519 (+49)
77,866 (+4,993)
78,499 (-11)
37,597 (-11)
22,359 (-22)
559 (-22)
425 (+66)
328 (-22)
+0.12%
+6.85%
-0.01%
-0.03%
-0.10%
-3.79%
+18.38%
-6.29%
42,558 (+49)
94,818 (+366)
94,622 (-44)
40,312 (0)
23,625 (-22)
2,559 (-22)
2,425 (+66)
2,328 (-22)
+0.12%
+0.39%
-0.05%
0.00%
-0.09%
-0.85%
+2.80%
-0.94%
6 (0)
12 (0)
6 (0)
6 (0)
8 (0)
7 (0)
4 (0)
4 (0)
TestExecutor 2,784,639 (+45,417) commitBatches 8,058 (0) 0.00% 29,625 (+2,035) +7.38% 29,172 (+2,138) +7.91% 45,851 (+2,256) +5.17% 16 (0)
RelayedSLDAValidator 631,088 (+39,986) checkDA 27,723 (+1,054) +3.95% 31,398 (+1,884) +6.38% 29,802 (+2,750) +10.17% 38,265 (+3,442) +9.88% 4 (+1)
TestnetERC20Token 640,463 (0) allowance
approve
balanceOf
mint
845 (0)
24,284 (0)
0 (0)
34,043 (0)
0.00%
0.00%
+∞%
0.00%
2,586 (-116)
45,955 (-6)
1,396 (+14)
52,557 (+31)
-4.29%
-0.01%
+1.01%
+0.06%
2,845 (0)
46,196 (0)
559 (0)
51,143 (0)
0.00%
0.00%
0.00%
0.00%
2,845 (0)
46,196 (0)
2,559 (0)
68,615 (0)
0.00%
0.00%
0.00%
0.00%
31 (+3)
174 (-4)
52 (+4)
359 (-8)
GettersFacet 887,287 (-18,374) getAdmin 419 (+22) +5.54% 489 (+18) +3.82% 419 (+22) +5.54% 2,419 (+22) +0.92% 57 (+3)
GatewayScript 1,865,564 (0) moveChainToGateway
registerGateway
registerL2Contracts
run
1,081,210 (+11,234)
84,479 (+1,545)
473,677 (+1,420)
3,224,652 (-47,068)
+1.05%
+1.86%
+0.30%
-1.44%
1,081,210 (+11,234)
84,479 (+1,545)
473,677 (+1,420)
3,224,652 (-47,068)
+1.05%
+1.86%
+0.30%
-1.44%
1,081,210 (+11,234)
84,479 (+1,545)
473,677 (+1,420)
3,224,652 (-47,068)
+1.05%
+1.86%
+0.30%
-1.44%
1,081,210 (+11,234)
84,479 (+1,545)
473,677 (+1,420)
3,224,652 (-47,068)
+1.05%
+1.86%
+0.30%
-1.44%
2 (0)
3 (0)
1 (0)
6 (0)
Utils 4,691,921 (0) getGettersSelectors 7,082 (+109) +1.56% 7,082 (+109) +1.56% 7,082 (+109) +1.56% 7,082 (+109) +1.56% 20 (+4)
DeployL1Script 48,172,999 (+568,297) getInitialDiamondCutData
run
283,311 (-4,450)
48,701,897 (+475,779)
-1.55%
+0.99%
283,311 (-4,450)
48,701,897 (+475,779)
-1.55%
+0.99%
283,311 (-4,450)
48,701,897 (+475,779)
-1.55%
+0.99%
283,311 (-4,450)
48,701,897 (+475,779)
-1.55%
+0.99%
3 (0)
7 (0)
RegisterHyperchainScript 4,282,865 (-8,851) run 6,430,561 (-76,951) -1.18% 7,378,906 (-87,574) -1.17% 6,444,718 (-76,951) -1.18% 8,992,506 (-105,785) -1.16% 19 (0)
DiamondCutTestContract 1,830,140 (-18,399) diamondCut 23,712 (0) 0.00% 203,584 (+1,270) +0.63% 45,091 (0) 0.00% 1,422,517 (+25,403) +1.82% 20 (0)
MailboxFacet 2,956,805 (+17,169) bridgehubRequestL2Transaction 16,326 (-22) -0.13% 140,697 (-233) -0.17% 121,815 (-22) -0.02% 274,781 (-48) -0.02% 8 (0)
DeployErc20Script 2,157,149 (0) run 1,998,919 (-1,663) -0.08% 1,998,919 (-1,663) -0.08% 1,998,919 (-1,663) -0.08% 1,998,919 (-1,663) -0.08% 7 (0)
DiamondInit 568,496 (0) initialize 22,660 (0) 0.00% 412,217 (+285) +0.07% 424,265 (0) 0.00% 446,665 (0) 0.00% 113 (+1)
L1GenesisUpgrade 2,791,705 (-22,344) genesisUpgrade 102,013 (-1,149) -1.11% 103,109 (-53) -0.05% 103,167 (+5) +0.00% 103,167 (+5) +0.00% 20 (+1)
DummySharedBridge 870,094 (+45,412) setDataToBeReturnedInFinalizeWithdrawal 88,830 (-22) -0.02% 88,830 (-22) -0.02% 88,830 (-22) -0.02% 88,830 (-22) -0.02% 1 (0)
MerkleTreeNoSort 534,636 (0) getProof 32,953 (0) 0.00% 33,183 (+1) +0.00% 33,193 (0) 0.00% 33,215 (0) 0.00% 273 (0)
DummyStateTransitionManagerWBH 4,205,170 (+68,755) setHyperchain 111,114 (0) 0.00% 111,151 (-3) -0.00% 111,162 (-12) -0.01% 111,174 (0) 0.00% 768 (0)
MerkleTest 468,218 (0) calculateRoot(bytes32[],uint256,bytes32) 606 (0) 0.00% 2,920 (0) 0.00% 2,943 (0) 0.00% 2,998 (+11) +0.37% 261 (0)
DummyHyperchain 3,152,630 (+17,129)
DummyStateTransitionManager 4,203,420 (+68,755)
IncrementalMerkleTest 340,232 (-12)
PriorityTreeTest 923,959 (-12)
ValidatorTimelock 1,145,809 (+12)
DefaultUpgrade 1,587,031 (+12)
UtilsFacet 675,694 (+12)

Copy link

Coverage after merging sb-synced-sync-layer-reorg into sync-layer-stable will be

89.30%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
../da-contracts/contracts
   RollupL1DAValidator.sol67.11%50%83.33%73.91%134, 137, 137, 137, 139, 170, 172, 25, 25, 25–26, 26, 26, 28, 30–31, 35–36, 59, 61, 61, 61–62, 64
contracts/bridge
   BridgeHelper.sol100%100%100%100%
   L1AssetRouter.sol95.78%89.29%97.37%98.39%118, 133, 190, 247, 308, 352, 488, 505, 526, 707–708, 843
   L1ERC20Bridge.sol100%100%100%100%
   L1NativeTokenVault.sol96.12%97.62%84.62%97.30%252, 257, 45
contracts/bridgehub
   Bridgehub.sol79.82%50.75%87.50%94.12%103, 103, 141, 262–265, 267–269, 271, 327–328, 330, 330, 330, 373, 381–382, 385, 385, 385–386, 408, 446, 470–471, 550, 553–554, 558–559, 586–587, 618, 623, 82, 87, 92, 98
   MessageRoot.sol91.38%61.54%100%100%156, 162, 69, 76, 94
   STMDeploymentTracker.sol71.43%50%77.78%77.78%105, 107, 110, 122, 31, 54, 81, 84
contracts/common
   ReentrancyGuard.sol100%100%100%100%
contracts/common/libraries
   DataEncoding.sol80%100%100%66.67%72, 80
   DynamicIncrementalMerkle.sol74.42%100%80%72.22%67–70, 72–74, 76–78
   FullMerkle.sol100%100%100%100%
   L2ContractHelper.sol55.88%30%60%68.42%29, 32–33, 46–47, 47, 47, 49, 49, 49, 56, 86, 90
   Merkle.sol73.85%68.18%75%76.92%52–53, 53, 53–54, 54, 54–55, 55, 55, 57–59, 62, 65, 83
   MessageHashing.sol100%100%100%100%
   SemVer.sol100%100%100%100%
   UncheckedMath.sol100%100%100%100%
   UnsafeBytes.sol100%100%100%100%
contracts/governance
   ChainAdmin.sol22.22%20%33.33%20%16, 28–29, 38, 38, 38, 40, 42–43, 43, 46, 49
   Governance.sol99.07%96.77%100%100%44
contracts/state-transition
   StateTransitionManager.sol73.74%51.35%62.16%85.71%145–147, 151, 204, 247, 254, 272, 278, 285, 297, 304, 311, 319, 326, 334, 341, 350, 350, 350, 352, 363, 365, 432, 446, 449, 464, 469, 488, 516, 83, 89, 89
   TestnetVerifier.sol77.78%66.67%100%75%16, 32
   ValidatorTimelock.sol98.57%100%100%97.67%236
   Verifier.sol89.88%35.71%96.30%90.93%1673–1674, 287–302, 305–308, 311–318, 321–328, 331–332, 335–336, 339, 384–385, 395–396, 406–407, 417–418, 428–429, 444–445, 454, 454–455, 904–905
contracts/state-transition/chain-deps
   DiamondInit.sol88.24%70%100%100%33–37, 63
   DiamondProxy.sol80.77%62.50%100%88.24%16, 16, 16–17, 27
contracts/state-transition/chain-deps/facets
   Admin.sol82.14%56.82%85%92.31%103, 103, 103–105, 131, 131, 131–132, 132, 132, 134, 155, 201–202, 204, 218–219, 226, 245–246, 251, 288, 298, 302, 82, 91
   Executor.sol78.44%72.81%81.25%81.61%107, 167, 171–172, 172, 172–173, 173, 173, 184, 184, 188, 188, 188, 206, 220, 231, 234, 279, 279, 279, 282, 285, 287–288, 294–295, 314–317, 319, 36, 368, 368, 368–371, 373, 376, 379–380, 389, 405, 408–409, 411–413, 424–426, 446, 487, 494, 513, 518, 527–528, 579, 604–605
   Getters.sol83.19%66.67%84.09%84.85%104, 107, 113, 116, 127, 130, 172, 223, 229, 233, 64, 79, 84
   Mailbox.sol58.38%47.06%59.26%61.61%105, 121–122, 122, 122, 124–125, 133–135, 146, 157–158, 160–161, 163, 168, 172, 172–174, 174, 174–175, 178, 178, 178, 181, 183–184, 186, 191, 193, 196–197, 202–205, 208–209, 226, 232, 232, 232, 240, 245, 272, 301–302, 379, 390, 396, 535, 535, 535–536, 556, 65, 75, 97
   ZkSyncHyperchainBase.sol82.14%78.57%85.71%85.71%48, 56, 56, 56
contracts/state-transition/data-availability
   CalldataDA.sol100%100%100%100%
   CalldataDAGateway.sol85.71%66.67%100%100%27–28
   RelayedSLDAValidator.sol96.67%83.33%100%100%94
contracts/state-transition/libraries
   Diamond.sol94.81%86.49%100%97.73%110, 112, 114, 116, 119, 184, 294
   LibMap.sol100%100%100%100%
   PriorityQueue.sol100%100%100%100%
   PriorityTree.sol97.62%80%100%100%80
   TransactionValidator.sol97.18%94.12%100%100%54–55
contracts/upgrades
   BaseZkSyncUpgrade.sol69.42%48.65%100%75%102, 102, 102, 104, 107, 110–111, 122, 122, 122, 124,

@StanislavBreadless StanislavBreadless merged commit 8534b30 into sync-layer-stable Aug 14, 2024
25 checks passed
@StanislavBreadless StanislavBreadless deleted the sb-synced-sync-layer-reorg branch August 14, 2024 10:23
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.

5 participants