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

Testnet X-Mas Sneak Preview Release #1489

Merged
merged 158 commits into from Dec 21, 2018
Merged

Testnet X-Mas Sneak Preview Release #1489

merged 158 commits into from Dec 21, 2018

Conversation

pmconrad
Copy link
Contributor

This testnet-only release contains a few important changes that will make its
way into the mainnet release planned for early 2019.

Consensus changes

  • BSIP-44 - Hashed Timelocked Contracts

Non-Consensus changes

jmjatlanta and others added 30 commits October 16, 2018 11:06
@jmjatlanta
initial fix for verify_account_authority
7d44c3a
@cogutvalera
Capture Ctrl+C in cli_wallet when not in daemon mode #1193
7dc0de7
@jmjatlanta
improved way to verify account and keys
824ed4f
@jmjatlanta
Removed unneeded method definition
48fa400
@pmconrad
Merge pull request #1232 from cogutvalera/issue_1193
0eebc1e 
Capture Ctrl+C in cli_wallet when not in daemon mode #1193
@jmjatlanta
Added multiple signatures to test
c2b63f5
@jmjatlanta
shorten line length
5db31f5
@jmjatlanta
add test for multisig
7e4e033
@jmjatlanta
improved multisig test
e03d329
@jmjatlanta
fix short line
673ac2b
@jmjatlanta
moved tests, fixed comments
f523ad6
@jmjatlanta
clarify comment
b078310
@oxarbitrage
Merge pull request #1395 from bitshares/release
8d09a46 
Merge release back to develop
@pmconrad
Merge pull request #1384 from bitshares/jmj_1366
2e15e77 
have verify_account_authority check passed-in keys
@oxarbitrage
bump fc and fix node
c293b40
@oxarbitrage
try to fix dockercloud
3fb6c44
@oxarbitrage
remove DGRAPHENE_DISABLE_UNITY_BUILD
3e1de10 
from cmake command in dockerfile as it will not fix the dockercloud issue.
@oxarbitrage
Merge pull request #1405 from oxarbitrage/fix_rand_bytes
2ed2bc9 
bump fc and fix node
@jmjatlanta
Initial HTLC commit
c6ca2c8
@jmjatlanta
Fix compile errors
bab9fb7
@jmjatlanta
Fix tests
81996c4
@jmjatlanta
added signature test
3afa87e
@jmjatlanta
Intermediate commit for adding htlc to wallet api
6e960ef
@jmjatlanta
Improvements to cli_wallet test
f470aa3
@jmjatlanta
Added update_htlc to wallet api
b5510ac
@jmjatlanta
Removed debugging code
40d22aa
@jmjatlanta
add htlc to switch-case
eb1225e
@jmjatlanta
Change method names to match spec
d367c2c
@jmjatlanta
Boost 1.58 compatibility
6ded688
@jmjatlanta
add get_typename for enum
9a502a3
jmjatlanta and others added 24 commits December 20, 2018 15:02
@jmjatlanta
added extend test + smaller misc
793220e
@jmjatlanta
handle fee multiplication overflow
57248da
@jmjatlanta
added messages to asserts
e8172e9
@pmconrad
Different approach - detect nested proposal_update with invalid id an…
9c7f693 
…d prevent execution before hf / forbid after hf
@jmjatlanta
virtual op for notifications
2f08968
@pmconrad
Catch nested delete as well
062613c
@pmconrad
Bump db version
46daa67
@pmconrad
Switched impossible authority to null account
36cb35c
@pmconrad
Bumped hf date by 24 hours
5cb908e
@pmconrad
Log as warning not info
b0ada12
@pmconrad
Added self-deletion test case
35bc344
@oxarbitrage
Merge pull request #1458 from oxarbitrage/issue1455
3c76228 
add option elasticsearch-start-es-after-block to es plugin
@pmconrad
Merge pull request #1480 from bitshares/issue_1479
3eb2cfa 
Fix for node crash
@pmconrad
Resolve conflicts release/develop
bc85e17
@pmconrad
Merge pull request #1486 from pmconrad/resolve_conflicts
205dc88 
Backmerge release -> develop
@jmjatlanta
More overflow protection + wording changes
22ea563
@jmjatlanta
fix bug in fee calculation
8e77fff
@pmconrad
Merge pull request #1370 from jmjatlanta/htlc2
1195aef 
Hashed Time-Locked Contracts
@pmconrad
Merge pull request #1487 from bitshares/develop
6809b8d 
Merge develop -> hardfork
@pmconrad
Fixed build error
19375f7
@pmconrad
Merge pull request #1488 from pmconrad/fix_hardfork_branch
a9606ef 
Fixed build error
@pmconrad
Merge remote-tracking branch 'origin/hardfork' into testnet_release
f4f0e22
@pmconrad
Set testnet hardfork date to 2018-12-21T20:00:00Z
c4c8e41
@pmconrad
Generalized testcase for testnet
c5fa14d
ryanRfox
ryanRfox approved these changes Dec 21, 2018
View reviewed changes
Copy link
Contributor

@ryanRfox ryanRfox left a comment

Choose a reason for hiding this comment

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

Travis is green. I trust docker cloud will as well, in due time. Approving.

@jmjatlanta jmjatlanta merged commit c39b0ab into testnet Dec 21, 2018
@oxarbitrage oxarbitrage mentioned this pull request Dec 26, 2018
Closed
@abitmore abitmore added this to In Development in Protocol Upgrade Release (3.0.0) via automation Jan 1, 2019
@oxarbitrage oxarbitrage moved this from In Development to Done in Protocol Upgrade Release (3.0.0) Jan 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanRfox ryanRfox ryanRfox approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Protocol Upgrade Release (3.0.0)
  
Done
Milestone
3.0.0 - Protocol Upgrade Release
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@pmconrad @ryanRfox @cogutvalera @jmjatlanta @abitmore @oxarbitrage @HarukaMa @nathanielhourt