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

Kl/without 1.5.0 merge dev #331

Merged
merged 135 commits into from
Apr 18, 2024
Merged

Kl/without 1.5.0 merge dev #331

merged 135 commits into from
Apr 18, 2024

Conversation

kelemeno
Copy link
Contributor

@kelemeno kelemeno commented Apr 8, 2024

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 vladbochok closed this Apr 14, 2024
@vladbochok vladbochok deleted the kl/without-1.5.0-merge-dev branch April 14, 2024 13:53
@vladbochok vladbochok restored the kl/without-1.5.0-merge-dev branch April 14, 2024 13:55
@vladbochok vladbochok reopened this Apr 14, 2024
@@ -355,7 +392,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Initializable, Owna
bool notCheckedInLegacyBridgeOrWeCanCheckDeposit;
{
// Deposits that happened before the upgrade cannot be checked here, they have to be claimed and checked in the legacyBridge
bool weCanCheckDepositHere = !_isEraLegacyWithdrawal(_chainId, _l2BatchNumber);
bool weCanCheckDepositHere = !_isEraLegacyDeposit(_chainId, _l2BatchNumber, _l2TxNumberInBatch);
// Double claims are not possible, as we this check except for legacy bridge withdrawals
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo in the comments: as we this check

@kelemeno kelemeno merged commit 4552d52 into dev Apr 18, 2024
21 checks passed
@kelemeno kelemeno deleted the kl/without-1.5.0-merge-dev branch April 18, 2024 18:32
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.

9 participants