Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Sep 25, 2020

This is coming from #1798, focused on include the incremental merkle tree primitive with all of its unit tests.
This base primitive class is almost one to one with upstream.

Decoupled the following commits:

  • Incremental Merkle Tree + merkletree tests back port —> 762d5f10
  • Rename sapling util file to not shadow src/util file --> cae89d3b

@furszy furszy self-assigned this Sep 25, 2020
@furszy furszy force-pushed the 2020_incremental_merkle_tree_backport branch 5 times, most recently from 78159c4 to 352a720 Compare September 28, 2020 19:53
@furszy
Copy link
Author

furszy commented Sep 28, 2020

This is fixing #1798 travis issues. took a while to decouple it but it's is ready for review.

@furszy furszy requested a review from random-zebra September 29, 2020 14:14
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

Could use some cleanup regarding our own standards and helpers/wrappers so as to not re-introduce new boost dependencies.

@furszy furszy force-pushed the 2020_incremental_merkle_tree_backport branch from 352a720 to 626b0d9 Compare October 1, 2020 21:02
@furszy
Copy link
Author

furszy commented Oct 1, 2020

Done, styling updated to our sources conventions 👍 .

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

ACK 626b0d9

Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK 626b0d9

@furszy furszy merged commit 696e328 into PIVX-Project:master Oct 3, 2020
furszy added a commit that referenced this pull request Oct 3, 2020
b11b357 removing global namespace usage for noteencryption and sapling_note unit tests (furszy)
52da4e0 [Sapling] Note Encryption unit tests back ported. (furszy)
4d2f01a [Sapling] change cm() to cmu() in SaplingNote class (furszy)

Pull request description:

  Another decoupling from #1798. Similar to #1870, these changes are part of the primitives unit test coverage back port work.
  Commits included:

  * change cm() to cmu() in SaplingNote class —> d437276a4b922c6c70d810cff0719a2e76f1a4bc
  * Note Encryption unit tests back ported. —> e4c1bbf1618fd797599b6bf3511cea79e6d9d4d7

ACKs for top commit:
  Fuzzbawls:
    ACK b11b357
  random-zebra:
    re-utACK b11b357

Tree-SHA512: 56914dba65ee239f7e6713a111abca5bd1a4e684fadcdbed4314295f499f3b6689271fa7999c7f182dcba069ebe29299bed944e7ee6b1bcb3aad987884811242
@furszy furszy deleted the 2020_incremental_merkle_tree_backport branch November 29, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants