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

UIP-0024 Implementation (CTOR/LTOR) #440

Merged
merged 40 commits into from
Jan 28, 2019
Merged

UIP-0024 Implementation (CTOR/LTOR) #440

merged 40 commits into from
Jan 28, 2019

Conversation

castarco
Copy link

@castarco castarco commented Jan 16, 2019 •
edited
Loading

This PR implements the UIP-0024 (Canonical Transactions Ordering Rule,
specifically LTOR, Lexicographical Transactions Ordering Rule).

Signed-off-by: Andres Correa Casablanca andres@thirdhash.com

@castarco castarco added feature New functionality consensus wip Work in progress which is not supposed to be merged yet labels Jan 16, 2019
@castarco castarco self-assigned this Jan 16, 2019
@cornelius
Copy link
Member

Separating the style related changes off certainly would make it easier to review this.

@castarco
Copy link
Author

Separating the style related changes off certainly would make it easier to review this.

On it.

kostyantyn
kostyantyn reviewed Jan 16, 2019
View reviewed changes
src/coins.cpp Outdated Show resolved Hide resolved
@castarco castarco mentioned this pull request Jan 16, 2019
Closed
Ruteri
Ruteri reviewed Jan 16, 2019
View reviewed changes
src/txmempool.cpp Outdated Show resolved Hide resolved
src/txmempool.cpp Outdated Show resolved Hide resolved
@castarco castarco force-pushed the uip-0024-impl branch 2 times, most recently from aec1aab to 594e1c7 Compare January 17, 2019 11:18
@frolosofsky
Copy link
Member

frolosofsky commented Jan 17, 2019 •
edited
Loading

I see a lot of stylistic changes in python files. Does it relate to this PR? Do we want to change this at all?

@scravy
Copy link
Member

scravy commented Jan 17, 2019

Maybe... I should split all the style-related changes into a different PR.

I think you should :-)

scravy
scravy reviewed Jan 17, 2019
View reviewed changes
src/primitives/txid.h Outdated Show resolved Hide resolved
scravy
scravy reviewed Jan 17, 2019
View reviewed changes
src/test/uint256_tests.cpp Outdated Show resolved Hide resolved
@castarco castarco force-pushed the uip-0024-impl branch 2 times, most recently from 08b2f68 to ba19501 Compare January 17, 2019 14:32
Ruteri
Ruteri reviewed Jan 17, 2019
View reviewed changes
src/txmempool.cpp Outdated Show resolved Hide resolved
@castarco castarco force-pushed the uip-0024-impl branch 5 times, most recently from 709ff45 to 7da6274 Compare January 17, 2019 15:31
Nizametdinov
Nizametdinov reviewed Jan 18, 2019
View reviewed changes
src/txmempool.cpp Outdated Show resolved Hide resolved
kostyantyn
kostyantyn reviewed Jan 18, 2019
View reviewed changes
src/txmempool.h Outdated Show resolved Hide resolved
@castarco castarco changed the title [WIP] UIP-0024 Implementation (CTOR/LTOR) UIP-0024 Implementation (CTOR/LTOR) Jan 18, 2019
@castarco castarco removed the wip Work in progress which is not supposed to be merged yet label Jan 18, 2019
Andres Correa Casablanca added 22 commits January 28, 2019 11:52
Use swap instead of move in addForBlock
68270bb 
Use swap instead of move in DisconnectedBlockTransactions::addForBlock
in order to avoid potential problems for reusing the parents variable
after having moved it.

Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Apply Unit-e style guidelines
d28806b 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Avoid caching iterators
e1d02f8 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Undo style fix to ease upstream rebase
41f94e4 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add LTOR related tests
de3cd6d 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Use ++ptx instead of ptx++
e5e066e 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add missing references to new files
962b5eb 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Rename addForBlock to AddForBlock
8614e82 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Fix feature_ltor.py flakyness
05082e4 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Use CompareLexicographicall instead of Compare
df7964c 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Improve naming & comments
98c9ff5 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add unit test for LoadFromBlockInTopologicalOrder
7a1473c 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Apply minor performance improvements
26b8b37 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Apply minor random fixes
e2b8e6c 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add default methods to SaltedTxidHasher
f0037ad 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Remove TxId
7c5619a 
TxId is not strictly related to CTOR, so it's better to implement it in
a different PR.

Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Use static_cast instead of C-style cast
8bd71f2 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add test for binary_blob.CompareLexicographically
c132614 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Rename CompareLexicographically to CompareAsNumber
3e37bd5 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Simplify CompareAsNumber
95b6c20 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Fix typo
b16522e 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
Add comment on why we call disconnectpool.clear()
025789a 
Signed-off-by: Andres Correa Casablanca <andres@thirdhash.com>
@scravy
Copy link
Member

scravy commented Jan 28, 2019

@Ruteri @kostyantyn you utACK'ed but did not approve. Meanwhile commits have been pushed. Could you re-review and check whether it's approvable for you now?

cmihai
cmihai approved these changes Jan 28, 2019
View reviewed changes
Copy link
Member

@cmihai cmihai left a comment

Choose a reason for hiding this comment

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

utACK 025789a

Ruteri
Ruteri approved these changes Jan 28, 2019
View reviewed changes
Copy link
Member

@Ruteri Ruteri left a comment

Choose a reason for hiding this comment

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

utACK 025789a

kostyantyn
kostyantyn approved these changes Jan 28, 2019
View reviewed changes
Copy link
Member

@kostyantyn kostyantyn left a comment

Choose a reason for hiding this comment

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

utACK 025789a

@castarco castarco merged commit 4031349 into dtr-org:master Jan 28, 2019
@castarco castarco deleted the uip-0024-impl branch February 7, 2019 10:53
@dsaveliev dsaveliev mentioned this pull request Mar 14, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frolosofsky frolosofsky frolosofsky left review comments

@Nizametdinov Nizametdinov Nizametdinov left review comments

@thothd thothd thothd left review comments

@Gnappuraz Gnappuraz Gnappuraz left review comments

@AM5800 AM5800 AM5800 left review comments

@scravy scravy scravy approved these changes

@Ruteri Ruteri Ruteri approved these changes

@kostyantyn kostyantyn kostyantyn approved these changes

@cmihai cmihai cmihai approved these changes

Assignees

@castarco castarco

Labels
consensus feature New functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.