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

1670 commits

Author SHA1 Message Date
Dan Notestein
d5358c6eb0 Prevent creation of tournament with negative buy-in 2017-04-10 13:54:40 +00:00
Abit
a4a8b67eba Fix account_history filtering by account #258 2017-04-09 00:57:41 +02:00
Abit
2c05590cd4 Fix clear_expired_transactions memory leak #256 2017-04-09 00:20:13 +02:00
Roman Olearski
c16454890c Implementing missing functionality (6) 
Peerplays Blockchain pre-launch settings & modifications I II III
 2017-04-08 20:16:05 +02:00
Roman Olearski
94ba6266c6 Implementing missing functionality (5) 
Peerplays Blockchain pre-launch settings & modifications I II III
 2017-04-08 15:50:13 +02:00
oxarbitrage
3d9ae3d86e market_history plugin fix 
fix get_trade_history and calls that use it(get_ticker, get_24_volume),
 2017-04-07 18:57:31 -03:00
Roman Olearski
33e2f4fd14 Implementing missing functionality 
Peerplays Blockchain pre-launch settings & modifications I II III

Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors-ro
 2017-04-07 17:28:53 +02:00
Roman Olearski
66208a2d9e I. DEX 
Task: The Peerplays DEX should only allow UIA and sidechain assets to be paired (traded) with the core token (PPY).
 2017-04-06 09:46:17 +02:00
Eric Frias
672fad6d40 Start of a plugin to track deleted events (and other deleted objects) needed by the 
bookie ui
 2017-04-04 17:02:19 -04:00
Roman Olearski
2fd34ef6ab commiting last changes 2017-04-01 13:59:52 +02:00
Eric Frias
6045b8b096 Add a simple test fixture to verify a bet plays out correctly in all three 
outcomes.
Fix refunding fees on market cancelation
 2017-03-31 17:56:00 -04:00
Eric Frias
39093df26c Create a bunch of utility functions to make writing betting market tests easier 2017-03-31 11:10:37 -04:00
Vikram Rajkumar
53b40ba5a6 Restore get_ticker batch size to 100 2017-03-24 17:08:48 -05:00
Vikram Rajkumar
b209915a36 Return latest price in get_ticker even if older than 24 hours 2017-03-24 16:50:03 -05:00
Vikram Rajkumar
12be59db79 Fix crashes in get_ticker and get_24_volume; #250 2017-03-24 16:28:04 -05:00
Eric Frias
69192a889d Generate a virtual op when a market is resolved 2017-03-24 11:51:35 -04:00
SynaptiCAD User
094004db7b fix peerplays list functions 2017-03-24 11:04:35 -04:00
SynaptiCAD User
e609764df3 cancel all the betting markets of a canceled event 2017-03-24 11:04:35 -04:00
Eric Frias
e74a505622 Fix missing const qualifier, payouts for betting market wins 2017-03-24 10:40:53 -04:00
SynaptiCAD User
c8a9c86ca6 cancel all unmatched bets on betting market when it is resolved 2017-03-24 00:09:43 -04:00
Eric Frias
784b11059f Start implementing bettimg_market_resolve op 2017-03-23 19:35:10 -04:00
Eric Frias
fd38d385ca Fix an error using the wrong scaling constant for bet odds 2017-03-23 18:16:18 -04:00
Eric Frias
9f6edc649d Sort bets by odds for use in an order book 2017-03-23 16:24:47 -04:00
SynaptiCAD User
239d8ee885 update global_betting_statistics when new events created, change scores representation to simple vector of strings, working on evaluator for event_update_status_operation 2017-03-23 00:36:18 -04:00
SynaptiCAD User
c0776eb1dc add get_global_betting_statistics api call 2017-03-23 00:36:18 -04:00
SynaptiCAD User
a267741fd1 added global_betting_statistics implementation object. Object is created, but nothing talks to it yet. 2017-03-23 00:36:18 -04:00
elmato
3eb160bed1 Move notification related functions from db_block.cpp to db_notify.cpp 2017-03-22 22:03:45 +00:00
elmato
030577f671 Fix handling of events from database_object in debug_witness_plugin 2017-03-22 20:14:53 +00:00
elmato
0ecdc90d4d Add the array of ids (that are being removed) to the removed_objects signal 2017-03-22 20:14:53 +00:00
elmato
cff792a740 debug_witness: Handle new params in changed/remove signals from database 2017-03-22 20:14:53 +00:00
elmato
31f322c9cd Handle new,changed and removed events from the database_object in one generic function 2017-03-22 20:14:53 +00:00
elmato
6f1d8b548b Replace clear_filter parameter with notify_remove_create 2017-03-22 20:14:53 +00:00
elmato
aab5fddb2f Keep track of subscribed accounts and check for events that reference them 2017-03-22 20:14:53 +00:00
elmato
bfa600c559 handle new database_object signals, refactor 2017-03-22 20:14:53 +00:00
elmato
6d3fbeef55 Include information of impacted accounts relative to the objects created/changed/removed. Only extract the impacted accounts information if there are handlers defined in order prevent useless cpu usage on nodes not exposing the rpc api 2017-03-22 20:14:53 +00:00
elmato
29c636fcef add get_market() function to call_order_object 2017-03-22 20:14:53 +00:00
alfredo
73abb804ae make less false positives( no false positive given in tests with this setting) 2017-03-22 20:14:53 +00:00
elmato
b2b895ac94 allow to apply_block when exception in database signal handler 2017-03-22 20:14:53 +00:00
elmato
02b2672a39 split notifications (notify_changed_objects) in three signals: new_objects, changed_objects, removed_objects 2017-03-22 20:14:53 +00:00
elmato
823beb7fe5 remove call to notify_changed_objects in _push_transaction 2017-03-22 20:14:53 +00:00
elmato
0bc0513e20 set_subscribe_callback: always initialize bloom filter 2017-03-22 20:14:53 +00:00
elmato
342e33008c Restore bloom filter usage: Check if the object changed/removed was previously subscribed (read) before sending updates back to ws clients 2017-03-22 20:14:53 +00:00
Eric Frias
3feea69a4c Stub out bet fill virtual op 2017-03-22 16:02:57 -04:00
Eric Frias
4cdcbe32da Validate the fee paid when placing a bet. Add virtual op for canceling bet 2017-03-22 15:04:11 -04:00
SynaptiCAD User
58d5affe40 fix merge conflict 2017-03-22 12:48:02 -04:00
SynaptiCAD User
c42a56d332 implement bet_cancel_operation 2017-03-22 12:06:08 -04:00
Eric Frias
46ef911f8e Add more checks when placing bets 2017-03-21 19:47:57 -04:00
Eric Frias
06c56484de Add blockchain parameters to limit the allowed bet odds, start data structure to 
track an account's market position
 2017-03-21 18:10:02 -04:00
Eric Frias
ccd570874f Updated data structures to take bets with explicit odds 2017-03-21 12:27:13 -04:00
Eric Frias
65aa509ec9 Support enums in blockchain objects (fix serialization) 2017-03-21 09:24:08 -04:00
SynaptiCAD User
f99bf1c6e6 [DLN] implement list_betting_markets(betting_market_group) 2017-03-19 22:44:16 -04:00
SynaptiCAD User
2d4f18280f [DLN] implement list_betting_market_groups(event_id) 2017-03-19 22:12:31 -04:00
SynaptiCAD User
20a64be400 [DLN] implement list_event_groups(sport_id) 2017-03-19 20:40:17 -04:00
Vikram Rajkumar
9bbbefd391 Update fc submodule 2017-03-18 11:52:06 -05:00
Thomas Freedman
15066260f2 Updated definition of Thom seed nodes 2017-03-17 16:02:11 -05:00
Eric Frias
db6b312784 Stub out the bet object and the operation for placing it (currently breaks 
json_serializer builds, until I port over some code into fc)
 2017-03-16 19:37:26 -04:00
Eric Frias
5aedb65e5c Implement the apparently-unused feature allowing later operations in a transaction to 
reference objects created by earlier operations.  Change all betting operations
to allow use of this feature, and test it in operation_tests2
 2017-03-16 18:38:35 -04:00
Vikram Rajkumar
8ae1f6b3a5 Remove NTP time 2017-03-16 12:53:52 -05:00
SynaptiCAD User
43f91d83fc [DLN] implement list_sports() API call 2017-03-15 19:06:39 -04:00
Eric Frias
2470af6eb9 Initial work on creating blockchain objects for sports betting 2017-03-15 17:04:27 -04:00
oxarbitrage
24d1ce8b1f log unexpected exception in close function for github issue 81 2017-03-13 17:03:15 -07:00
kstdl
6b2927a693 limit check added 2017-03-07 13:28:07 +03:00
Vikram Rajkumar
9231d05d07 Fix comment 2017-03-02 13:05:25 -06:00
Vikram Rajkumar
c149a5b9b1 Update seed nodes 2017-03-01 17:12:04 -06:00
Vikram Rajkumar
1e80d8a01e Merge pull request #242 from oxarbitrage/patch-3 
Change wallet function get_market_history
 2017-03-01 17:09:37 -06:00
oxarbitrage
b6cb3eeeb9 Update wallet.hpp 2017-03-01 12:07:33 -03:00
oxarbitrage
2c473285b6 issue191 
Adding date parameters to cli wallet function get_market_history
 2017-03-01 12:02:28 -03:00
oxarbitrage
96bd48b6de issue 193 
remove note.
 2017-03-01 08:54:14 -03:00
Abit
0f7142d9d2 Merge pull request #239 from lafona/lafona-seed-node 
adds seednode run by lafona
 2017-03-01 11:16:36 +01:00
lafona
81039c0b8e adds seednode run by lafona 2017-02-28 08:24:54 -05:00
root
3d349fbde4 added api function get_account_history_operations 2017-02-22 15:35:37 -08:00
Vikram Rajkumar
4e9d2af6bf Merge pull request #236 from oxarbitrage/passdump 
remove log of key in witness start
 2017-02-20 13:54:20 -06:00
kstdl
895fbec5bc get_tournaments and get_tournaments_by_state method added 2017-02-20 18:09:37 +03:00
root
0703447bfd Print public key on start 2017-02-20 06:18:46 -08:00
root
f50df89826 remove log of key in witness start 2017-02-20 04:52:07 -08:00
Taconator
eb4db2963e - CLI: Derive possible owner keys from a brain key 
- Test: Derive possible owner keys from a brain key

- CLI enhanced to permit checking of whether a public key is currently linked to a registered account

- Database API enhanced to permit checking of whether a public key is currently linked to a registered account

- Test: Check whether a public key is currently registered/associated with an account
 2017-02-16 16:22:35 -05:00
alfredo
422d895807 Added withdraw permissions to get_full_account api function. requested in issue #230. 2017-02-09 17:20:24 -03:00
alfredo
9ea386aa10 added list of assets created by account output to get_full_accounts api function 2017-02-02 18:20:21 -03:00
alfredo
f2c049265e Asset API Added 2 functions 2017-01-31 21:25:17 -03:00
Vikram Rajkumar
fa9f7a7c0b Merge pull request #225 from elmato/block-api 
Add new API (block_api)
 2017-01-30 18:37:52 -06:00
Vikram Rajkumar
8cc042a589 Merge pull request #224 from elmato/asset-api 
Add new API (asset_api)
 2017-01-30 18:37:44 -06:00
Vikram Rajkumar
8477b2ea33 Merge pull request #223 from elmato/ws-rpc-auto-login 
Auto login on every ws/rpc connection using HTTP Authorization header if present
 2017-01-30 18:29:28 -06:00
Vikram Rajkumar
8fdd252861 Update fc submodule 2017-01-30 18:18:59 -06:00
elmato
6165434265 Add block api to retrive blocks in bulk. 2017-01-27 09:41:50 +00:00
elmato
cdc0b3bf08 Add new API (asset_api) to query the full list of accounts that holds a specific asset 2017-01-27 09:14:54 +00:00
elmato
77645d889f Auto login on every ws/rpc connection. Use HTTP Authorization header information if present 2017-01-27 07:42:58 +00:00
elmato
adf288b4ad Make login_api::enable_api public 2017-01-27 07:40:50 +00:00
Vikram Rajkumar
ef356a15a6 Update submodules 2017-01-17 16:42:33 -06:00
Vikram Rajkumar
f270b65597 Revert "Add a command-line option to witness_node, --disable-permessage-deflate" 
This reverts commit c39f97885d.
 2017-01-12 17:47:44 -06:00
Eric Frias
4674fc53ab Allow generate_genesis plugin to quietly do nothing when you don't specify the block number on the witness's command line. 2017-01-04 17:19:48 -05:00
Eric Frias
2012fe6e90 Allow generate_genesis plugin to quietly do nothing when you don't specify the block number on the witness's command line. 2017-01-03 16:45:14 -05:00
Roman Olearski
ac73f34045 little correction for #12 Add tournament rules to prevent a game from lasting too long due to ties 2016-12-02 12:01:37 +01:00
Roman Olearski
e16b9d0610 fxing #11 Fix operation of "insurance" parameter 
implementing	#12 Add tournament rules to prevent a game from lasting too long due to ties
 2016-11-29 17:38:37 +01:00
Roman Olearski
787019617f Summary commiting changes made since the last commit 
modified:   libraries/app/impacted.cpp
	modified:   libraries/chain/db_init.cpp
	modified:   libraries/chain/db_maint.cpp
	modified:   libraries/chain/game_object.cpp
	modified:   libraries/chain/include/graphene/chain/protocol/operations.hpp
	modified:   libraries/chain/include/graphene/chain/protocol/tournament.hpp
	modified:   libraries/chain/protocol/tournament.cpp
	modified:   libraries/chain/tournament_object.cpp
	modified:   libraries/wallet/wallet.cpp
	modified:   programs/witness_node/main.cpp
	modified:   tests/CMakeLists.txt
	modified:   tests/common/database_fixture.cpp
	new file:   tests/tournament/tournament_tests.cpp
 2016-11-28 12:36:18 +01:00
Roman Olearski
b9508c6da8 little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-28 09:06:29 +01:00
Roman Olearski
eadbae0808 solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-26 16:03:33 +01:00
Roman Olearski
81c9e98d7b solution ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 19:40:25 +01:00
Roman Olearski
f2c0157bb7 avoiding generating tournament payout operation if zero payout 
updating tournaments tests
 2016-11-25 18:01:32 +01:00
Roman Olearski
278c9b1683 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 11:23:06 +01:00
Roman Olearski
85d7a30f87 improving tournament prize distributing for assets other then core asset 2016-11-24 17:17:59 +01:00
Roman Olearski
bf8e46bf8d Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-23 11:35:58 +01:00
Roman Olearski
a66af8b072 enhancing tournament_payout operation according issues 8 9 2016-11-23 11:33:24 +01:00
Eric Frias
85914fb3b4 Remove code that was resetting the game timer each time a player made a move 2016-11-22 18:30:34 -05:00
Eric Frias
a00b6cc8a1 Disalbe excessive logging, fix a bug that was preventing a game from ending 
even after all reveal moves  moves were made
 2016-11-22 17:47:33 -05:00
Roman Olearski
cf6f3a15fd generating tournament payout operation 2016-11-21 18:11:31 +01:00
Vikram Rajkumar
015f195951 Remove abandoned P2P rewrite 2016-11-18 15:52:32 -06:00
Vikram Rajkumar
4eaef390a3 Decrease printing frequency during replay 2016-11-17 16:39:31 -06:00
Vikram Rajkumar
64e27bde93 Fix build 2016-11-17 15:56:11 -06:00
Vikram Rajkumar
13569d2d37 Merge commit 'a3cfa1055edb016d8d3b80258657862668f8598f' into bitshares 2016-11-17 15:39:56 -06:00
Vikram Rajkumar
75f238d15f Remove unreachable seed nodes 2016-11-17 15:37:32 -06:00
Vikram Rajkumar
4e4a359fb9 Merge commit '5da213f' into bitshares 2016-11-17 15:17:27 -06:00
Vikram Rajkumar
38e5d91355 Merge commit '7f75be5ced9bbe6c0671b3dadc46bcaecc3c1beb' into bitshares 2016-11-17 15:13:02 -06:00
Roman Olearski
b1a8a3e503 cleaning unnecessary dumps and comments 2016-11-17 19:04:14 +01:00
Roman Olearski
1530f04882 added operation tournament_payout_operation 2016-11-17 18:04:32 +01:00
Vikram Rajkumar
2254fc62d6 Remove "applied epsilon logic" log message 2016-11-16 16:24:12 -06:00
Eric Frias
935dac7ae6 Fix crash in logging when one player fails to reveal their move 2016-11-16 15:57:35 -05:00
Roman Olearski
39b6bfd85e fixing problem : tournament never ends if "bye" matches present 
adding tournaments' prize_pool to total  balances
 2016-11-16 15:10:10 -05:00
Eric Frias
4ac87291ec Update fc 2016-11-16 15:08:31 -05:00
Eric Frias
749ffb8688 Don't make the core asset a bitasset 2016-11-15 10:23:58 -05:00
Roman Olearski
5c3c8d9a8a fixing problem : tournament never ends if "bye" matches present 
adding tournaments' prize_pool to total  balances
 2016-11-14 20:18:44 +01:00
Roman Olearski
b72eae0941 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 2016-11-08 16:26:43 +01:00
Roman Olearski
6abffc0963 Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-08 15:57:57 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +01:00
Nathan Hourt
d7c51f26e3 Add more missing headers to install 2016-11-07 18:17:51 -06:00
Nathan Hourt
af6eb06a3e Add missing includes 2016-11-07 18:17:51 -06:00
Nathan Hourt
fc094d7114 Fix utilities CMakeLists.txt 
Inconsistent capitalization of HEADERS variable, prevented installation from working properly
 2016-11-07 18:17:51 -06:00
Nathan Hourt
dc9e0fa025 Fix index.hpp 
Bad return type.
 2016-11-07 17:44:57 -06:00
Nathan Hourt
c108a78b35 Resove #651: Make add_secondary_index return index 
A pointer to the newly created index object is now returned.
 2016-11-07 17:44:37 -06:00
Roman Olearski
58f1fdc46d Setting the core asset as test dividend asset inn genesis 2016-11-07 22:27:58 +01:00
Roman Olearski
0d8e3a31d5 Removing redundant line 2016-11-07 11:05:04 +01:00
Roman Olearski
26f47189f0 Creating default dividend asset 2016-11-07 10:18:18 +01:00
Roman Olearski
41f11bd63c Merge branch 'rock-paper-scissors' into rock-paper-scissors-ro 2016-11-02 18:11:59 +01:00
Roman Olearski
322c6472ba Merge remote-tracking branch 'origin/rock-paper-scissors' into rock-paper-scissors-ro 2016-11-02 18:10:00 +01:00
Eric Frias
0ebcf00ae0 Fix tournament end_time not set bug #20 2016-11-02 10:57:39 -04:00
Roman Olearski
7f36b261bf Merge remote-tracking branch 'origin/dividends' into rock-paper-scissors 
Adding new chain parameters
Distribute prize money when a tournament ends
 2016-11-02 15:30:18 +01:00
Roman Olearski
a17f2e48ed correcting "then" -> "than" 2016-10-28 20:27:24 +02:00
Roman Olearski
8b0cdacb11 Create new blockchain parameters for peerplays that can be voted on by committee members part 1 2016-10-28 19:35:49 +02:00
Eric Frias
f078fed4fd Properly sequence matches when there are more than two players in the tournament 2016-10-23 13:12:06 -04:00
Eric Frias
30874697cc Rework the API calls for tournaments, add an index for getting tournaments 
registered by a given account
 2016-10-21 12:14:37 -04:00
Eric Frias
72d48cf3d2 Remove redundant type_of_game field 2016-10-19 18:19:13 -04:00
Eric Frias
c4ad900026 Fix build error in member_enumerator when an operation includes an enum. 
Implement the commit/reveal timeouts in RPS games, and generate automatic
("insurance") moves.  Make the CLI wallet watch for new games in
tournaments you're registered for.
 2016-10-18 17:36:59 -04:00
Eric Frias
7c30da6b6d Simple two-player tournaments are working if you don't do anything fancy 2016-10-14 19:43:38 -04:00
abitmore
82cf1a10af Merge branch 'patch-2' of https://github.com/iPerky/muse into iPerky-patch-2 
Conflicts:
	libraries/app/application.cpp
 2016-10-14 00:13:23 +08:00
iHashFury
4d0d3fb313 Update application.cpp 
remove old seed node
 2016-10-10 20:14:27 +02:00
roelandp
4251d40ab8 Added my public seed node for bitshares2 
Type: Dedicated
Processor: Intel Xeon D-1521
Ram: 32 GB DDR4
HDD: 2 x 2 TB
Connection: 1 Gbit/s
Location: Canada

Next to my Steem Witness, I thought it would be nice to strenghten the BTS network. At first with a public seed, later with a witness application I think. See https://steemit.com/witness-category/@roelandp/witness-roelandp if you want to learn more about me and my witness.
 2016-10-10 16:51:32 +02:00
Roman Olearski
5616fda018 Improving genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/
        parameterizing csv log file name
 2016-10-10 11:06:48 +02:00
Roman Olearski
2e3cd4a75c Improving genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/
	improving, refactoring code - resigning from unsafe static_cast, implementing constructor copiny from base class
 2016-10-08 22:25:18 +02:00
Roman Olearski
227c89a453 Improving genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/issu
                part 2 adding csv log
            added column name
            added columns: initial balance, sahredrop
	    reseting sharedrops at the tail of the log
 2016-10-07 21:05:42 +02:00
Roman Olearski
1a76276edc Improving genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
            part 2 adding csv log
        added column name
        added columns: initial balance, sahredrop
 2016-10-07 16:09:10 +02:00
Roman Olearski
3d1bb9cce4 Improving genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
        part 2 adding csv log
	added column name
 2016-10-07 12:51:06 +02:00
Roman Olearski
71a3cd49e1 Improve genesis block for PeerPlays 
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
    part 1
 2016-10-06 18:15:02 +02:00
Eric Frias
50a9f913ce Move game object to its own file 2016-10-04 10:41:26 -04:00
Eric Frias
6f32a13079 Add another missing file 2016-10-03 16:17:21 -04:00
Eric Frias
b4f9eb05fb Update fc submodule 2016-10-03 15:52:26 -04:00
Eric Frias
e57a5e84db Add missing source files 2016-10-03 13:45:24 -04:00
Eric Frias
baab40070d Many changes, including a start to supporting peerplays games in the cli wallet 2016-10-03 12:14:48 -04:00
Eric Frias
eb8929f6fa Separate match object out from tournament and give it a fsm, 
start changing genesis json
 2016-09-20 14:36:06 -04:00
Eric Frias
5186ef4076 More reworking of initial tournament bracket setup 2016-09-16 18:53:12 -04:00
abitmore
0ad83697f0 Catch DNS exceptions (rework - part 2). #618 2016-09-15 17:11:22 +08:00
abitmore
39a5805491 Catch DNS exceptions (rework - part 1). #618 2016-09-15 17:09:03 +08:00
Eric Frias
55255010df Add get_upcoming_tournaments wallet call, clean up logging 2016-09-14 11:52:22 -04:00
Eric Frias
dd0ad9e759 more fixes to get tournament_create/join working in cli wallet 2016-09-12 18:28:45 -04:00
Eric Frias
9b101cefcf Restore secret hashes from witnesses -- this is a selective restore of the parts of commits 59a3ca32b7 and c2e5432a30 that generated the secret hashes (it omits the changes to the witness scheduling algorithm) 2016-09-10 15:28:09 -04:00
Eric Frias
da43a8712d Moved most of the logic for joining tournament into tournament_object 2016-09-08 18:34:43 -04:00
Sigve Kvalsvik
a3cfa1055e Merge pull request #585 from xeroc/584-remove-warning 
Remove unnecessariy warning (issue #584)
 2016-09-06 22:07:05 +02:00
abitmore
5ad763b0bf Catch all exception when connecting to other peers 2016-09-06 20:57:01 +02:00
Eric Frias
84a43f9a3c Add plugin for dumping a new genesis block based on balances at a given block. It calls 
a function to dump state at the block, but we haven't decided exactly what it should dump
yet.
 2016-09-06 14:38:53 -04:00
Eric Frias
66bf0545c5 Add api call for getting a list of upcoming tournaments 2016-09-04 17:52:43 -04:00
Eric Frias
122dbfc698 More work on tournament registration, tournaments are now canceled and 
buy-in is refunded
 2016-09-03 17:51:27 -04:00
Eric Frias
4e856996be More validation of tournament_join op 2016-09-02 19:25:02 -04:00
Eric Frias
234a76fdd1 More validation and processing of the tournament_create and tournament_join operations 2016-09-02 15:04:17 -04:00
Eric Frias
bf59b503bc Start on tournament_create evaluator 2016-09-02 10:53:08 -04:00
Eric Frias
c2f3beb5d6 Initial data structures for creating/joining tournaments 2016-09-01 14:28:46 -04:00
Eric Frias
908929210b Prevent creation of accounts with the same name as dividend distribution accounts 2016-08-30 14:18:21 -04:00
Eric Frias
be6ad130d9 Code cleanups -- renaming variables, adding comments, fix one bug with override transfers 
and dividend assets
 2016-08-26 11:29:37 -04:00
Eric Frias
bc212b7d59 Fixes to paying out non-core assets using their fee pools 2016-08-25 10:41:01 -04:00
Eric Frias
27b0b2febb Update fc submodule 2016-08-16 14:20:52 -04:00
abitmore
ead2db3272 application.cpp: Validate block timestamps #645 2016-08-05 16:22:32 +02:00
Fabian Schuh
a2fa90bd7d Merge pull request #17 from abitmore/fix-645-block-timestamp 
Reject blocks with timestamp too far in the future
 2016-08-02 08:56:12 +02:00
abitmore
2cf8fb62c9 application.cpp: Validate block timestamps #645 2016-07-30 05:39:41 +08:00
Nathan Hourt
a22e628910 Add compile-time sanity check to generic_index 
generic_index::find fails at runtime if the boost multi_index_container's first index is not an index of object_id_type, and the cause of this failure is nonobvious from the error message. This compile-time check will fail if any generic_index is created around a multi_index_container whose first index is not an index on object_id_type, with a helpful error message explaining the problem, so no one else will ever have to debug this issue. :)
 2016-07-06 18:18:41 -05:00
Eric Frias
6c35e8d2a3 Compile fix 2016-06-30 16:00:29 -04:00
Eric Frias
b584ee15dd Separate out unit tests for dividend-assets into their own test suite 2016-06-30 12:05:16 -04:00
Eric Frias
06b2134085 Keep pending dividend balance and distributed dividend balance objects around (with zero 
balance) after payouts, they will probably be needed again.
 2016-06-27 17:31:14 -04:00
Eric Frias
7857ac48a4 Correctly generating virtual transactions for payouts 2016-06-27 16:24:13 -04:00
Eric Frias
abc7853c99 Initial work on dividend-paying assets. Basic functionality works in simple 
cases.
 2016-06-26 15:41:07 -04:00
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
Eric Frias
295984e884 Update fc submodule 2016-04-06 10:23:42 -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
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
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
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
Eric Frias
81b1a49fbf Update fc 2016-02-26 11:43:17 -05:00
Eric Frias
14295772f0 Merge branch 'bitshares-2-bitshares' 
# Conflicts:
#	libraries/fc
 2016-02-26 11:29:25 -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
theoreticalbts
62a414ac85 application.cpp: Cleanup re-indexing logic #587 DOES NOT COMPILE 2016-02-23 10:48:07 -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
Daniel Larimer
146c0c4d8e Clean up some non-determisitic behavior, maybe fix #485 
1. Replace ordered_non_unique indexes with composite keys / ordered_unique, using object_id as tiebreaker.
2. Make some casts more explicit.

This commit was rebased by theoreticalbts due to conflicts with the patches for #466 #562 including bugfixes

- Fix flipped comparison operator
- Implement operator> and operator!= for object_id_type
 2016-02-11 13:02:11 -05:00
theoreticalbts
c33fe35e4e Implement buyback accounts #538 2016-02-11 04:59:28 -05:00
theoreticalbts
bd22592d19 Merge branches '555-fork-defer-s4n-cull', '559-test-fix-zero-block-wait' and '566-cleanup-wl-flag-check' into 538-fork-buyback 2016-02-11 04:56:47 -05:00
theoreticalbts
e4f7483ec3 transfer_evaluator.cpp: Remove unused variable and redundant check #566 
This check was the pre-419 check of whether the fee asset is authorized,
which was (due to a typo) buggily checking the sent asset rather
then the fee asset.
 2016-02-11 04:02:35 -05:00
theoreticalbts
6f7f2605c1 Remove now-redundant white_list bit check from evaluators #566 2016-02-11 04:02:33 -05:00
theoreticalbts
bb47f4c71c Remove now-redundant white_list bit check from _is_authorized_asset() #566 2016-02-11 04:02:31 -05:00
theoreticalbts
130b54116c Inline fast path of is_authorized_asset() #566 2016-02-11 04:02:29 -05:00
theoreticalbts
68a0ffa1aa Make is_authorized_asset a free-floating method #566 
The following sed commands were used to port existing call sites to the new interface:

    sed -i -e 's/\([a-zA-Z0-9_]\+\)->is_authorized_asset[(] \([a-zA-Z0-9_*]\+\), d [)]/is_authorized_asset( d, *\1, \2 )/' libraries/chain/*.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[.]is_authorized_asset[(] \([a-zA-Z0-9_*]\+\), d [)]/is_authorized_asset( d, \1, \2 )/' libraries/chain/*.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[(]db[)][.]is_authorized_asset[(]\([a-zA-Z0-9_*]\+\)[(]db[)], db[)]/is_authorized_asset( db, \1(db), \2(db) )/' tests/tests/uia_tests.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[.]is_authorized_asset[(]\([a-zA-Z0-9_*]\+\), db[)]/is_authorized_asset( db, \1, \2 )/' tests/tests/uia_tests.cpp

No new functionality is added by this commit, it is simply re-organizing the existing code in a different place.
 2016-02-11 01:57:22 -05:00
James Calfee
a0cc5b775d Saves change address (without changing wallet_api::receive_blind_transfer API) #564 2016-02-09 13:43:56 -06:00
James Calfee
fa439e9732 Saves change address in the wallet when transfering from blind to an account (close #564) 2016-02-09 12:37:54 -06:00
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
Eric Frias
ed1121d3f6 Hack to allow address parsing code to handle both MUSE prefix and BTS 
prefix
 2015-11-09 16:38:19 -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
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