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

fix: Disallow non null updates for transactions #1951

Merged
merged 8 commits into from
May 20, 2024

Conversation

Artemka374
Copy link
Contributor

@Artemka374 Artemka374 commented May 15, 2024

What ❔

Add check to set_tx_id query, that doesn't allow to update tx_id if it is not NULL.

Why ❔

To prevent issues when 1 batch can be commited 2 times.

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.
  • Code has been formatted via zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.

@Artemka374 Artemka374 changed the title add check to sqlx fix: Disallow non null updates for transactions May 15, 2024
Copy link
Contributor

@Deniallugo Deniallugo left a comment

Choose a reason for hiding this comment

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

Please add tests for this feature

core/lib/dal/src/blocks_dal.rs Outdated Show resolved Hide resolved
RomanBrodetski
RomanBrodetski previously approved these changes May 15, 2024
Copy link
Collaborator

@RomanBrodetski RomanBrodetski left a comment

Choose a reason for hiding this comment

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

very nice!

core/lib/dal/src/blocks_dal.rs Outdated Show resolved Hide resolved
core/lib/dal/src/blocks_dal.rs Outdated Show resolved Hide resolved
Deniallugo
Deniallugo previously approved these changes May 17, 2024
slowli
slowli previously approved these changes May 17, 2024
@montekki montekki enabled auto-merge May 17, 2024 09:37
auto-merge was automatically disabled May 17, 2024 12:58

Merge queue setting changed

@Artemka374 Artemka374 dismissed stale reviews from slowli and Deniallugo via d88fcb1 May 20, 2024 10:46
@Artemka374 Artemka374 enabled auto-merge May 20, 2024 12:54
@Artemka374 Artemka374 added this pull request to the merge queue May 20, 2024
Merged via the queue into main with commit a603ac8 May 20, 2024
44 checks passed
@Artemka374 Artemka374 deleted the afo/disallow-non-null-updates-for-txs branch May 20, 2024 14:17
github-merge-queue bot pushed a commit that referenced this pull request May 21, 2024
🤖 I have created a release *beep* *boop*
---


##
[24.4.0](core-v24.3.0...core-v24.4.0)
(2024-05-21)


### Features

* **prover:** add GPU feature for compressor
([#1838](#1838))
([e9a2213](e9a2213))
* **pruning:** remove manual vaccum; add migration configuring
autovacuum
([#1983](#1983))
([3d98072](3d98072))
* **tests:** Move all env calls to one place in ts-tests
([#1968](#1968))
([3300047](3300047))


### Bug Fixes

* Disallow non null updates for transactions
([#1951](#1951))
([a603ac8](a603ac8))
* **en:** Minor node fixes
([#1978](#1978))
([74144e8](74144e8))
* **en:** run `MainNodeFeeParamsFetcher` in API component
([#1988](#1988))
([b62677e](b62677e))
* **merkle-tree:** Fix tree API health check status
([#1973](#1973))
([6235561](6235561))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: zksync-era-bot <zksync-era-bot@users.noreply.github.com>
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.

6 participants