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

*: refactor Notary conflict records storage scheme #3138

Merged
merged 1 commit into from
Oct 10, 2023

Conversation

AnnaShaleva
Copy link
Member

@AnnaShaleva AnnaShaleva commented Sep 21, 2023

Implement neo-project/neo#2907 (comment) conflict records storing scheme.

@AnnaShaleva AnnaShaleva added this to the v0.102.1 milestone Sep 21, 2023
@AnnaShaleva AnnaShaleva changed the title *: implement Policy attribute fee *: implement Policy attribute fee and refactor Notary conflict records storage scheme Sep 21, 2023
pkg/core/blockchain.go Outdated Show resolved Hide resolved
pkg/core/blockchain.go Outdated Show resolved Hide resolved
pkg/core/dao/dao.go Outdated Show resolved Hide resolved
pkg/core/dao/dao.go Outdated Show resolved Hide resolved
pkg/core/dao/dao.go Outdated Show resolved Hide resolved
pkg/core/blockchain.go Outdated Show resolved Hide resolved
pkg/rpcclient/notary/contract.go Outdated Show resolved Hide resolved
@AnnaShaleva AnnaShaleva force-pushed the fix-conflicts branch 5 times, most recently from cb11905 to a33d3f3 Compare September 22, 2023 16:42
@AnnaShaleva
Copy link
Member Author

AnnaShaleva commented Sep 22, 2023

Ready for review, depends on neo-project/neo#2916 and neo-project/neo#2913.

@codecov
Copy link

codecov bot commented Sep 22, 2023

Codecov Report

Merging #3138 (32bfed4) into master (fce98a0) will decrease coverage by 0.11%.
The diff coverage is 55.17%.

@@            Coverage Diff             @@
##           master    #3138      +/-   ##
==========================================
- Coverage   85.47%   85.37%   -0.11%     
==========================================
  Files         323      323              
  Lines       43579    43574       -5     
==========================================
- Hits        37250    37201      -49     
- Misses       4862     4913      +51     
+ Partials     1467     1460       -7     
Files Coverage Δ
pkg/core/blockchain.go 78.73% <100.00%> (+0.01%) ⬆️
pkg/core/dao/dao.go 78.17% <48.00%> (-0.86%) ⬇️

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@roman-khimov
Copy link
Member

This needs to be split to separate fee setting changes (that change the protocol) from the storage scheme changes (that can be merged as is).

@AnnaShaleva AnnaShaleva changed the title *: implement Policy attribute fee and refactor Notary conflict records storage scheme *: refactor Notary conflict records storage scheme Oct 10, 2023
pkg/core/dao/dao.go Outdated Show resolved Hide resolved
Copy link
Member

@roman-khimov roman-khimov left a comment

Choose a reason for hiding this comment

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

Ah, we need a DB version update.

@AnnaShaleva
Copy link
Member Author

Ah, we need a DB version update.

Nice catch, fixed.

@roman-khimov roman-khimov merged commit b284b90 into master Oct 10, 2023
13 of 18 checks passed
@roman-khimov roman-khimov deleted the fix-conflicts branch October 10, 2023 15:09
AnnaShaleva added a commit that referenced this pull request May 15, 2024
Conflict record stub has value of 5 bytes length: 1 byte for
storage.ExecTransaction prefix and 4 bytes for the block index LE. This
scheme was implemented in #3138, and this commit should be a part of
this PR.

Also, transaction.DummyVersion is removed since it's unused anymore.

Close #3426. The reason of `failed to locate application log: EOF` error
during genesis AER request is in the following: genesis executable was
overwritten by conflict record stub produced by transaction
0x289c235dcdab8be7426d05f0fbb5e86c619f81481ea136493fa95deee5dbb7cc (ref.
 #3427). As a consequence, an attempt to decode transaction AER was
initited, but conflict record scheme was changed in #3138.

Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva added a commit that referenced this pull request May 15, 2024
Conflict record stub has value of 5 bytes length: 1 byte for
storage.ExecTransaction prefix and 4 bytes for the block index LE. This
scheme was implemented in #3138, and this commit should be a part of
this PR.

Also, transaction.DummyVersion is removed since it's unused anymore.

Close #3426. The reason of `failed to locate application log: EOF` error
during genesis AER request is in the following: genesis executable was
overwritten by conflict record stub produced by transaction
0x289c235dcdab8be7426d05f0fbb5e86c619f81481ea136493fa95deee5dbb7cc (ref.
 #3427). As a consequence, an attempt to decode transaction AER was
initited, but conflict record scheme was changed in #3138.

Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva added a commit that referenced this pull request May 15, 2024
Conflict record stub has value of 5 bytes length: 1 byte for
storage.ExecTransaction prefix and 4 bytes for the block index LE. This
scheme was implemented in #3138, and this commit should be a part of
this PR.

Also, transaction.DummyVersion is removed since it's unused anymore.

Close #3426. The reason of `failed to locate application log: EOF` error
during genesis AER request is in the following: genesis executable was
overwritten by conflict record stub produced by transaction
0x289c235dcdab8be7426d05f0fbb5e86c619f81481ea136493fa95deee5dbb7cc (ref.
 #3427). As a consequence, an attempt to decode transaction AER was
initited, but conflict record scheme was changed in #3138.

Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva added a commit that referenced this pull request May 16, 2024
Conflict record stub has value of 5 bytes length: 1 byte for
storage.ExecTransaction prefix and 4 bytes for the block index LE. This
scheme was implemented in #3138, and this commit should be a part of
this PR.

Also, transaction.DummyVersion is removed since it's unused anymore.

Close #3426. The reason of `failed to locate application log: EOF` error
during genesis AER request is in the following: genesis executable was
overwritten by conflict record stub produced by transaction
0x289c235dcdab8be7426d05f0fbb5e86c619f81481ea136493fa95deee5dbb7cc (ref.
 #3427). As a consequence, an attempt to decode transaction AER was
initited, but conflict record scheme was changed in #3138.

Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva added a commit that referenced this pull request May 16, 2024
Conflict record stub has value of 5 bytes length: 1 byte for
storage.ExecTransaction prefix and 4 bytes for the block index LE. This
scheme was implemented in #3138, and this commit should be a part of
this PR.

Also, transaction.DummyVersion is removed since it's unused anymore.

Close #3426. The reason of `failed to locate application log: EOF` error
during genesis AER request is in the following: genesis executable was
overwritten by conflict record stub produced by transaction
0x289c235dcdab8be7426d05f0fbb5e86c619f81481ea136493fa95deee5dbb7cc (ref.
 #3427). As a consequence, an attempt to decode transaction AER was
initited, but conflict record scheme was changed in #3138.

Signed-off-by: Anna Shaleva <[email protected]>
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.

2 participants