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

Merge Plugins and graphene update changes from beatrice TESTNET to master #317

Merged
merged 296 commits into from
Apr 15, 2020

Conversation

pbattu123
Copy link

@pbattu123 pbattu123 commented Mar 23, 2020

This PR aims to merge below changes to mainnet.

  • Merge Plugins and graphene update changes from beatrice TESTNET to master
  • Merge sweeps/5050 winner_ticket_id changes into master branch

bobinson and others added 30 commits August 30, 2019 18:02
Fix building error for develop branch + test fix
Fixes database::update_global_dynamic_data to speed up counting missed blocks.
(This also fixes a minor issue with counting - the previous algorithm would skip missed blocks for the witness who signed the first block after the gap.)
[GRPH-70] remove needless find()
Increase block creation timeout to 2500ms
…ional blocks in block_database

Fixed tests wrt db.open
Dont remove blocks from block db when popping blocks, handle edge case in replay wrt fork_db, adapted unit tests
Store correct block ID when switching forks
Fix for irrelevant signature included issue
pbattu123 and others added 24 commits December 6, 2019 16:35
BLOCKBACK-183 GPOS: Votes consideration on GPOS activation
…Bug-Fix

[BLOCKBACK-186] Withdraw vesting bug fix
Merge GPOS feature and Graphene updates into TESTNET
Update hardfork date for TESTNET, sync fc module and update logs
Set hardfork date to Jan5th on TESTNET
Added submodule sync to peerplays compile process
…#304)

* check witness signature before adding block to fork db

* Replace verify_no_send_in_progress with no_parallel_execution_guard

* fixed cli_wallet log issue

* Port plugin sanitization code

* avoid directly overwriting wallet file

* Implemented "plugins" config variable

* allow plugin to have descriptions

* Merge pull request #444 from oxarbitrage/elasticsearch

Elasticsearch plugin

* Merge pull request #500 from oxarbitrage/elasticsearch-extras

es_objects plugin

* Merge pull request #873 from pmconrad/585_fix_history_ids

Fix history ids

* Merge pull request #1201 from oxarbitrage/elasticsearch_tests2

Elasticsearch refactor

* Merge pull request #1271 from oxarbitrage/es_objects

refine es_objects plugin

* Merge pull request #1429 from oxarbitrage/es_objects_templates

Add an adaptor to es_objects and template function to reduce code

* Merge pull request #1458 from oxarbitrage/issue1455

add option elasticsearch-start-es-after-block to es plugin

* Merge pull request #1541 from oxarbitrage/es_objects_start_after_block

add es-objects-start-es-after-block option

* explicitly cleanup external library facilities

* Merge pull request #1717 from oxarbitrage/issue1652

add genesis data to es_objects

* Merge pull request #1073 from xiangxn/merge-impacted

merge impacted into db_notify

* Merge pull request #1725 from oxarbitrage/issue1682

elasticsearch history api #1682

* change ES index prefixes to Peerplays-specific

* sync develop with beatrice

* fix the data writing to ES during sync issues

* fix CLI tests

* brought updates from mainnet branch (#285)

* Fix unit test failures (#289)

* fixed unit test failures from the recent merges

* fixed unit test failures from the recent merges

* enable snapshot plugin (#288)

* sync fc branch(build optimization changes)

* update to es plugin

* fix verify witness signature method (#295)

* enable mandatory plugins to have smooth transition for next release

* updated tests to keep in-line with plugin changes

Co-authored-by: Sandip Patel <sandip@knackroot.com>
Co-authored-by: Peter Conrad <conrad@quisquis.de>
Co-authored-by: Alfredo <oxarbitrage@gmail.com>
Co-authored-by: Abit <abitmore@users.noreply.github.com>
Co-authored-by: crypto-ape <43807588+crypto-ape@users.noreply.github.com>
Co-authored-by: gladcow <s.gladkov@pbsa.info>
@pbattu123 pbattu123 requested a review from bobinson March 24, 2020 17:26
@sonarcloud
Copy link

sonarcloud bot commented Apr 14, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@bobinson bobinson merged commit be14592 into master Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.