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 release branch into master branch #1043

Merged
merged 436 commits into from
Jun 12, 2018
Merged

Merge release branch into master branch #1043

merged 436 commits into from
Jun 12, 2018

Conversation

abitmore
Copy link
Member

No description provided.

abitmore and others added 30 commits April 13, 2018 16:51
@abitmore
BSIP38: handle rounding when calculating maximums
2c61ad9
@oxarbitrage
Merge pull request #840 from cifer-lee/issue805
dc8b39d 
Fix #805, Add parameters to configure log rotation
@abitmore
Add random tests for asset multiplies price
b4b18e2
@abitmore
BSIP38 tests: update to hit more edge cases
ddb6baa
remove _asset_cache unused
7ec41bb
silencing the unused variable warnings
c6d5190
@abitmore
BSIP38 tests: move test case to new file, refactor
dd8d7f6
@abitmore
BSIP38: update algorithm when calculating maximums
15b2b16
silencing the unused lambda capture warning
6fa68b2
reverting back to the original version to avoid potential conflict
30b7ee5
silence warning adding 'long' to a string does not append to the stri…
944a3ca 
…ng [-Wstring-plus-int]
fix warning: 'index_entry' defined as a struct here but previously de…
eacdd32 
…clared as a class
@abitmore
Merge pull request #850 from zhuliting/develop
960bf12 
remove _asset_cache unused
@abitmore
Code refactory asset::multiply_and_round_up(price)
c6b28b2
@abitmore
Update comments
4755674
add space after the quote
8262d6b
@oxarbitrage
Merge pull request #854 from ihla/fix_warning_in_elasticsearch.cpp
b359365 
silence warning adding 'long' to a string does not append to the stri…
@oxarbitrage
Merge pull request #851 from ihla/fix_unused_variable_warnings_in_tests
49aeb22 
Fix the unused variable warnings in tests
@abitmore
Merge bsip35 changes into bsip38 branch
58542b8
@abitmore
Use asset::multiply_and_round_up() in BSIP38
464fd38
@abitmore
BSIP38 tests: fewer iterations in call_order_tests
e68df58
@oxarbitrage
Merge pull request #855 from ihla/fix_warning_in_block_database.hpp
db93fea 
fix warning: 'index_entry' defined as a struct here but previously declared as a class
@pmconrad
Revised HF protection for #214 with additional test scenario
e7da37f
@oxarbitrage
add settle bsip35 tests
8ff51af
@oxarbitrage
change account_id_type(19) to paul_id
ea8adac
@oxarbitrage
fix last change to paul_id should be alice_id
80706de
@oxarbitrage
replace nullptr in call checks after global settle
cb6c364
@oxarbitrage
change all auto calls to reference const objects
f0d71df
@abitmore
Merge pull request #856 from bitshares/oxarbitrage-patch-2
35bfa0b 
add settle bsip35 tests
@oxarbitrage
test cases F variation
41430dd
abitmore and others added 25 commits May 24, 2018 14:48
@abitmore
Tests check_call_orders when only MCR changed #935
9468d61
@abitmore
Update comments in test case
a725bad
@abitmore
Add todo for failing test case
515afaa
@abitmore
Add MSSR test cases #935
bdacd45
@abitmore
Remove failing MCR test case
6a81035
@jmjatlanta
MPA -> MPA -> CORE is valid
13810e8
@jmjatlanta
fix options.short_backing_asset
51a1c01
@jmjatlanta
changed from const asset_id_type& to asset_id_type
a4fabca
@abitmore
Merge pull request #971 from bitshares/jmj_issue_922b
9141f2e 
MPA -> MPA -> CORE is valid
@abitmore
Update comments in test cases
82a4519
@abitmore
Merge pull request #965 from bitshares/935-fix1
d4d30e6 
Call check_call_orders as well when MCR or MSSR changed
@abitmore
Fix test cases: if hf 343 and 890 at same time
64b4826
@abitmore
Fix unsigned integer underflow in test case
81c45a7
@abitmore
Merge pull request #976 from bitshares/fix-935-test-case
e1e3ce8 
Fix test cases: if hf 343 and 890 occur at same maintenance interval
@abitmore
Fix init asset_id field for bitassets from genesis
3d27b66
@abitmore
Test case for genesis asset_id mismatch issue
d65abb9
@abitmore
Merge pull request #981 from bitshares/980-fix-genesis-bitasset
dfa699e 
Fix genesis asset_id mismatch issue
@pmconrad @oxarbitrage
Modified Dockerfile to work with new docker cloud version
cd09f07
@oxarbitrage
update baseimage
0144a42
@oxarbitrage
Merge pull request #1029 from oxarbitrage/docker-fix
a9e38bc 
Modified Dockerfile to work with new docker cloud version
@abitmore
Skip temp-account balance check #1040
44a7c47
@pmconrad
Added unit test for TEMP_ACCOUNT fix
5ae5259
@abitmore
Merge pull request #1041 from bitshares/1040-temp-account-balance
2ff4c1b 
Skip temp-account balance check
@abitmore
Set MAINNET hard fork time to 2018-07-19T14:02:00Z
76ab28e
@abitmore
Merge pull request #1042 from bitshares/update-hf-date
004f84a 
Set MAINNET hard fork time to 2018-07-19T14:02:00Z
jmjatlanta
jmjatlanta approved these changes Jun 12, 2018
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment

Choose a reason for hiding this comment

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

I merged and compiled this, and then ran the witness node for several hours. It sync'd and has been running fine. The chain_tests run with no errors.

Ubuntu 16.04 / OpenSSL 1.0.2n / Boost 1.63

@oxarbitrage oxarbitrage self-requested a review June 12, 2018 11:52
@abitmore abitmore merged commit 27d2e3e into master Jun 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmjatlanta jmjatlanta jmjatlanta approved these changes

@oxarbitrage oxarbitrage oxarbitrage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
201806 - Consensus Changing Release
Development

Successfully merging this pull request may close these issues.
6 participants
@abitmore @jmjatlanta @oxarbitrage @pmconrad @cryptocifer @Zapata