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.

Sign up for GitHub

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

Jump to bottom

Modify/fmt leaf hash calculation #912

Merged
merged 80 commits into from
Mar 12, 2023
Merged

Modify/fmt leaf hash calculation #912

merged 80 commits into from
Mar 12, 2023

Conversation

lpoli
Copy link
Contributor

@lpoli lpoli commented Jan 14, 2023 •
edited
Loading

Changes

This PR hash changes in both blobber and validator.

  1. Leaf hash calculation of fixedMerkleTree is changed to be flat hash of content rather than being compactmerkletree.
  2. Add validation merkle tree
  3. Add actual file hash signature and validaiton root signature to the reference object
  4. Replace content hash with validation root

Fixes

Tests

Tasks to complete before merging PR:

  • Ensure system tests are passing. If not Run them manually to check for any regressions 📋
  • Do any new system tests need added to test this change? do any existing system tests need updated? If so create a PR at 0chain/system_test
  • Merge your system tests PR to master AFTER merging this PR

Associated PRs (Link as appropriate):

@lpoli
WIP Add tree skeleton
be6c727
@lpoli
Add functions further
3e4c579
@lpoli
Define constant
72c583a
@lpoli
Add separate struct for merkle proof
5e69d55
@lpoli
Remove duplicate constant
99ecb1b
@lpoli
Remove redundant lines.
d344221
@lpoli
Add unit test
a342040
@lpoli
Add unit test for merkle proof generation
584bb65
@lpoli
Update minor fixes
a0d0009
@lpoli
Optimze writes and fix issues
a906816
@lpoli
Add unit test
cb53038
@lpoli
Add comments
ced9dd4
@lpoli
Add methods
456a606
@lpoli
Modify for merkle tree changes
e67ee89
@lpoli
Add and fix return value
c9f684f
@lpoli
Seek to negative filesize
a6c7c25 
Modify error message
@lpoli
Fix tests
0734de2
@lpoli
Replace content hash with validation root
f855eee 
Replace merkle root with fixed merkle root
@lpoli
Remove file info in writemarker
7a43d59
@lpoli
Remove redundant variable initialization
a905fb8
@lpoli
Upgrade gosdk to specific commit
88c510b
@lpoli
Add leaf index in response and modify json tag
ef929bb
@lpoli
Modify validatior according to recent blobber changes
082e5d6
@lpoli
Fix unit test
2b8b3e1
@lpoli
Add test to cover for size lesser than 64 KB
10e27e5
@lpoli
Add signatures of file to ref
1ace016
@lpoli
Change block-num condition
b5c1c29
@lpoli
Merge branch 'staging' into modify/fmt-leaf-hash-calculation
aae91ea
This was referenced Jan 14, 2023
Merged
Merged
@service-0chain
Copy link
Collaborator

Manual system tests [cancelled] with the following config

config value
tests skipped FALSE
system-tests modify/fmt-leaf-hash-calculation
gosdk modify/fmt-leaf-hash-calculation
zboxcli modify/fmt-leaf-hash-calculation
zwalletcli staging
0chain staging
blobber modify/fmt-leaf-hash-calculation
authorizer staging
0box staging
0block staging
0dns staging
explorer staging
0proxy staging
0search staging

@lpoli lpoli requested a review from peterlimg March 5, 2023 15:35
@service-0chain
Copy link
Collaborator

Manual system tests [success] with the following config

config value
tests skipped ABILITY TO SKIP TESTS IS DISABLED. SKIP_TESTS OPTION IGNORED.
system-tests modify/fmt-leaf-hash-calculation
gosdk modify/fmt-leaf-hash-calculation
zboxcli modify/fmt-leaf-hash-calculation
zwalletcli staging
0chain staging
blobber modify/fmt-leaf-hash-calculation
authorizer staging
0box staging
0block staging
0dns staging
explorer staging
0proxy staging
0search staging

dabasov
dabasov approved these changes Mar 12, 2023
View reviewed changes
Copy link
Member

@dabasov dabasov left a comment

Choose a reason for hiding this comment

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

lgtm

@lpoli lpoli mentioned this pull request Mar 12, 2023
Merged
@service-0chain
Copy link
Collaborator

Manual system tests [failure] with the following config

config value
tests skipped ABILITY TO SKIP TESTS IS DISABLED. SKIP_TESTS OPTION IGNORED.
system-tests modify/fmt-leaf-hash-calculation
gosdk modify/fmt-leaf-hash-calculation
zboxcli modify/fmt-leaf-hash-calculation
zwalletcli staging
0chain staging
blobber modify/fmt-leaf-hash-calculation
authorizer staging
0box staging
0block staging
0dns staging
explorer staging
0proxy staging
0search staging

@Kishan-Dhakan Kishan-Dhakan merged commit fa0b557 into staging Mar 12, 2023
@Kishan-Dhakan Kishan-Dhakan deleted the modify/fmt-leaf-hash-calculation branch March 12, 2023 21:19
peterlimg added a commit that referenced this pull request Mar 13, 2023
@peterlimg
Merge branch 'staging' into chain-fee
b05f6c2 
* staging:
  Modify/fmt leaf hash calculation (#912)
  Validator health (#994)
peterlimg added a commit that referenced this pull request Mar 13, 2023
@peterlimg
Merge branch 'staging' into chain-fee
7d69eba 
* staging:
  Modify/fmt leaf hash calculation (#912)
  Validator health (#994)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dabasov dabasov dabasov approved these changes

@guruhubb guruhubb Awaiting requested review from guruhubb guruhubb is a code owner

@cnlangzi cnlangzi Awaiting requested review from cnlangzi

@peterlimg peterlimg Awaiting requested review from peterlimg peterlimg is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Nil tickets
6 participants
@lpoli @codecov-commenter @service-0chain @dabasov @peterlimg @Kishan-Dhakan