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

832 commits

Author SHA1 Message Date
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
Daniel Larimer
1c9d5c602c update signature of transfer_to_blind 2015-10-20 13:41:14 -04:00
theoreticalbts
8488731e37 Merge branch 'master' into bitshares 2015-10-20 13:27:57 -04:00
theoreticalbts
4c09d6b8ed cli_wallet: Implement worker creation and voting 2015-10-20 13:26:25 -04:00
theoreticalbts
5cd73f5683 account_object.cpp: Get rid of no-ops 2015-10-20 12:36:47 -04:00
theoreticalbts
0e41933003 asset_evaluator.cpp: Implement TODO, move feed validation checks from evaluate() to validate() 2015-10-20 12:36:47 -04:00
theoreticalbts
704f943181 address.cpp: Don't special-case BTS prefix 2015-10-20 12:36:47 -04:00
Daniel Larimer
6b469528a1 remove all hardfork checks leftover from testnet 2015-10-20 12:36:47 -04:00
Daniel Larimer
29aec3c28c remove print spam 2015-10-19 16:48:30 -04:00
Daniel Larimer
af589b2287 cleanly handle db upgrade 2015-10-19 16:48:14 -04:00
Daniel Larimer
fc48ecbfc1 HARDFORK - Enforce asset domains 2015-10-19 16:46:26 -04:00
Daniel Larimer
487046e375 Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-19 16:46:05 -04:00
theoreticalbts
66c18c6932 Merge master into bitshares 2015-10-15 13:59:37 -04:00
theoreticalbts
9870b5db0a reflect_util.hpp: Fix reflection, make propose_fee_change work as intended 2015-10-15 13:52:50 -04:00
Daniel Larimer
546755484a Fix bug where updated DB version causes crash on restart 2015-10-15 13:52:29 -04:00
Daniel Larimer
6b1b794ff4 prevent excessive saving of wallet backups 2015-10-15 13:52:28 -04:00
Daniel Larimer
ab0d789d72 Fix bug where updated DB version causes crash on restart 2015-10-15 12:07:44 -04:00
Daniel Larimer
c528ea1ff3 update DB VERSION to force replay 2015-10-15 11:40:48 -04:00
Daniel Larimer
aa9ca16cb3 HARDFORK - Change initial permissions for assets created in genesis 2015-10-15 11:08:01 -04:00
Daniel Larimer
e85949584b Merge branch 'master' into bitshares 2015-10-15 10:27:04 -04:00
Daniel Larimer
e5010aaa5a improve error messages 2015-10-15 10:26:53 -04:00
Daniel Larimer
d083c5c9de Merge branch 'master' into bitshares 
Accepted changes from master
 2015-10-14 16:22:53 -04:00
Daniel Larimer
f85dec1c23 increasing the maximum undo history 2015-10-14 16:20:29 -04:00
Daniel Larimer
ae4790bcb8 Merge branch 'master' of https://github.com/bitshares/bitshares-2 2015-10-14 16:19:21 -04:00
Daniel Larimer
15e4464300 Merge branch 'master' into bitshares 2015-10-14 14:50:38 -04:00
theoreticalbts
fc95e83732 Merge remote-tracking branch 'graphene/master' into master 2015-10-14 14:41:59 -04:00
Daniel Larimer
39fb95b66c remove/fix address prefix checking 2015-10-14 14:33:48 -04:00
Daniel Larimer
6a117572fd prevent excessive saving of wallet backups 2015-10-13 18:19:07 -04:00
Daniel Larimer
29cc90ba99 Fix build 2015-10-13 13:32:58 -04:00
Eric Frias
21caba4cfa remove stray semicolon that confuses doxygen 2015-10-13 10:44:18 -04:00
Daniel Larimer
5dbe57c3ff Fix build 2015-10-13 10:34:48 -04:00
theoreticalbts
e410df78c0 Initialize hash when using egenesis 2015-10-13 10:31:49 -04:00
theoreticalbts
3706c88a0b Initialize hash when using egenesis 2015-10-13 10:30:51 -04:00
Daniel Larimer
098f2cbe2d remove all hardfork checks leftover from testnet 2015-10-13 09:29:48 -04:00
Eric Frias
03306860d2 win32 compile fix (#warning) 2015-10-13 09:13:16 -04:00
Nicolas Wack
7cb4140b97 Added network get_info api call 2015-10-12 19:24:04 -04:00
theoreticalbts
6646957ce2 db_init.cpp: Make genesis BitAssets require 7 price feeds 2015-10-12 19:23:44 -04:00
Daniel Larimer
b325805878 fix recursion 2015-10-12 18:58:41 -04:00
Nicolas Wack
0892491096 Added network get_info api call 2015-10-12 17:02:47 -04:00
theoreticalbts
9d19358a0c db_init.cpp: Make genesis BitAssets require 7 price feeds 2015-10-12 17:01:16 -04:00
Daniel Larimer
283de52f38 don't connect to all seeds 2015-10-12 15:16:29 -04:00
Daniel Larimer
63bd27e7d2 adding initial seed nodes 2015-10-12 15:15:46 -04:00
Daniel Larimer
52d88c57c9 prevent assets with BIT prefix 2015-10-12 14:17:18 -04:00
Daniel Larimer
91c8e709fe change CORE to BTS 2015-10-12 14:04:56 -04:00
theoreticalbts
d0609e8e74 Update copyright notice for BitShares 2015-10-12 13:48:40 -04:00
theoreticalbts
60f0812de2 Update copyright notice 2015-10-12 13:32:47 -04:00
theoreticalbts
9ccbc55ba6 Implement chain_id #374 2015-10-12 13:32:47 -04:00
Daniel Larimer
a61c23fa6a reduce trx spam messages 2015-10-12 12:06:26 -04:00
theoreticalbts
b6be698c34 fc: Fix #367 2015-10-12 10:10:23 -04:00
Eric Frias
9c650bddb0 Make conversions from boost's uint128_t to builtin int64_t explicit, without these 
the compiler prefers to convert through operator bool yielding either 1 or 0.
 2015-10-10 17:13:56 -04:00
theoreticalbts
837e4f254e wallet.cpp: More detailed logging of exception when broadcasting 2015-10-09 17:22:56 -04:00
Daniel Larimer
55dd3cc26a update fc 2015-10-09 17:09:30 -04:00
Daniel Larimer
31502d1959 Merge branch 'master' of github.com:cryptonomex/graphene 2015-10-09 16:31:44 -04:00
Daniel Larimer
f7c91be622 fix market history 2015-10-09 16:31:40 -04:00
theoreticalbts
434efcaa47 asset_evaluator.cpp: Fix compiler warning 2015-10-09 15:38:34 -04:00
theoreticalbts
a6d6b7316a wallet.cpp: Keep going when we fail to import a key 2015-10-09 15:38:34 -04:00
theoreticalbts
e731941cf0 wallet.cpp: Allow specifying wildcard in keys when running import_balance 
Also, don't put private keys in error messages.
 2015-10-09 15:38:12 -04:00
Daniel Larimer
b3e9874ece Merge branch 'master' of github.com:cryptonomex/graphene 2015-10-09 15:05:23 -04:00