Commit graph

537 commits

Author SHA1 Message Date
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
theoreticalbts
f699240e0a config.hpp: Bump db version 2015-12-07 17:53:03 -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
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
b80587e5b5 Prevent margin call from being triggered unless feed < call #436 2015-12-07 14:59:07 -05:00
theoreticalbts
32f12b9215 Refund order creation fee when order is cancelled #445 2015-12-03 15:48:52 -05: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
a96fd62d03 fee_schedule.cpp: Use relaxation to set fee #435 2015-11-05 15:59:32 -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
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
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
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
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
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
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
theoreticalbts
8488731e37 Merge branch 'master' into bitshares 2015-10-20 13:27:57 -04:00