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

Check if existing block is already confirmed in active_transactions add #2055

Merged
merged 15 commits into from Jun 10, 2019

Conversation

@SergiySW
Copy link
Collaborator

commented Jun 1, 2019

for Debug builds

@SergiySW SergiySW added the unit test label Jun 1, 2019

@SergiySW SergiySW added this to the V19.0 milestone Jun 1, 2019

@SergiySW SergiySW self-assigned this Jun 1, 2019

@SergiySW SergiySW requested a review from wezrule Jun 2, 2019

@zhyatt zhyatt added this to RC 4 (TBD) in V19 Jun 2, 2019

@cryptocode cryptocode self-requested a review Jun 2, 2019

@SergiySW SergiySW force-pushed the SergiySW:test/active_add_confirmed branch 3 times, most recently from 53d9aa7 to 53c95e5 Jun 2, 2019

@SergiySW SergiySW force-pushed the SergiySW:test/active_add_confirmed branch from 93e744a to baa1512 Jun 2, 2019

SergiySW added some commits Jun 2, 2019

@SergiySW SergiySW changed the title Check if existing block is already confirmed in active_transactions add Check if existing block are already confirmed in active_transactions add Jun 3, 2019

@SergiySW SergiySW changed the title Check if existing block are already confirmed in active_transactions add Check if existing block is already confirmed in active_transactions add Jun 3, 2019

@wezrule

wezrule approved these changes Jun 3, 2019

SergiySW added some commits Jun 5, 2019

@wezrule

wezrule approved these changes Jun 8, 2019

Copy link
Collaborator

left a comment

LGTM, I do wonder whether there could be some timing issues still, but we will have to wait and see

Show resolved Hide resolved nano/core_test/conflicts.cpp Outdated

@SergiySW SergiySW merged commit efaed45 into nanocurrency:master Jun 10, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

argakiig added a commit that referenced this pull request Jun 11, 2019

Check if existing block is already confirmed in active_transactions a…
…dd (#2055)

* Check if existing block is already confirmed in active_transactions add for Debug builds
* Update some tests
* Add confirmed history container
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.