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

1420 commits

Author SHA1 Message Date
Roman Olearski
04985c2624 improving cancel_all_bets operation 2017-07-18 19:17:13 +02:00
Roman Olearski
86b909da44 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-18 12:04:28 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Eric Frias
24c0089869 Fix link error in release builds 2017-07-17 18:59:35 -04:00
Roman Olearski
8397ce0c7a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge2 2017-07-17 23:33:48 +02:00
Daniel Larimer
1c97c13eed Replace flat_index with generic_index for bitasset_object 
- this enabled me to produce blocks and fixed corruption
 2017-07-17 23:24:09 +02:00
Dan Notestein
231eebd021 re-enable time library 2017-07-17 20:36:07 +00:00
Roman Olearski
be9138e227 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-17 22:18:38 +02:00
Roman Olearski
6fe57fbb74 added missing libraries/time 2017-07-17 22:16:23 +02:00
Dan Notestein
087d29b1d6 Disable building of missing time library 2017-07-17 19:56:37 +00:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +02:00
Roman Olearski
9196d79cb3 updated fc 2017-07-13 16:20:28 +02:00
Roman Olearski
d3482f3a08 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-13 16:07:30 +02:00
Roman Olearski
bb46f84666 Fixing double declared enumerated types with FC_REFLECT_TYPENAME FC_REFLECT_ENUM 
Adapting fc
 2017-07-12 12:28:59 +02:00
Eric Frias
790bfe3704 WIP Force all betting markets in a group to use the same asset_id for betting 2017-07-09 18:41:26 -04:00
Eric Frias
4e2c6c303a Add an operation to freeze/unfreeze a betting market group 2017-07-09 13:52:01 -04:00
Roman Olearski
5de1437d24 Merge branch 'betting-ro4' into betting-merge 2017-07-08 20:41:45 +02:00
Roman Olearski
c18094abd8 implementing rake fee in resolve_betting_market_group #1 
improving net profit calculation
 2017-07-08 18:30:23 +02:00
Eric Frias
a8a64e530b Add an informational betting_market_rules object, linked to betting market groups 2017-07-06 18:07:39 -04:00
Roman Olearski
32433ef29f Cherry-picked all divident commits from rps to betting resolving conflicts 2017-07-06 23:04:50 +02:00
Roman Olearski
3a8b8a3b5b Cherry-picked commit b9508c6. 
little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts
 2017-07-06 20:19:51 +02:00
Roman Olearski
59c64efb5a solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2017-07-06 20:15:50 +02:00
Roman Olearski
9bbf73a96a Cherry-picked commit 81c9e98. 
solution  ...issues/#7 Allow vesting core tokens to vote and receive dividends
 2017-07-06 20:14:54 +02:00
Roman Olearski
64d59602a8 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2017-07-06 20:05:24 +02:00
Eric Frias
bfcc23ac9d Cherry-picked commit 749ffb8. 
Don't make the core asset a bitasset
 2017-07-06 20:04:05 +02:00
Roman Olearski
85102da504 Cherry-picked commit 32b5343. 
Implementing propose_dividend_asset_update
 2017-07-06 19:58:10 +02:00
Roman Olearski
1386617465 Removing redundant line 2017-07-06 19:55:24 +02:00
Roman Olearski
dac9d8b61b Cherry-picked commit 26f4718. 
Creating default dividend asset
 2017-07-06 19:53:14 +02:00
Eric Frias
da5ef56a35 Cherry-picked commit 9089292. 
Prevent creation of accounts with the same name as dividend distribution accounts
 2017-07-06 19:44:35 +02:00
Eric Frias
90722fc0a4 Cherry-picke commit be6ad13. 
Code cleanups -- renaming variables, adding comments, fix one bug with override transfers and dividend assets
 2017-07-06 19:41:13 +02:00
Eric Frias
67d0898394 Fixes to paying out non-core assets using their fee pools 2017-07-06 19:39:04 +02:00
Eric Frias
f67dd3ea58 Compile fix 2017-07-06 19:24:14 +02:00
Eric Frias
5b437d7363 Cherry-picked commit b584ee1. 
Separate out unit tests for dividend-assets into their own test suite
 2017-07-06 19:22:33 +02:00
Eric Frias
60f7dd798f Keep pending dividend balance and distributed dividend balance objects around (with zero 
balance) after payouts, they will probably be needed again.
 2017-07-06 19:19:54 +02:00
Eric Frias
b8e1165290 Cherry-picked commit 7857ac4. 
Correctly generating virtual transactions for payouts
 2017-07-06 19:18:48 +02:00
Eric Frias
b9304caffa Cherry-picked commit abc7853. 
Initial work on dividend-paying assets.  Basic functionality works in simple cases.
 2017-07-06 19:14:02 +02:00
Eric Frias
cd2940c8a8 Remove competitor and market options objects from the blockchain 2017-07-06 11:57:45 -04:00
Roman Olearski
9b08b502be implementing betting_market_resolve_group_operation (3) #1 2017-07-06 12:56:32 +02:00
Eric Frias
9c9af76e12 Merge commit 'd8e7c0afee573d82647018a9efd530a03274a2aa' into betting 2017-06-21 16:58:50 -04:00
Eric Frias
3238ea735f Merge commit '568ceb189eca96e77e38c4059b83a504008d7e91' into betting 2017-06-21 16:43:00 -04:00
Eric Frias
636f28eac6 Merge commit 'aa6f3e9051787bfc1b4284f1684544cca9bfc9c9' into betting 2017-06-21 16:08:58 -04:00
Eric Frias
51fb13f8ba Merge commit '9466d2096a370e15aff70842b48feeca4a941e5c' into betting 2017-06-21 14:54:05 -04:00
Eric Frias
c64d83910c Merge commit '030577f6719a483314c6de7b7e42214399704adb' into betting 2017-06-21 14:15:57 -04:00
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
oxarbitrage
fab2794699 remove GRAPHENE_TEST_NETWORK_VERSION 
https://github.com/bitshares/bitshares-core/issues/307
 2017-06-11 11:47:11 -03: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
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
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
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
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
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
Eric Frias
03ec007cbb Quiet unhelpful log message "Not producing block because slot has not yet arrived" 2017-06-01 16:59:40 -04:00
Eric Frias
7a2eb92563 Automatically update wallet's cached copy of account objects 
whenever we are notified of a change on the blockchain
 2017-06-01 16:58:56 -04:00
Eric Frias
3cc82f0022 Change unique index to non-unique on vesting_balance_objects 2017-06-01 15:27:38 -04:00
SynaptiCAD User
e3b4c28f9b [DLN] revert some test code related to worker-pay that was inadvertently committed in a larger commit 2017-06-01 11:38:27 -04:00
Eric Frias
36bcada8fa Add 'generate_uia_sharedrop_genesis_plugin' used for generating the initial PPY 
balances based on the BitShares PEERPLAYS UIA.
Modify the other generate_genesis plugin to be able to run disabled.
 2017-06-01 11:05:43 -04:00
Eric Frias
ceac07ed42 Improve the generate_genesis plugin to: 
- exclude more exchanges
- exclude scam accounts
- credit users for any vesting balances they could have
   withdrawn at the time of the snapshot
- other minor cleanup
 2017-06-01 10:02:40 -04:00
Eric Frias
d05e5552af If there is an error parsing the genesis file in embed_genesis, print the exception before exiting. 2017-06-01 09:52:55 -04:00
root
615321cc18 added get_account_transaction_history_id and some fixes 2017-05-31 23:11:29 +00:00
Eric Frias
7f44b793c1 Fix a bug where initial_bts_accounts' balances weren't correctly accounted in total_supply 2017-05-31 18:06:11 -04:00
root
7c3904bfae adding get_operation_history_id 2017-05-31 20:45:25 +00:00
SynaptiCAD User
50f474a8bf [DLN] added code to test participation rate using ./tests/chain_test --run_test=operation_tests/witness_create, currently passes when test is set to use shuffle (which I've set as default) but fails for RNG 2017-05-30 18:49:15 -04:00
SynaptiCAD User
80e1be9ee0 [DLN] fixed missed_count for participation_rate calculateion on RNG, also hopefully fix missed block count for individual witnesses 2017-05-30 14:50:49 -04:00
Ryan R. Fox
0fc6079828 Update db_block.cpp 
Ensure the transaction signature is validated.
 2017-05-27 16:42:21 -04:00
Roman Olearski
50f07d47f5 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-05-27 20:13:17 +02:00
Roman Olearski
e6b58adbd1 fixed update witness operation - added new_initial_secret 2017-05-27 20:11:46 +02:00
Peter Conrad
53271599a7 Call use_next_id to keep object ids consistent 2017-05-27 09:42:50 +02:00