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

Merge beatrice(GPOS changes) with master #270

Merged
merged 290 commits into from
Feb 7, 2020
Merged

Merge beatrice(GPOS changes) with master #270

merged 290 commits into from
Feb 7, 2020

Conversation

pbattu123
Copy link

Merge beatrice(GPOS changes) with master

pmconrad and others added 30 commits August 28, 2019 22:36
@pmconrad
Created unit test for #325
8b5182e
@jmjatlanta
remove needless find()
8f4483d
@pbattu123
issue - 154: Don't allow to vote when vesting balance is 0
8613bab
@obucina
Merge branch 'develop' of https://github.com/peerplays-network/peerplays
94ec9a6 
 into develop
@obucina
Fix building error for develop branch + test fix from PR 65
2ceb77f
@obucina
Increase block creation timeout to 2500ms
11cf55c
@bobinson
Merge pull request #96 from peerplays-network/feature/GRPH-77
3b36d46 
Fix building error for develop branch + test fix
increase delay for node connection
c5623fd
@oxarbitrage
remove cache from cli get_account
3362d60
@oxarbitrage
add cli tests framework
fcfe65a
@Noughmad
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2
1b4b5d7
@Noughmad
Adjust newly merged code to new API
43bfc3e
@Noughmad
Merge branch 'develop' into GRPH-59-Proposal-failure-handling
a797787
Merged changes from Bitshares PR 1036
b751508
@obucina
GRPH-76 - Short-cut long sequences of missed blocks
77dd8a9 
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.)
@bobinson
Merge pull request #92 from peerplays-network/GRPH-70
07249e9 
[GRPH-70] remove needless find()
@bobinson
Merge pull request #93 from peerplays-network/GRPH-71
e44b04d 
 Fix failed app_test
@bobinson
Merge pull request #97 from peerplays-network/feature/GRPH-61
cdc89c1 
Increase block creation timeout to 2500ms
@pmconrad
Improved resilience of block database against corruption
4268045
@pmconrad
Moved reindex logic into database / chain_database, make use of addit…
1741703 
…ional blocks in block_database

Fixed tests wrt db.open
@pmconrad
Enable undo + fork database for final blocks in a replay
a0052d4 
Dont remove blocks from block db when popping blocks, handle edge case in replay wrt fork_db, adapted unit tests
@pmconrad
Log starting block number of replay
3bee3f2
@pmconrad
Prevent unsigned integer underflow
b45a6ca
@pmconrad
Fixed lock detection
c8f8f1a
@pmconrad
Dont leave _data_dir empty if db is locked
b71f20e
@pmconrad
Writing the object_database is now almost atomic
95a5b57
@pmconrad
Improved consistency check for block_log
0d108fb
@pmconrad
Cut back block_log index file if inconsistent
ab38218
@pmconrad
Fixed undo_database
7d0d61a
@pmconrad
Added test case for broken merge on empty undo_db
731338f
pbattu123 and others added 11 commits December 13, 2019 16:25
@pbattu123
Merge pull request #243 from peerplays-network/feature/BLOCKBACK-186-…
b1f2ba5 
…Bug-Fix

[BLOCKBACK-186] Withdraw vesting bug fix
@pbattu123
Merge pull request #246 from peerplays-network/develop
9746e74 
Merge GPOS feature and Graphene updates into TESTNET
@pbattu123
Update hardfork date for TESTNET, sync fc module and update logs
a4d399d
@pbattu123
Merge pull request #248 from peerplays-network/GRPH-170
a7937bf 
Update hardfork date for TESTNET, sync fc module and update logs
@pbattu123
avoid wlog as it filling up space
26886cc
@pbattu123
Beatrice hot fix(sync issue fix)
054f06a
@pbattu123
gpos tests fix
b6fc207
@pbattu123
Merge pull request #253 from peerplays-network/GPOS-1
b7cd99c 
GPOS-1, Testnet sync issue fix
@pbattu123
Set hardfork date to Jan5th on TESTNET
d52f9fb
@pbattu123
Merge pull request #255 from peerplays-network/hf-update
51fd7d1 
Set hardfork date to Jan5th on TESTNET
@pbattu123
resolve conflicts and point fc to right commit
580bdf7
@sonarcloud
Copy link

sonarcloud bot commented Jan 22, 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
Copy link

We have an error in the CI tests:

1618955ms th_a db_management.cpp:206 open ] Wiping object_database due to missing or wrong version 1618955ms th_a object_database.cpp:93 wipe ] Wiping object database... 1618955ms th_a object_database.cpp:95 wipe ] Done wiping object databse. 1618955ms th_a object_database.cpp:106 open ] Opening object database from /tmp/graphene-tmp/580c-c2ad-62d0-b5a6 ... 1618956ms th_a object_database.cpp:111 open ] Done opening object database. 1618956ms th_a db_management.cpp:240 open ] 10 assert_exception: Assert Exception genesis_state.initial_timestamp.sec_since_epoch() % GRAPHENE_DEFAULT_BLOCK_INTERVAL == 0: Genesis timestamp must be divisible by GRAPHENE_DEFAULT_BLOCK_INTERVAL. {} th_a db_init.cpp:323 init_genesis {} th_a db_init.cpp:999 init_genesis 1618956ms th_a db_management.cpp:240 open ] data_dir: /tmp/graphene-tmp/580c-c2ad-62d0-b5a6 1618956ms th_a database_fixture.cpp:156 database_fixture ] e.to_detail_string(): 10 assert_exception: Assert Exception genesis_state.initial_timestamp.sec_since_epoch() % GRAPHENE_DEFAULT_BLOCK_INTERVAL == 0: Genesis timestamp must be divisible by GRAPHENE_DEFAULT_BLOCK_INTERVAL. {} th_a db_init.cpp:323 init_genesis {} th_a db_init.cpp:999 init_genesis rethrow {"data_dir":"/tmp/graphene-tmp/580c-c2ad-62d0-b5a6"} th_a db_management.cpp:240 open unknown location(0): fatal error: in "wallet_tests/derive_owner_keys_from_brain_key": unknown type /home/gitlab-runner/builds/QDsbRVVn/0/PBSA/peerplays/tests/tests/wallet_tests.cpp(43): last checkpoint: "derive_owner_keys_from_brain_key" fixture ctor *** 195 failures are detected in the test module "Master Test Suite" ERROR: Job failed: exit status 1

reference: https://gitlab.com/PBSA/peerplays/-/jobs/411494045

@pbattu123 pbattu123 mentioned this pull request Jan 30, 2020
Closed
9 tasks
@pbattu123 pbattu123 added hardfork Needs hardfork New Feature new features ready2merge PRs reviewed and ready for merge, but not merged due to HF or other dependencies labels Feb 7, 2020
@bobinson
Copy link

bobinson commented Feb 7, 2020

ignoring the CI errors as local build works.

@bobinson bobinson merged commit 0b28088 into master Feb 7, 2020
@bobinson bobinson added merged and removed ready2merge PRs reviewed and ready for merge, but not merged due to HF or other dependencies labels Feb 7, 2020
rilesdun pushed a commit that referenced this pull request Feb 8, 2022
#270 get_committee_member_count() function
b3ee4f5
rilesdun pushed a commit that referenced this pull request Feb 8, 2022
#270 api_limit_lookup_son_accounts
1eafca8
rilesdun pushed a commit that referenced this pull request Feb 8, 2022
#270 get_worker_count(), lookup_worker_accounts() and list_workers() …
d74b9ee 
…functions
rilesdun pushed a commit that referenced this pull request Feb 8, 2022
#270 add functions: get_witness_by_account_id(), get_committee_member…
65df816 
…_by_account_id(), get_workers_by_account_id()
rilesdun pushed a commit that referenced this pull request Feb 8, 2022
#270 get_workers() function in wallet_api
b24a6ac
rilesdun pushed a commit that referenced this pull request Feb 13, 2022
@serkixenos
#270 functions to unified form
339adbb
rilesdun pushed a commit that referenced this pull request Feb 13, 2022
@serkixenos
Merge branch 'feature/270-funtions-unified-form' into 'develop'
8486b7a 
#270 functions to unified form

See merge request PBSA/peerplays!61
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobinson bobinson bobinson approved these changes

Assignees
No one assigned
Labels
hardfork Needs hardfork merged New Feature new features
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.