theoreticalbts
|
d0f119b215
|
Merge branch '489-bugfix-reflect-whitelist' into develop
Conflicts:
libraries/chain/include/graphene/chain/account_object.hpp
|
2016-02-09 10:58:59 -05:00 |
|
theoreticalbts
|
078e63a79f
|
Merge many bugfix branches into develop
Merged:
492-bugfix-open-fail #492
523-bugfix-multiple-blind-xfer #523
537-cleanup-remove-operation_get_required_authorities #537
540-cleanup-settle-volume-spam #540
542-bugfix-cancel-fee #542
557-bugfix-pts-address #557
559-test-fix-zero-block-wait #559
561-bugfix-serializer-build-broken #561
562-bugfix-unreflected-fields #562
|
2016-02-09 10:57:21 -05:00 |
|
Daniel Larimer
|
ababf24e69
|
Fix #523 relevant to #452
|
2016-02-09 10:01:50 -05:00 |
|
James Calfee
|
f1be857441
|
Updated fc submodule version (fixes compile) #500
|
2016-02-09 07:24:24 -06:00 |
|
theoreticalbts
|
39d0946b50
|
Remove evaluation_observer #550
|
2016-02-09 04:44:11 -05:00 |
|
theoreticalbts
|
e8aeacc293
|
operations.cpp: Remove unused ancient implementation of operation_get_required_authorities #537
|
2016-02-09 04:36:41 -05:00 |
|
theoreticalbts
|
3a968332e8
|
Remove active_witnesses from global_property_object #562
|
2016-02-09 04:09:26 -05:00 |
|
theoreticalbts
|
19cf1b135b
|
Fix withdraw_permission_object.hpp reflection #562
|
2016-02-09 04:01:06 -05:00 |
|
Peter Conrad
|
8d2fa3863e
|
Fix for #557: check BTC/PTS addresses on balance import including compressed/uncompressed versions
|
2016-02-08 16:23:14 -05:00 |
|
abitmore
|
ba2f388f22
|
Fix cancel_order: set fee after adding operation
|
2016-02-08 16:17:25 -05:00 |
|
abitmore
|
a5620c3064
|
Expose whitelisted_accounts, fix #489
|
2016-02-08 16:14:25 -05:00 |
|
theoreticalbts
|
ad339d2729
|
Defer something-for-nothing culling for taker orders until the order is unmatched #555
|
2016-02-08 10:05:43 -05:00 |
|
theoreticalbts
|
b67d223d17
|
Merge branch '549-fork-cancel-order' into 452-fork-stealth-fba
|
2016-02-05 12:17:46 -05:00 |
|
Daniel Larimer
|
062ae3fc67
|
validate fixes
|
2016-02-02 16:39:05 -05:00 |
|
theoreticalbts
|
59503acde9
|
Cap auto-cancel fees at deferred_fee #549
|
2016-02-02 14:17:57 -05:00 |
|
James Calfee
|
da598c82aa
|
Revert "Add crypto API call to derive a public key child. #536"
This reverts commit 84fd629d36.
|
2016-02-02 13:11:54 -06:00 |
|
Daniel Larimer
|
3646754fe5
|
HARDFORK - auto canceled orders still pay fee
|
2016-02-02 11:04:35 -05:00 |
|
Daniel Larimer
|
45e717c181
|
HARDFORK: fix for hung cancel order
|
2016-02-02 11:04:22 -05:00 |
|
James Calfee
|
84fd629d36
|
Add crypto API call to derive a public key child. #536
|
2016-01-29 15:12:55 -06:00 |
|
Daniel Larimer
|
c1c37df31a
|
HARDFORK - auto canceled orders still pay fee
|
2016-01-28 20:11:46 -05:00 |
|
Daniel Larimer
|
405f81eaf8
|
HARDFORK: fix for hung cancel order
|
2016-01-28 20:02:37 -05:00 |
|
Daniel Larimer
|
d9db27d416
|
extra debug info
|
2016-01-28 19:46:40 -05:00 |
|
theoreticalbts
|
10a4dce501
|
db_update.cpp: Don't update bitasset_data_object force_settled_volume every block unless needed #540
|
2016-01-28 18:16:19 -05:00 |
|
theoreticalbts
|
a1e8fc0741
|
Implement top_n special authority #516
|
2016-01-27 10:30:32 -05:00 |
|
theoreticalbts
|
ef68375fab
|
Fix indentation #533
|
2016-01-25 11:33:05 -05:00 |
|
theoreticalbts
|
a1ee326b55
|
Improve vote counting implementation #533
|
2016-01-25 11:33:04 -05:00 |
|
theoreticalbts
|
447018b319
|
Tell cmake hardfork.hpp is generated, build hardfork.hpp in binary directory #511
|
2016-01-22 11:37:28 -05:00 |
|
theoreticalbts
|
d8cd48d6ad
|
Implement by_asset_balance index #529
|
2016-01-21 11:13:42 -05:00 |
|
theoreticalbts
|
aa6d13b057
|
Remove by_account index from account_object #529
|
2016-01-21 10:39:13 -05:00 |
|
theoreticalbts
|
600a06f57e
|
db_balance.cpp: Rename by_balance -> by_account_asset #529
|
2016-01-21 10:23:07 -05:00 |
|
abitmore
|
d6db289717
|
Add alt's seed node
|
2016-01-13 10:30:33 +01:00 |
|
abitmore
|
65f7c1ca62
|
Remove the extra comma from seed node list
|
2016-01-12 23:04:27 +01:00 |
|
abitmore
|
16b34f66be
|
Add harvey's seed node
|
2016-01-12 22:48:21 +01:00 |
|
theoreticalbts
|
3edaf15652
|
Generate hardfork.hpp from hardfork.d directory #511
|
2016-01-11 10:09:03 -05:00 |
|
theoreticalbts
|
b5480db341
|
api.cpp: Add break to every case in get_relevant_accounts #513
|
2016-01-08 14:35:07 -05:00 |
|
theoreticalbts
|
d6878852f0
|
confidential_object.hpp: Move confidential objects into own header #466
|
2016-01-08 13:06:14 -05:00 |
|
theoreticalbts
|
e9eb050c1e
|
worker_object.hpp: Move worker objects into own header #466
|
2016-01-08 11:42:35 -05:00 |
|
theoreticalbts
|
07fb90a7ec
|
market_object.hpp: Move market objects into own header #466
|
2016-01-08 11:36:32 -05:00 |
|
theoreticalbts
|
61687790e3
|
wallet: Remove libraries/wallet/cache.cpp #510
|
2016-01-08 11:29:39 -05:00 |
|
theoreticalbts
|
2da6840405
|
Optionally disable database unity build #509
|
2016-01-08 11:29:39 -05:00 |
|
theoreticalbts
|
8c8157e706
|
Bump fc
|
2016-01-08 11:22:14 -05:00 |
|
Michael Vandeberg
|
fd09669be3
|
Merge branch '500-crypto-api' into develop
Closes cryptonomex/graphene#500
|
2016-01-07 17:24:13 -05:00 |
|
Michael Vandeberg
|
8df58439b1
|
Opens up cryptographic methods in their own API with serialized wrappers for public and private keys.
Tests for serialization of the wrappers added in serialization_tests.
|
2016-01-07 17:17:27 -05:00 |
|
theoreticalbts
|
a548217e5c
|
db_update.cpp: Log a lot of information if clear_expired_orders() is iterating too much, maybe useful to diagnose #485
|
2016-01-07 16:23:50 -05:00 |
|
theoreticalbts
|
c1612a434e
|
db_block.cpp: Disable skip_validate #505
|
2016-01-07 16:04:52 -05:00 |
|
theoreticalbts
|
399e0ed9f9
|
db_update.cpp: Take mia as reference, not copy, in clear_expired_orders(), maybe fix #485
|
2016-01-07 16:04:16 -05:00 |
|
theoreticalbts
|
3c7a4525d7
|
Merge branch '503-api-new-market-api' into develop
|
2016-01-07 14:23:24 -05:00 |
|
Michael Vandeberg
|
f7bfcea355
|
Implement new market API #503
|
2016-01-07 14:12:03 -05:00 |
|
theoreticalbts
|
f1b19b1562
|
Merge branch '496-cleanup-license-header' into develop
|
2016-01-07 13:38:52 -05:00 |
|
Michael Vandeberg
|
acfbad2cd4
|
Adds a cryptography API.
|
2016-01-07 12:57:29 -05:00 |
|
Fabian Schuh
|
5111084730
|
[License] Modify cpp and hpp headers to MIT #496
|
2016-01-07 11:44:52 -05:00 |
|
theoreticalbts
|
1b8ce8a537
|
Merge branch '498-cleanup-move-options-validate' into develop
|
2016-01-07 11:42:41 -05:00 |
|
theoreticalbts
|
c56cbfe2a7
|
account.cpp: Move account_options::validate() implementation from account_object.cpp #498
|
2016-01-07 11:42:16 -05:00 |
|
theoreticalbts
|
0ccc6722eb
|
Merge branch '483-history-fix-op-numbers' into develop
|
2016-01-07 11:31:02 -05:00 |
|
theoreticalbts
|
3680b67271
|
Merge branch '481-history-failed-proposal-ops' into develop
|
2016-01-07 11:30:50 -05:00 |
|
theoreticalbts
|
84fab61589
|
Merge branch '480-fork-mia-core-exchange' into develop
|
2016-01-07 11:30:04 -05:00 |
|
Daniel Larimer
|
dd5b7708b4
|
potential fix for hung chain
|
2016-01-07 11:27:50 -05:00 |
|
root
|
33728e3e6a
|
Update bitcube's seed node address
|
2016-01-05 16:18:17 +08:00 |
|
theoreticalbts
|
3af94b7878
|
application.cpp: Handle exception in open() by re-indexing #492
|
2016-01-04 10:38:59 -05:00 |
|
Daniel Larimer
|
7c1c7e8504
|
removing log
|
2016-01-03 22:50:07 -05:00 |
|
Daniel Larimer
|
16b59e0b42
|
adding seed node
|
2016-01-03 22:10:56 -05:00 |
|
Daniel Larimer
|
dca5c95ab5
|
potential fix for hung chain
|
2016-01-03 20:40:21 -05:00 |
|
theoreticalbts
|
dcc0b556ba
|
config.hpp: Bump DB version
|
2015-12-16 17:55:01 -05:00 |
|
theoreticalbts
|
e4787e431a
|
Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16b
|
2015-12-16 17:15:00 -05:00 |
|
theoreticalbts
|
d60c8a255e
|
Fix optional dereferences
|
2015-12-16 17:14:41 -05:00 |
|
theoreticalbts
|
802ca9e613
|
config.hpp: Bump DB version
|
2015-12-16 11:52:03 -05:00 |
|
theoreticalbts
|
eaba77b2d6
|
Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16
|
2015-12-16 11:46:38 -05:00 |
|
theoreticalbts
|
7cae3501f8
|
Fix operation history numbering #483
|
2015-12-16 11:43:45 -05:00 |
|
theoreticalbts
|
0f67fb655b
|
config.hpp: Bump DB version
|
2015-12-15 14:43:38 -05:00 |
|
theoreticalbts
|
e2c7a946cb
|
Merge branch 'graphene-local/481-history-failed-proposal-ops' into bitshares
|
2015-12-15 14:42:33 -05:00 |
|
theoreticalbts
|
4d5515702c
|
Merge branch 'graphene/480-fork-mia-core-exchange' into bitshares
|
2015-12-15 14:42:02 -05:00 |
|
theoreticalbts
|
f42bbcd087
|
Fix non-BTS MIA core_exchange_rate check #480
|
2015-12-15 14:20:00 -05:00 |
|
theoreticalbts
|
7e0e58f441
|
Discard from _applied_ops when proposal fails #481
|
2015-12-15 14:14:57 -05:00 |
|
Fabian Schuh
|
a2ce86bf4f
|
Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account'
|
2015-12-10 13:01:53 +01:00 |
|
theoreticalbts
|
844df7a7d4
|
Merge branch 'graphene/undo-patch' into bitshares
|
2015-12-09 18:21:57 -05:00 |
|
theoreticalbts
|
c2943ee3bb
|
undo_database.cpp: Handle unimplemented upd+del case
|
2015-12-09 18:16:50 -05:00 |
|
theoreticalbts
|
44db4760a1
|
undo_database.cpp: Refactor undo_database::merge() code
This commit does not change semantics at all, it just changes the layout of the code and adds comments.
|
2015-12-09 18:16:50 -05:00 |
|
theoreticalbts
|
f699240e0a
|
config.hpp: Bump db version
|
2015-12-07 17:53:03 -05:00 |
|
theoreticalbts
|
5fa123b6d7
|
config.hpp: Bump db version
|
2015-12-07 17:52:49 -05:00 |
|
theoreticalbts
|
020dc2e789
|
Merge branch 'graphene/develop' into prerel-2015-12-07
|
2015-12-07 17:45:45 -05:00 |
|
theoreticalbts
|
2b9876fd98
|
hardfork.hpp: Set hardfork timestamps
|
2015-12-07 15:36:52 -05:00 |
|
theoreticalbts
|
7107735e3f
|
Bump fc to enable WEBSOCKETPP_STRICT_MASKING #365
|
2015-12-07 15:17:23 -05:00 |
|
theoreticalbts
|
725ffd021e
|
Merge branch '455-fork-annual-self-referrer' into develop
|
2015-12-07 15:15:41 -05:00 |
|
theoreticalbts
|
0735a8722e
|
Merge branch '453-fork-referral-percent' into develop
|
2015-12-07 15:15:26 -05:00 |
|
theoreticalbts
|
d853aecd3f
|
Merge branch '445-fork-order-create-fee-refund' into develop
|
2015-12-07 15:14:03 -05:00 |
|
theoreticalbts
|
ac267393fc
|
Merge branch '436-fork-feed-protect' into develop
|
2015-12-07 15:12:17 -05:00 |
|
theoreticalbts
|
67aa3a4eb1
|
Merge branches '424-wallet-cancel-order', '437-test-fix-future-genesis', '439-util-js-op-wrapper' and '449-wallet-percent-mult' into develop
|
2015-12-07 15:11:58 -05:00 |
|
theoreticalbts
|
b80587e5b5
|
Prevent margin call from being triggered unless feed < call #436
|
2015-12-07 14:59:07 -05:00 |
|
emfrias
|
ec876f3def
|
update blocktrades seed node DNS address
|
2015-12-04 15:24:46 -05:00 |
|
theoreticalbts
|
32f12b9215
|
Refund order creation fee when order is cancelled #445
|
2015-12-03 15:48:52 -05:00 |
|
theoreticalbts
|
7a5c5c476d
|
wallet.cpp: Implement propose_builder_transaction2 #467
|
2015-12-02 16:17:46 -05:00 |
|
Daniel Larimer
|
0b4675354a
|
Merge pull request #462 from wackou/api-339
Api calls for #339: needed api calls (mostly network) for supporting bts_tools
|
2015-11-25 09:57:38 -05:00 |
|
Nicolas Wack
|
86029542ae
|
Add "about" api call to wallet. Fix #339
|
2015-11-25 15:26:26 +01:00 |
|
Scott Howard
|
699144c173
|
add cancel_order to wallet api
|
2015-11-23 09:47:45 -05:00 |
|
Nicolas Wack
|
c3dd6c3e48
|
Add network api calls: get_advanced_node_parameters, set_advanced_node_parameters, get_potential_peers
|
2015-11-21 23:04:43 +01:00 |
|
Nicolas Wack
|
de7b427472
|
Network api returns fc::variant_object instead of fc::variant
|
2015-11-21 23:00:03 +01:00 |
|
theoreticalbts
|
498ebf486f
|
account_evaluator.cpp: Set annual referrer to self when upgrading to annual member #455
|
2015-11-20 10:51:59 -05:00 |
|
theoreticalbts
|
084e38753b
|
Hardfork to retroactively correct referral percentages #453
|
2015-11-19 16:35:33 -05:00 |
|
theoreticalbts
|
47585a6b9a
|
Fix cli_wallet referrer percentage type #449
|
2015-11-19 14:11:40 -05:00 |
|
theoreticalbts
|
979d52c4c9
|
Merge branch '434-api-fillin-proposed-op-fees' into develop
|
2015-11-05 16:04:44 -05:00 |
|
theoreticalbts
|
b03ac00b6c
|
database_api.cpp: Recursively evaluate proposal fees #434
|
2015-11-05 16:02:39 -05:00 |
|
theoreticalbts
|
a96fd62d03
|
fee_schedule.cpp: Use relaxation to set fee #435
|
2015-11-05 15:59:32 -05:00 |
|
Scott Howard
|
70d364251a
|
add cancel_order to wallet api #424
|
2015-11-02 17:53:57 -05:00 |
|
theoreticalbts
|
09855166a2
|
Merge branch 'fork-367' into develop
|
2015-11-02 10:49:56 -05:00 |
|
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 |
|