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 develop branch into hardfork branch #1838

Merged
merged 375 commits into from
Jul 3, 2019
Merged

Merge develop branch into hardfork branch #1838

merged 375 commits into from
Jul 3, 2019

Conversation

abitmore
Copy link
Member

@abitmore abitmore commented Jul 3, 2019

No description provided.

oxarbitrage and others added 30 commits March 23, 2019 11:37
@oxarbitrage
set participation to fixed 2 decimals
205f3a3
@manikey123
Added the fix to make top 4 apis configurable
4780593
@oxarbitrage
Merge pull request #1666 from bitshares/oxarbitrage-patch-1
a411589 
wallet info() change participation to int
@oxarbitrage
reduce precision of numbers in replay output
80a9f9f
@nathanielhourt
Fix some warnings
4d5c02a
@OpenLedgerApp
Merge pull request #1 from openledger/issue-1210-core-912
5dad10c 
add unit tests for get_signed_transaction_signers, get_key_references
@oxarbitrage
Merge pull request #1674 from bitshares/replay-perc-numbers
392ac40 
Reduce precision of numbers in replay output
@nathanielhourt
Merge pull request #1677 from nathanhourt/warnings
b96cc0c 
Fix some warnings
@abitmore
Apply deterministic virtual_op numbering rule
f03c207 
#1675
change BTS-symbol to 1.3.0
f9b7460
@pmconrad
Merge pull request #1635 from openledger/issue-1210
ed08580 
Added new commands to CLI: get_transaction_signers, get_key_references
@oxarbitrage
change indentation in quit command
ff004b4
@jmjatlanta
Fix conflicts merging release to develop
fb657f6
@jmjatlanta
Final cr/lf
b225f96
@oxarbitrage
Merge pull request #1684 from bitshares/oxarbitrage-patch-1
1abddf9 
change indentation in quit command
@jmjatlanta
Merge pull request #1686 from bitshares/jmj_release_develop
f74f450 
Merge 3.0.0 release to develop
@crypto-ape
fix referencing local stack variable in async thread
c8ce31a
@crypto-ape
explicitly cleanup external library facilities
376f031
@crypto-ape
fix referencing local stack variable in async thread // add missing p…
53af67e 
…arameter type change
@crypto-ape
fix referencing local stack variable in async thread // capture share…
3ab22f6 
…d_ptr by copy
@abitmore
Merge branch 'develop' into vop-numbering
da6c386 
Resolved conflicts:
- libraries/chain/include/graphene/chain/config.hpp : bumped GRAPHENE_CURRENT_DB_VERSION to current date
@jmjatlanta
Add htlc_extend validation
626c572
@jmjatlanta
Added tests for htlc_extend
69f5aa7
@jmjatlanta
Correctly validate HTLC extension date
24ffef2
@jmjatlanta
Only allow HTLC recipient to call redeem
82fa2f8
@jmjatlanta
Shorten long lines
510932f
@jmjatlanta
Allow 3rd party to redeem, notify all
8f5dddd
@xeroc
Improve the serializer to fix #1701
441e290
@xeroc
More fixes for formatting
96dca2c
@jmjatlanta
Merge pull request #1699 from bitshares/jmj_htlc_hotfix
ac9bcfb 
Add validation to HTLC Extend
abitmore and others added 25 commits June 20, 2019 16:30
@abitmore
Wrap long lines, remove trailing white spaces
5e92c13
@abitmore
Update code style
d0e6757
@abitmore
Merge pull request #1815 from bitshares/revert-1323-issue1307
b6d4e24 
Revert "wallet compatibility issue"
@abitmore
Merge pull request #1813 from bitshares/fix-temp-account-vesting
987298e 
Disallow temp-account to withdraw vested balance
@pmconrad
Separate declaration + instantiation macros for external serializatio…
173ff3d 
…n to fix windows build
@jmjatlanta
size_t fix for mac
faa5d77
@pmconrad
Get rid of default max_depth completely
1075401
@pmconrad
Removed more default arguments
681d5db
@jmjatlanta
Merge pull request #1817 from bitshares/jmj_1816
de4988d 
size_t fix for mac
@jmjatlanta
Merge pull request #1818 from pmconrad/fix_external_serialization
08a49e8 
Fix external serialization
@jmjatlanta
Merge pull request #1731 from bitshares/pr-726-auto-subscribe
c096aa8 
Add set_auto_subscription API
@jmjatlanta
make cli_wallet rpc logging work
2e7dcc8
@jmjatlanta
Fix colors, logging directory
b146344
@jmjatlanta
Move logging setup to separate method
12eccf5
@oxarbitrage @jmjatlanta
fix indentation in setup_logging()
a2e3e61
@oxarbitrage @jmjatlanta
add logging command line options
06a2c10
@jmjatlanta
Fix conflict in cli_wallet main.cpp
7e1a624
@oxarbitrage @jmjatlanta
add allowed log level values
eb91d4e
@oxarbitrage
Merge pull request #1528 from bitshares/jmj_1149
9e405e0 
make cli_wallet rpc logging work
@crypto-ape
small refactor of cli_wallet to get rid of transaction expiration con…
649709f 
…stant duplicities
@pmconrad
Moved undo_point forward to MAX_UNDO_HISTORY
c2960ff
@oxarbitrage
add htlc parameters to developer genesis
5088496
@pmconrad
Merge pull request #1811 from crypto-ape/cli_wallet-transaction_defau…
416458f 
…lt_expiration_as_constant

cli wallet transaction default expiration as constant
@pmconrad
Merge pull request #1832 from bitshares/1703_enable_undo_earlier
49d8e94 
Enable undo_db earlier during replay
@pmconrad
Merge pull request #1833 from bitshares/oxarbitrage-patch-1
725dff1 
add htlc parameters to developer genesis
jmjatlanta
jmjatlanta approved these changes Jul 3, 2019
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.

Looks good. Chain test runs without problems. One procedural note: going develop->hardfork with no intermediate branch results in any push to develop invalidating this approval. Is it better to create an intermediate branch, or no?

@abitmore abitmore merged commit d98c38a into hardfork Jul 3, 2019
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0.0 - Protocol Upgrade Release
Development

Successfully merging this pull request may close these issues.