Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
1860 commits 435 branches 47 tags 121 MiB
Commit graph

1860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Frias
b200fb893b Merge commit '0ecdc90d4df2ebd80a6d4cfa4388f4b8a608c9c1' into betting 2017-06-21 09:35:32 -04:00
Eric Frias
fe82e85d8d Merge commit '9bbbefd3913ccfe01b8e8ef2007ca3eb74ab9d81' into betting 2017-06-21 09:33:53 -04:00
Eric Frias
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
5a99abc3de Merge commit '0053613b38e81719c198f36c748e181cc44635b2' into betting 2017-06-20 18:57:23 -04:00
Eric Frias
627dba3a46 Merge commit '0ad83697f08a11431eece565f0386a849bed25c9' into betting 2017-06-20 18:36:19 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Eric Frias
7195e22216 Merge commit '36164263f4cceda85ec92568d48016a48f7ad9c9' into betting 2017-06-20 17:28:41 -04:00
Eric Frias
8549cef70c Merge commit '92cfb96c618e1c051dd7a7224e5392d56c496c06' into betting 2017-06-20 16:39:27 -04:00
Vikram Rajkumar
d8e7c0afee Merge pull request #311 from elmato/push-transaction-sync 
Implement network_broadcast_api::broadcast_transaction_synchronous
 2017-06-14 18:52:14 -05:00
Vikram Rajkumar
38ac7cb457 Cleanup #312 2017-06-14 18:06:39 -05:00
root
b307557182 add simple pagination to get_asset_holders 2017-06-14 17:47:18 +00:00
Matias Romeo
ea8f8964eb Implement network_broadcast_api::broadcast_transaction_synchronous (ported from steem) 2017-06-12 18:22:34 -03:00
Vikram Rajkumar
bd9b3248ea Merge pull request #310 from oxarbitrage/patch-14 
remove GRAPHENE_TEST_NETWORK_VERSION
 2017-06-11 15:21:02 -05:00
oxarbitrage
fab2794699 remove GRAPHENE_TEST_NETWORK_VERSION 
https://github.com/bitshares/bitshares-core/issues/307
 2017-06-11 11:47:11 -03:00
Vikram Rajkumar
f836339a19 Merge pull request #309 from oxarbitrage/patch-13 
add commented GRAPHENE_TEST_NETWORK to config
 2017-06-10 16:38:17 -05:00
oxarbitrage
1939c7bff6 remove extra space 2017-06-10 17:39:48 -03:00
oxarbitrage
2b1f1b7f74 add commented GRAPHENE_TEST_NETWORK to config 
for issue https://github.com/bitshares/bitshares-core/issues/307
 2017-06-10 17:38:46 -03:00
Abit
919787d281 Merge pull request #306 from oxarbitrage/patch-12 
get_full_accounts change, allow 100 subscribed accounts instead of 99. issue #295
 2017-06-10 17:38:48 +02:00
Roman Olearski
eb4c8f75d1 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 
Conflicts:
	programs/witness_node/main.cpp
 2017-06-09 12:17:26 +02:00
Abit
d110a95ba7 Merge pull request #304 from oxarbitrage/issue302 
fix get_order_book
 2017-06-09 03:33:07 +02:00
oxarbitrage
773a2d0caf get_full_accounts change 
allow 100 subscribed accounts instead of 99.
 2017-06-08 18:43:36 -03:00
root
9200cc83c3 fix get_order_book 2017-06-08 12:27:51 +00:00
Eric Frias
bd70c0dc67 Restore sanity-check assert 2017-06-06 10:22:46 -04:00
Eric Frias
50f224137b Add peerplays-testnet account in genesis file. 
change default core asset and prefix to PPY.
update test genesis to match new prefix.
 2017-06-06 09:01:27 -04:00
Eric Frias
e53e9f8623 Update max core supply in genesis, properly track total supply for vesting balances in bts accounts 2017-06-05 19:52:51 -04:00
Abit
feabafd45f Merge pull request #297 from abitmore/292-acc-his-prune 
Account history: option to prune old data (#292)
 2017-06-06 00:42:54 +02:00
Eric Frias
c0813aadfd Default to shuffled witness scheduling 2017-06-05 17:34:18 -04:00
Eric Frias
f716a6ab49 Fix satoshi-vs-nominal error in initial vesting balances 2017-06-05 17:19:48 -04:00
Eric Frias
5004f9202e Update BTS sharedrop balances to account for claimable vesting balances 
as of the sharedrop date
 2017-06-05 14:31:26 -04:00
Roman Olearski
9c1e522070 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-06-05 19:21:58 +02:00
Roman Olearski
a8f51e2a98 updated genesis/genesis.json for peerplays 2017-06-05 19:20:54 +02:00
Eric Frias
38b2767567 Support specifying cliff_seconds in initial_vesting_balances 2017-06-05 12:31:14 -04:00
Vikram Rajkumar
848eb65ab1 Update submodules 2017-06-04 18:28:04 -05:00
Vikram Rajkumar
a62acbce4c Add OpenSSL compatibility note to README 2017-06-04 18:26:47 -05:00
Vikram Rajkumar
a4d2fd6427 Merge pull request #299 from abitmore/fix-win-build 
Fix Windows build.
 2017-06-04 18:17:42 -05:00
Abit
df787c9062 Fix latency check error 2017-06-05 00:32:44 +02:00
Eric Frias
ea7e8e6f31 Support genesis vesting balances tied to account objects 2017-06-04 18:26:50 -04:00
Abit
1ce4d36532 Check block latency after logging. 2017-06-04 01:47:02 +02:00
Vikram Rajkumar
087d58f5f4 Update docs submodule 2017-06-03 16:25:22 -05:00
Vikram Rajkumar
f9f60770f9 Revert "Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho" 
This reverts commit 628652f3eb, reversing
changes made to 568ceb189e.
 2017-06-03 16:05:17 -05:00
Vikram Rajkumar
a263279b76 Revert "Fix warnings; #296" 
This reverts commit 40c7a7ffa3.
 2017-06-03 16:03:52 -05:00
abitmore
06b18c4011 Fix Windows build. 2017-06-03 01:21:17 +00:00
Vikram Rajkumar
40c7a7ffa3 Fix warnings; #296 2017-06-02 19:38:30 -05:00
Vikram Rajkumar
628652f3eb Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho 2017-06-02 19:31:33 -05:00
Eric Frias
f6bf447820 Add functionality to genesis_update.cpp that replaces all keys in a genesis file with 
newly-generated dev keys for testing.
 2017-06-02 19:12:12 -04:00
abitmore
504aa5dccd Account history: option to prune old data (#292) 2017-06-02 16:16:34 +00:00
Vikram Rajkumar
568ceb189e Update submodules 2017-06-01 16:59:22 -05:00
Eric Frias
6234716eea Add a command 'update_witness_votes' to the CLI wallet that 
allows you to change multiple witness votes at one time
(just a convenience, it doesn't do anything vote_for_witness didn't
already let you do)
 2017-06-01 17:46:32 -04:00
Eric Frias
cc77db0410 comment out excessive debug logging 2017-06-01 17:05:35 -04:00