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

1053 commits

Author SHA1 Message Date
abitmore
aa844f56fa Fix seed node stuck issue #654 2016-05-16 22:03:08 +02:00
Nicolas Wack
ade25492e4 Added wackou's seed to default seed nodes 2016-05-06 19:57:01 +02:00
Fabian Schuh
f762036741 Merge pull request #14 from abitmore/patch-5 
Update abit's seed node
 2016-05-04 17:22:23 +02:00
iHashFury
d976400912 Update seed nodes 2016-05-04 16:21:41 +02:00
Michael Vandeberg
46d804e596 Bug Fix 2016-04-20 11:42:29 -04:00
abitmore
fcddafb82d Update abit's seed node 2016-04-18 09:54:48 +02:00
Michael Vandeberg
2fb3cb1078 Merge branch '592-get_ticker' into develop 2016-04-14 09:50:02 -04:00
BhuzOr
7f75be5ced Remove extra logging 2016-03-26 21:34:05 +01:00
theoreticalbts
3865dd1573 Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-25 20:15:32 -04:00
theoreticalbts
8835f4f6b2 Bump HARDFORK_599_TIME 2016-03-25 20:15:17 -04:00
theoreticalbts
55ec0607f8 Rebased "ext.hpp: Fix extension unpacking #599" to fix revert #637 2016-03-25 20:15:17 -04:00
theoreticalbts
c777a88649 Rebased "Fix iteration logic in _handle_message_calls_in_progress shutdown loop to handle concurrent modification #598" to fix revert #637 2016-03-25 20:15:17 -04:00
theoreticalbts
f049fce4e9 Ignore ctx.amount in get_allowed_withdraw() #625 2016-03-25 19:24:14 -04:00
theoreticalbts
395a68d61f Merge remote-tracking branch 'abitmore/patch-3' into develop #631 2016-03-25 19:13:14 -04:00
valzav
7ce088471a Revert "reverse prev. commit's fc upate" 
This reverts commit e68268cca7.
 2016-03-25 15:46:31 -04:00
valzav
e68268cca7 reverse prev. commit's fc upate 2016-03-25 15:13:05 -04:00
valzav
3a19b22bf6 Revert "bump gui version 2.0.160323-stealth-beta" 
This reverts commit 6456d7b55f.
 2016-03-25 15:11:56 -04:00
valzav
6456d7b55f bump gui version 2.0.160323-stealth-beta 2016-03-23 18:00:39 -04:00
theoreticalbts
eb7f2f70d8 Merge remote-tracking branch 'abitmore/patch-4' into develop #633 2016-03-22 14:12:54 -04:00
theoreticalbts
d7316829bb Bump fc 2016-03-22 14:11:49 -04:00
abitmore
20f75ebaf0 Fix cli_wallet out-of-source builds #633 2016-03-20 15:34:10 +01:00
abitmore
23b8843d2f check_authority(): fix #631 early end of recursion 2016-03-20 01:21:13 +01:00
Nathan Hourt
0525d16477 Fix install of chain/protocol headers 2016-03-17 19:14:55 -05:00
Michael Vandeberg
7caf77d6bf Bug Fix 2016-03-17 18:18:00 -04:00
Nathan Hourt
b2835bc02d Add headers to install targets 2016-03-17 17:16:13 -05:00
theoreticalbts
e955b06c42 Fix accidental reversion of #615 fix by b175cc7feb 2016-03-16 15:50:13 -04:00
theoreticalbts
755f9ecf38 Prepare for release 
- Bump GRAPHENE_CURRENT_DB_VERSION to force re-index
- Set hardfork date
 2016-03-16 01:10:14 -04:00
theoreticalbts
4dbfe53f1f Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-16 01:09:52 -04:00
theoreticalbts
006d548633 Merge branch '606-debug-node' into develop 
Conflicts:
	libraries/app/CMakeLists.txt
 2016-03-16 01:09:21 -04:00
theoreticalbts
7574aea75a Merge branches '477-history-account-history-indexing', '592-get_ticker', '599-fork-ext-unpack', '607-fork-disable-negative-worker-votes', '613-fork-deprecate-annual' and '615-fork-feed-expiration' into develop 2016-03-16 01:08:27 -04:00
theoreticalbts
b7b4d4fc5d Deprecate annual memberships #613 2016-03-16 01:08:18 -04:00
theoreticalbts
ee3f81fa31 Fix build broken by previous patch #592 2016-03-15 15:58:02 -04:00
theoreticalbts
c4fc67602a Implement hardfork for serialization fix #599 2016-03-15 15:34:57 -04:00
theoreticalbts
2a745f5882 db_update.cpp: Include hardfork.hpp, fix non-unity build broken by #615 fix 2016-03-15 15:21:34 -04:00
theoreticalbts
14f7b520bd Disable negative voting on workers #607 2016-03-15 15:18:11 -04:00
theoreticalbts
a7c88be7c7 debug_api: Add API call to stream JSON objects to file 2016-03-15 13:36:29 -04:00
theoreticalbts
da9ee0c499 db_block.cpp: Include smart_ref_impl 2016-03-15 13:36:29 -04:00
theoreticalbts
c37c2d4543 debug_api: Take application object, not database, as parameter #606 2016-03-15 13:36:29 -04:00
theoreticalbts
77ac461a8a Implement debug_node target #606 2016-03-15 13:36:29 -04:00
Michael Vandeberg
ae82e0a9a6 Tested and validated the new get_relative_account_history API call. 2016-03-15 12:25:01 -04:00
Michael Vandeberg
9485ebfd64 Fixed bug in get_account_history that prevented all operations from being returned when specific bounds were set. 2016-03-15 12:25:01 -04:00
Michael Vandeberg
c89d60ba92 First implementation of get_account_history api changes. 2016-03-15 12:25:01 -04:00
Daniel Larimer
7f4b40f57d Improve index on account operation history 
- operations are now indexed by account and sequence for effecient
traversal and query
 2016-03-15 12:24:58 -04:00
Eric Frias
36164263f4 Make websocket compression disabled by default, since it causes problems in Chrome. 
Change the command line option to --enable-permessage-deflate to override. #619
 2016-03-14 18:27:28 -04:00
abitmore
8c4ce14457 Update abit's seed node; Remove alt's seed node 2016-03-12 10:32:39 +01:00
Eric Frias
c39f97885d Add a command-line option to witness_node, --disable-permessage-deflate 
to prevent the websocket server from allowing compression on clients
that support it. #619
 2016-03-11 14:49:43 -05:00
Eric Frias
b175cc7feb Revert "Merge branch 'graphene_master' into bitshares" 
This reverts commit 2d0a7a2a4d, reversing
changes made to 6684fb75ac.
 2016-03-11 14:19:31 -05:00
Eric Frias
2d0a7a2a4d Merge branch 'graphene_master' into bitshares 2016-03-11 11:40:48 -05:00
Eric Frias
403d3001f6 Add a command-line option to witness_node, --disable-permessage-deflate 
to prevent the websocket server from allowing compression on clients
that support it. #619
 2016-03-10 17:33:14 -05:00
abitmore
f1cd2c2454 Add hard fork logic for #615 feed expiration check issue, fix #540 2016-03-10 09:17:05 +08:00
abitmore
3c6f4ce223 Fix price feed expiration check, fix #540 2016-03-09 14:37:33 +01:00
Fabian Schuh
57e1f5f181 Merge pull request #8 from abitmore/abitmore-patch-1-seednode 
Add harvey's seed node
 2016-03-08 08:54:23 +01:00
Fabian Schuh
6885f215a4 Merge pull request #7 from btscube/bitshares 
Update bitcube's seed node address
 2016-03-08 08:54:10 +01:00
theoreticalbts
241a7b0c3a account_evaluator.cpp: Refactor verify_account_votes() into own method #611 2016-03-07 13:49:23 -05:00
theoreticalbts
4138ec29cc account_evaluator.cpp: Remove redundant vote check #611 2016-03-07 13:40:47 -05:00
Eric Frias
24e132112d Update fc submodule 2016-03-03 17:31:05 -05:00
valzav
02d9836ef5 bump gui_version 2016-03-02 18:42:18 -05:00
theoreticalbts
529f0bef0e Bump fc 2016-02-26 15:14:20 -05:00
theoreticalbts
a83af9208e ext.hpp: Fix extension unpacking #599 2016-02-26 14:38:34 -05:00
Michael Vandeberg
4b346579a8 Fixed to follow QUOTE:BASE semantics. Cleanup and added in wallet calls that were missed in last merge. #592 2016-02-25 16:46:31 -05:00
theoreticalbts
e8aa505e82 Bump fc 2016-02-25 11:34:44 -05:00
theoreticalbts
2666350978 Fix iteration logic in _handle_message_calls_in_progress shutdown loop to handle concurrent modification #598 2016-02-25 11:31:08 -05:00
theoreticalbts
4096d34f88 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 8dd7dbc5b8 2016-02-23 13:40:26 -05:00
theoreticalbts
8dd7dbc5b8 Merge branch '592-get_ticker' into develop 2016-02-23 13:39:54 -05:00
theoreticalbts
52c0b31bcf Merge remote-tracking branch 'graphene/develop' into bitshares at commit e3478d2338 2016-02-23 12:10:40 -05:00
theoreticalbts
e3478d2338 Default initialize output in extension<T>'s from_variant and stream extraction #594 2016-02-23 12:00:40 -05:00
Daniel Larimer
0159297fa8 fix linking errors on OS X 2016-02-23 10:52:44 -05:00
theoreticalbts
76de1f8f0b Merge branch '593-bugfix-ext-json-serializer' into develop at commit 53699a9d27 2016-02-23 10:51:11 -05:00
Eric Frias
567a40170e Fix gcc/clang builds broken by d3c6cbf4de (breaking circular dependency) 2016-02-22 19:34:16 -05:00
Michael Vandeberg
a675023b9f #592 Fixes ticker except for percent change of market 2016-02-22 14:02:20 -05:00
theoreticalbts
53699a9d27 ext.hpp: Accept null and empty array for extensions #593 2016-02-22 12:00:51 -05:00
Daniel Larimer
2a5c6a3b40 fix linking errors on OS X 2016-02-19 15:12:53 -05:00
Eric Frias
d3c6cbf4de Compile fixes for win32 and out-of-source builds 2016-02-17 09:17:00 -05:00
theoreticalbts
e34b83c872 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 2f941c718f 2016-02-16 12:19:59 -05:00
theoreticalbts
f62e7311c2 Fix compile, add hardfork definition for #385 2016-02-16 12:08:36 -05:00
Daniel Larimer
2f941c718f Fix #586 - decoding memo for sender in CLI wallet 2016-02-16 12:07:24 -05:00
theoreticalbts
fac1284f77 Prepare for release 
- Bump FC
- Bump GRAPHENE_CURRENT_DB_VERSION to force re-index
- Set hardfork date
- Set GRAPHENE_FBA_STEALTH_DESIGNATED_ASSET
 2016-02-16 11:57:45 -05:00
theoreticalbts
4f9bf7cc21 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba 
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
 2016-02-16 11:32:14 -05:00
theoreticalbts
a1d0339ccf Merge remote-tracking branch 'graphene/549-fork-cancel-order' into bitshares 2016-02-16 11:29:32 -05:00
theoreticalbts
d6863a587c Merge branch graphene/develop into bitshares at commit '447018b319668deddf4d55baac168c1afc0a5e21' 
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/fc
 2016-02-16 11:16:36 -05:00
theoreticalbts
ce8a6ec518 Merge branch graphene/develop into bitshares at commit '399e0ed9f970908ea7c2c5c43a64a28303c143b8' 2016-02-16 11:05:33 -05:00
theoreticalbts
42140fccaa Merge branch graphene/develop into bitshares at commit 'f1b19b15' 2016-02-16 11:04:31 -05:00
theoreticalbts
50c06e7e64 Merge branch graphene/develop into bitshares at commit '1b8ce8a' 
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
 2016-02-16 11:02:11 -05:00
Fabian Schuh
b574e815a3 Remove unnecessariy warning 2016-02-16 10:01:13 +01:00
theoreticalbts
1153d77dba Update documentation of updating active key to match implementation #556 2016-02-15 22:48:47 -05:00
theoreticalbts
4a6de2fba7 Merge branches '492-bugfix-close-logic', '550-cleanup-remove-evaluation-observer' and '581-cleanup-object-operators' into develop 2016-02-15 16:01:27 -05:00
Daniel Larimer
c63b624caf fix build errors and warnings 
This commit was rebased by theoreticalbts and assigned issue #581
Conflict with 146c0c4d8e was resolved, minor improvements.
 2016-02-15 16:01:13 -05:00
theoreticalbts
fe0920ddc8 Merge branches '538-fork-buyback', '562-util-check-reflection' and '575-bugfix-settle-reflect' into develop 
Fix reflection bugs and enhance check_reflect.py
 2016-02-15 15:37:50 -05:00
theoreticalbts
92685af364 Merge branch '563-fork-stealth-fee-routing' into develop 
Includes dependency '572-fork-reenable-asset-perms'
 2016-02-15 15:37:22 -05:00
theoreticalbts
36a8c3d6f1 Unit test for STEALTH fee routing #563 2016-02-15 15:33:21 -05:00
theoreticalbts
5dd56bd824 Implement FBA fee routing for STEALTH #563 2016-02-15 15:33:21 -05:00
Daniel Larimer
89fbb11bb6 Fix #492 - database corruption when closing 
The database was attempting to pop blocks for which there was no undo
history. These changes make it impossible to pop blocks if there isn't
a fork db history.
 2016-02-15 15:18:44 -05:00
abitmore
3fa79740df Reflect ID of force_settlement_object, fix #575 2016-02-15 15:13:25 -05:00
theoreticalbts
1f910e765d Merge branch '572-fork-reenable-asset-perms' into 563-fork-stealth-fee-routing 2016-02-14 20:45:46 -05:00
theoreticalbts
4e9e3ae054 Allow asset to update permission flags when no supply exists #572 2016-02-14 20:39:33 -05:00
theoreticalbts
b1f8c8f291 buyback_object.hpp: Don't FC_REFLECT buyback_object, FC_REFLECT_DERIVED it instead #538 #575 2016-02-14 17:26:35 -05:00
theoreticalbts
3c6cd2c8a7 Merge branch '564-transfer_from_blind-save-conf' into develop 2016-02-12 00:11:59 -05:00
theoreticalbts
b93540cb5d Merge branch '553-cleanup-remove-type-serializer' into develop 2016-02-12 00:11:43 -05:00
theoreticalbts
ead3f951a2 Remove type_serializer, re-implement minimal functionality needed by cli_wallet #553 2016-02-12 00:10:52 -05:00
theoreticalbts
e46af9f372 Merge branch '538-fork-buyback' into develop 
Includes dependencies '555-fork-defer-s4n-cull', '559-test-fix-zero-block-wait' and '566-cleanup-wl-flag-check'
 2016-02-11 13:03:19 -05:00