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

789 commits

Author SHA1 Message Date
theoreticalbts
2f83c4e427 Merge remote-tracking branch 'graphene/fork-367' into bitshares 2015-11-02 10:23:35 -05:00
theoreticalbts
75d1bb39a3 Re-bump fc after inadvertently reverted by #367 2015-11-02 10:22:46 -05:00
theoreticalbts
2d6dfd04e4 config.hpp: Bump db version to force replay 2015-11-02 10:11:42 -05:00
theoreticalbts
e1ba96b524 [BTS2] asset_evaluator.cpp: Don't check asset names registered before implementation of hardfork #385 2015-11-02 10:09:24 -05:00
theoreticalbts
545fbfe63c Merge branch 'newmaster' into newbitshares 
Conflicts:
	libraries/chain/asset_evaluator.cpp
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/chain/market_evaluator.cpp
 2015-11-02 10:06:13 -05:00
theoreticalbts
65003ba06c Merge branch 'fork-413' into develop 
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
 2015-10-31 17:13:15 -04:00
theoreticalbts
3dc58e435f Merge branches 'fork-409' and 'fork-419' into develop 2015-10-31 17:12:16 -04:00
theoreticalbts
4fa7443922 Merge branches 'history-324', 'bugfix-390', 'wallet-398', 'opt-410', 'script-411', 'bugfix-412', 'bugfix-414', 'bugfix-423' and 'feature-427' into develop 2015-10-31 17:11:41 -04:00
theoreticalbts
55fef1b161 db_update.cpp: Don't clear expired feeds for non-market-issued assets #410 2015-10-31 16:14:25 -04:00
theoreticalbts
a126520fa3 HARDFORK Allow creation of sub-assets #409 2015-10-31 15:46:53 -04:00
theoreticalbts
dfe228fc85 global_property_object.hpp: Reflect last_budget_time #414 2015-10-31 14:37:56 -04:00
theoreticalbts
966b3edf0c Add hardfork logic #413 2015-10-30 18:07:19 -04:00
Daniel Larimer
5d6091e581 HARDFORK - adding operation to claim asset fees #413 2015-10-30 18:07:19 -04:00
theoreticalbts
032eeda416 generic_index.hpp: Change sparse_index to use ordered_unique 2015-10-30 16:02:36 -04:00
theoreticalbts
4f2b8bd6f6 HARDFORK Move fee blacklist check to evaluator #419 2015-10-30 14:35:50 -04:00
theoreticalbts
d821d4a993 Get rid of enforce_white_list() #416 2015-10-30 14:35:50 -04:00
theoreticalbts
db045f453c Implement hardfork logic for #415 2015-10-30 13:12:37 -04:00
Daniel Larimer
20c8ca8fa1 Fix #398 - reserve_asset was calling fund_fee_pool in wallet 2015-10-30 11:18:52 -04:00
Daniel Larimer
d1f9216f85 HARDFORK enable whitelisting of everyone, but blacklisting of some 2015-10-30 11:17:31 -04:00
theoreticalbts
57015b43fa Add missing FC_REFLECT_TYPENAME #414 2015-10-30 10:47:35 -04:00
Daniel Larimer
0f25cd2a0d Fix Issue #324 - getKeyRefs now returns for memo and active keys 2015-10-30 10:43:53 -04:00
theoreticalbts
fda84dfe8b witness: Submit wakeup time for fc::schedule() on local system clock, not NTP 2015-10-30 10:21:27 -04:00
theoreticalbts
5e91e095c0 vesting_balance_object.cpp: Handle vesting_seconds == 0 case #390 2015-10-30 10:09:50 -04:00
theoreticalbts
a1b00b2749 db_management.cpp: Only pop to last irreversible block, fix #407 2015-10-30 10:04:42 -04:00
Daniel Larimer
0c3a7c4bc4 Fix Issue #324 - getKeyRefs now returns for memo and active keys 2015-10-27 13:54:15 -04:00
Daniel Larimer
3273d1f7b6 fetching up to 200 items 2015-10-26 09:52:40 -04:00
Daniel Larimer
a4d4ab0108 Merge branch 'master' into bitshares 2015-10-26 09:45:35 -04:00
Daniel Larimer
2adbe53714 Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-26 09:45:13 -04:00
Daniel Larimer
867e87196b update fill order history 2015-10-26 09:44:49 -04:00
Daniel Larimer
05f05c18ba Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares 2015-10-23 18:14:40 -04:00
Daniel Larimer
6336a2bc1a fix conflicts 2015-10-23 18:14:35 -04:00
Daniel Larimer
7378fb80bc adding API call for market fill history 2015-10-23 18:13:33 -04:00
theoreticalbts
7aa33928f8 Merge branch 'master' into bitshares 2015-10-23 17:39:25 -04:00
theoreticalbts
4fa0f182ec cli_wallet: Print operation results 2015-10-23 15:00:31 -04:00
theoreticalbts
0d55541682 object_id.hpp: Implement std::string() conversion for object_id_type 2015-10-23 15:00:31 -04:00
theoreticalbts
57969d5018 cli_wallet: Show txid's for transactions in blocks 2015-10-23 15:00:31 -04:00
Daniel Larimer
0ef59f6165 fix build 2015-10-23 13:34:08 -04:00
Daniel Larimer
32d6b22b7b Merge branch 'master' into bitshares 
Added a hardfork that is scheduled to happen years in the future after
this change has been reviewed and approved.
 2015-10-23 13:30:42 -04:00
Daniel Larimer
6e554260e5 Issue #393 - HARDFORK to give cash back upon canceling an order 2015-10-23 13:26:18 -04:00
Daniel Larimer
a1640abf81 Merge branch 'master' into bitshares 2015-10-22 10:51:00 -04:00
Daniel Larimer
44b2198f97 normalize blinded_balance reflection 2015-10-22 10:50:51 -04:00
Daniel Larimer
eb105f1065 Merge branch 'master' into bitshares 2015-10-22 10:28:19 -04:00
Daniel Larimer
9b0abe2790 adding api to get recent transactions by id 2015-10-22 10:27:49 -04:00
Daniel Larimer
9afe3420d8 Merge branch 'master' into bitshares 2015-10-22 10:08:16 -04:00
Daniel Larimer
1ff46f0b29 adding api to get trx id from trx 2015-10-22 10:08:07 -04:00
Daniel Larimer
63c286a769 adding transfer2 API that also returns the transaction id 2015-10-22 10:05:34 -04:00
Daniel Larimer
6418f819fd Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-22 09:59:03 -04:00
Daniel Larimer
ddd58e946a Fix #385 - HARDFORK to expand valid names 2015-10-21 09:29:13 -04:00
Daniel Larimer
3bc8832dde Merge branch 'master' into bitshares 2015-10-21 08:54:53 -04:00
Daniel Larimer
4e443bded5 Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares 2015-10-20 13:41:16 -04:00