Commit d3335ea
Remove unneeded pausing logic (#2040)
# What ❔
This is a sister PR to:
matter-labs/zksync-era#4674
1. Since stage1 is not supported for chains on top of GW, there is no
need to wait before l1->l2 ops can be paused (as there is always the
transaction filterer approach).
2. We do not automatically re-enable deposits in 1.5 days since GW is
expected to return a confirmation message. l1->l2 ops are unpaused only
via the confirmation message (or chain admin but only if no withdrawal
happened)
There is a known issue preventing stage1:
- Chain admin may pause deposits, but not actually try to migrate.
- So in the future we will need to reintroduce
CHAIN_MIGRATION_TIME_WINDOW_END_MAINNET/PAUSE_DEPOSITS_TIME_WINDOW_END_MAINNET,
but we will have to carefully consider the used timelines to ensure that
stage1 works.
- This not an issue in this release, since we dont support stage1 for
chains on GW
## Why ❔
<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->
## Checklist
<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->
- [ ] 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.
---------
Co-authored-by: zksync[bot] <zksync[bot]@users.noreply.github.com>1 parent 8da2634 commit d3335ea
File tree
17 files changed
+553
-451
lines changed- l1-contracts
- contracts
- common
- state-transition/chain-deps/facets
- deploy-scripts/ctm
- test/foundry/l1
- integration
- deploy-scripts/script-config
- l2-tests-abstract
- upgrade-envs/script-out
- unit/concrete/state-transition
- ChainTypeManager
- chain-deps/facets
- Mailbox
- Migrator
17 files changed
+553
-451
lines changedLarge diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
| 218 | + | |
218 | 219 | | |
219 | | - | |
220 | | - | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
221 | 223 | | |
222 | | - | |
223 | | - | |
| 224 | + | |
224 | 225 | | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
| 226 | + | |
235 | 227 | | |
236 | 228 | | |
237 | 229 | | |
| |||
Lines changed: 2 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
59 | | - | |
60 | 58 | | |
61 | 59 | | |
62 | 60 | | |
| |||
84 | 82 | | |
85 | 83 | | |
86 | 84 | | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | 85 | | |
91 | 86 | | |
92 | 87 | | |
| |||
547 | 542 | | |
548 | 543 | | |
549 | 544 | | |
550 | | - | |
| 545 | + | |
551 | 546 | | |
552 | 547 | | |
553 | 548 | | |
| |||
Lines changed: 4 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | 41 | | |
45 | 42 | | |
46 | 43 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | 44 | | |
51 | 45 | | |
52 | 46 | | |
53 | 47 | | |
54 | 48 | | |
55 | 49 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | 50 | | |
60 | 51 | | |
61 | 52 | | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | 53 | | |
66 | 54 | | |
67 | 55 | | |
| |||
87 | 75 | | |
88 | 76 | | |
89 | 77 | | |
90 | | - | |
| 78 | + | |
91 | 79 | | |
92 | 80 | | |
93 | 81 | | |
| |||
109 | 97 | | |
110 | 98 | | |
111 | 99 | | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
| 100 | + | |
117 | 101 | | |
118 | 102 | | |
119 | 103 | | |
| |||
154 | 138 | | |
155 | 139 | | |
156 | 140 | | |
157 | | - | |
158 | | - | |
| 141 | + | |
159 | 142 | | |
160 | 143 | | |
161 | 144 | | |
| |||
Lines changed: 3 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
184 | | - | |
| 184 | + | |
185 | 185 | | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
| 186 | + | |
190 | 187 | | |
191 | | - | |
| 188 | + | |
192 | 189 | | |
193 | 190 | | |
194 | 191 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
| |||
89 | 88 | | |
90 | 89 | | |
91 | 90 | | |
92 | | - | |
93 | | - | |
| 91 | + | |
| 92 | + | |
94 | 93 | | |
95 | 94 | | |
96 | 95 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
98 | 97 | | |
99 | 98 | | |
100 | 99 | | |
101 | | - | |
102 | | - | |
| 100 | + | |
| 101 | + | |
103 | 102 | | |
104 | 103 | | |
105 | 104 | | |
| |||
Lines changed: 150 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
| |||
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
75 | | - | |
76 | | - | |
| 74 | + | |
| 75 | + | |
77 | 76 | | |
78 | 77 | | |
79 | 78 | | |
| |||
0 commit comments