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

417 commits

Author SHA1 Message Date
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
pbattu123
67616417b7
Revert "GPOS protocol" 2019-05-29 18:31:01 -03:00
pbattu123
2c86caacc5
Merge pull request #8 from oxarbitrage/gpos2 
GPOS protocol
 2019-05-29 18:09:48 -03:00
PBSA
4c174597ff compilation errors resolved 2019-05-22 16:34:55 +00:00
Alfredo
610266481b add create_vesting_balance command to cli wallet 2019-01-22 16:19:13 -03:00
Fabian Schuh
7d6432e4bf
Merge remote-tracking branch 'origin/sport_n_events_api_extension_release' into beatrice 2018-10-11 14:08:23 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Apr Team
2212bdea3a Fixed small issue. Added registering of the new API calls in the FC_API macro. 2018-05-17 09:45:04 +02:00
Apr Team
80efb85d72 Added event_group delete operation and evaluator. Fixed compilation issues. 2018-05-17 09:45:04 +02:00
Apr Team
4f501f6aaf Added sport_delete operation, evaluator and API. Fixed various compilation issues. 
Added tests file.
 2018-05-17 09:45:04 +02:00
Eric Frias
3b3a0905ff Change the behavior of the betting markets from being controlled by 
a collection of flags (is_live, is_closed) to a single status field.
The status changes in an event can trickle down to the market groups,
and the status changes in market groups can bubble up to events.
 2018-02-07 10:16:30 -05:00
kstdl
090a3a4dad merge get_account_lotteries branch. fix create_witness test 2018-01-09 11:45:19 +03:00
kstdl
202153acdc added get_account_lotteries method to db_api and cli, lottery end_date and ticket_price verification 2018-01-03 15:34:15 +03:00
kstdl
8f379a3c53 fix reindex on peerplays network 2017-12-12 15:37:58 +03:00
kstdl
fdd77ef5af minor logic changes. added db_api and cli_wallet methods 2017-12-11 17:42:55 +03:00
kstdl
2acbf3d929 ticket_purchase_operation implemented. added lottery_options to asset 2017-11-13 10:14:07 +03:00
kstdl
d7c80b4b6a fix rng and get_winner_numbers implemented 2017-11-03 17:52:41 +03:00
Roman Olearski
c054a92d5e added get_all_unmatched_bets_for_bettor to the wallet 2017-09-07 13:50:08 +02:00
Roman Olearski
d63a89febf get_matched_bets_for_bettor: added to the wallet, fixed missing reflection 2017-09-04 08:44:29 +02:00
Roman Olearski
2cd816ec6d fixing bet_cancel_operation, added mising fee to reflection 2017-09-01 16:25:13 +02:00
Roman Olearski
ec08259b7d added cancel_bet to the wallet 2017-09-01 13:29:45 +02:00
Roman Olearski
05a06a6f6d addedd (list_events_in_group) (get_unmatched_bets_for_bettor) to the wallet 2017-08-31 12:51:53 +02:00
Eric Frias
05607ada37 Fix incorrect doc string in wallet help 2017-08-24 17:36:30 -04:00
Eric Frias
ad11c45415 Pretty-print bet place, fill, refund, cancellation 2017-08-16 18:56:23 -04:00
Eric Frias
596ab26eb5 Fix the place_bet wallet command to use a more friendly format for specifying 
the bet amount and multiplier
 2017-08-16 15:17:31 -04:00
Eric Frias
b505c375af Finish delayed (live) betting. 
Remove the ability to change the event of a betting market group after creation.
 2017-08-15 18:44:09 -04:00
Roman Olearski
2c8b9ce17a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-08-09 17:59:25 +02:00
Roman Olearski
ec77685264 added is_live_market to event_update operation 2017-08-09 17:58:01 +02:00
Eric Frias
a8d5fded26 Remove the code for charging beting fees up-front now that rake fees are taken from your net winnings. 
Change the bet matching algorithm to only match at exactly the maker's odds, no rounding.
Implement binned order books in the betting market plugin.  Keep betting market groups,
betting markets, and bet objects around forever in the plugin (not yet exposed to the api).
 2017-08-09 11:15:12 -04:00
Roman Olearski
f417dc0391 removed betting_market_group_freeze operation 
added freeze to betting_market_group_update operation
 2017-08-09 11:08:50 +02:00
Roman Olearski
e9f1788eae added get_binned_order_book to wallet 2017-08-08 12:12:55 +02:00
Roman Olearski
28ada40217 added missing reflections for betting update methods . 2017-08-08 11:20:55 +02:00
Roman Olearski
6ca6413d88 bookie_plugin: added localized_event_strings .... 2017-08-01 12:26:45 +02:00
Roman Olearski
b96459045b added get_total_matched_bet_amount_for_betting_market_group to bookie_plugin 2017-07-28 18:23:57 +02:00
Roman Olearski
3ac447b8a7 Add missing 'description' field to betting_market_update operation 2017-07-27 09:50:37 +02:00
Eric Frias
0b1d55586e Add missing 'description' field to betting_market_create operation 2017-07-26 13:52:55 -04:00
Roman Olearski
1d450f6ff9 Added wallet operations for updating betting_market_group/betting_market 2017-07-25 11:22:35 +02:00
Roman Olearski
510f2f919f Add a wallet operation for updating betting market rules 2017-07-25 09:20:45 +02:00
Eric Frias
5459beebb6 Add a wallet operation for creating betting market rules 2017-07-24 10:43:15 -04:00
Roman Olearski
ea3818cf4f extended event_update_operation 2017-07-21 13:42:15 +02:00
Roman Olearski
cd40ef0715 extended event_group_update_operation 2017-07-20 21:01:10 +02:00
Roman Olearski
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02:00
Roman Olearski
7b8fad0bfa added event_group_update_operation 2017-07-19 18:10:55 +02:00
Roman Olearski
a24f671c02 added sport_update_operation 2017-07-19 13:05:28 +02:00
Roman Olearski
67c134a138 changed cancel_all_bets to cancel_unmatched_bets 2017-07-19 10:29:51 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +02:00
Roman Olearski
d3482f3a08 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-13 16:07:30 +02:00
Eric Frias
790bfe3704 WIP Force all betting markets in a group to use the same asset_id for betting 2017-07-09 18:41:26 -04:00
Roman Olearski
5de1437d24 Merge branch 'betting-ro4' into betting-merge 2017-07-08 20:41:45 +02:00
Roman Olearski
85102da504 Cherry-picked commit 32b5343. 
Implementing propose_dividend_asset_update
 2017-07-06 19:58:10 +02:00
Eric Frias
67d0898394 Fixes to paying out non-core assets using their fee pools 2017-07-06 19:39:04 +02:00
Eric Frias
f67dd3ea58 Compile fix 2017-07-06 19:24:14 +02:00
Eric Frias
b8e1165290 Cherry-picked commit 7857ac4. 
Correctly generating virtual transactions for payouts
 2017-07-06 19:18:48 +02:00
Eric Frias
b9304caffa Cherry-picked commit abc7853. 
Initial work on dividend-paying assets.  Basic functionality works in simple cases.
 2017-07-06 19:14:02 +02:00
Eric Frias
cd2940c8a8 Remove competitor and market options objects from the blockchain 2017-07-06 11:57:45 -04:00
Roman Olearski
9b08b502be implementing betting_market_resolve_group_operation (3) #1 2017-07-06 12:56:32 +02:00
Eric Frias
3238ea735f Merge commit '568ceb189eca96e77e38c4059b83a504008d7e91' into betting 2017-06-21 16:43:00 -04:00
Eric Frias
fe82e85d8d Merge commit '9bbbefd3913ccfe01b8e8ef2007ca3eb74ab9d81' into betting 2017-06-21 09:33:53 -04:00
Eric Frias
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
627dba3a46 Merge commit '0ad83697f08a11431eece565f0386a849bed25c9' into betting 2017-06-20 18:36:19 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Roman Olearski
eb4c8f75d1 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 
Conflicts:
	programs/witness_node/main.cpp
 2017-06-09 12:17:26 +02:00
Viktor
b7e11ae9d6 Update max core supply in genesis, properly track total supply for vesting balances in bts accounts and other changes 2017-06-06 11:17:04 +03:00
Viktor
3248606782 Add a command 'update_witness_votes' to the CLI wallet that 
allows you to change multiple witness votes at one time
(just a convenience, it doesn't do anything vote_for_witness didn't
already let you do)
 2017-06-02 12:19:20 +03:00
Viktor
113903b714 Automatically update wallet's cached copy of account objects 
whenever we are notified of a change on the blockchain
 2017-06-02 11:59:46 +03:00
Eric Frias
6234716eea Add a command 'update_witness_votes' to the CLI wallet that 
allows you to change multiple witness votes at one time
(just a convenience, it doesn't do anything vote_for_witness didn't
already let you do)
 2017-06-01 17:46:32 -04:00
Eric Frias
7a2eb92563 Automatically update wallet's cached copy of account objects 
whenever we are notified of a change on the blockchain
 2017-06-01 16:58:56 -04:00
PBSA Github Manager
92a3aed321 fixed update witness operation - added new_initial_secret 2017-05-28 01:57:03 -03:00
Roman Olearski
50f07d47f5 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-05-27 20:13:17 +02:00
Roman Olearski
e6b58adbd1 fixed update witness operation - added new_initial_secret 2017-05-27 20:11:46 +02:00
PBSA Github Manager
6da92cacaa fixed documentation 2017-05-26 22:44:13 -03:00
PBSA Github Manager
41f682c2a8 Update wallet.cpp 2017-05-26 22:41:11 -03:00
PBSA Github Manager
54bded64e8 Update wallet.cpp 2017-05-26 22:37:58 -03:00
PBSA Github Manager
d94d019617 Ordering of fields for password generation docs 2017-05-26 22:31:08 -03:00
PBSA Github Manager
c86cf2f77b Change ordering of fields for password generation documentation 2017-05-26 22:22:11 -03:00
PBSA Github Manager
787399b8cb Change ordering of fields for password generation 2017-05-26 22:07:44 -03:00
PBSA Github Manager
a7ca09dfc3 Add get_private_key_from_password from steem commit 2017-05-26 22:04:49 -03:00
PBSA Github Manager
85c8ce9ac2 Add get_private_key_from_password from steem commit 2017-05-26 22:01:35 -03:00
Eric Frias
0c6ba8e1d5 Change ordering of fields for password generation 2017-05-26 10:43:51 -04:00
Eric Frias
4b17eb6657 Add get_private_key_from_password from steem commit 27ee20fdc0a11b721c760685b8a6956c592287cb 2017-05-25 12:21:48 -04:00
kstdl
342e6db610 inital 2017-05-25 12:13:59 +03:00
Roman Olearski
0c14896a3d done acounts_list_plugin 2017-05-22 19:49:10 +02:00
Roman Olearski
3e4d9c2aa3 added acounts_list_plugin 2017-05-22 17:57:35 +02:00
Roman Olearski
3f62223b18 added betting methods to the cli_wallet 2 2017-05-20 11:36:00 +02:00
Roman Olearski
b2e9af164c added betting methods to the cli_wallet 2017-05-18 13:06:35 +02:00
oxarbitrage
d482273add Expose get_relative_account_history to cli_wallet (#277) 2017-05-10 01:58:42 +02:00
Eric Frias
f7113d3d05 [DLN] change parameters to tournament_leave_operation to specify the account canceling the registration instead of the payer. The canceling acount must be either the payer or the player. Don't allow a player to leave a tournament once registration has been closed. Require player to be authorized for the asset being paid as tournament prize winnings during tournament_join_operation. Tests still need to be made for these changes. 2017-04-10 23:29:02 -04:00
Roman Olearski
c60e88d054 Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2017-04-10 19:07:56 +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
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
Vikram Rajkumar
9231d05d07 Fix comment 2017-03-02 13:05:25 -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
kstdl
895fbec5bc get_tournaments and get_tournaments_by_state method added 2017-02-20 18:09:37 +03: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
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
a66af8b072 enhancing tournament_payout operation according issues 8 9 2016-11-23 11:33:24 +01:00
Roman Olearski
cf6f3a15fd generating tournament payout operation 2016-11-21 18:11:31 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +01: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
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
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
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
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
bc212b7d59 Fixes to paying out non-core assets using their fee pools 2016-08-25 10:41:01 -04:00
Eric Frias
6c35e8d2a3 Compile fix 2016-06-30 16:00:29 -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
theoreticalbts
3865dd1573 Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-25 20:15:32 -04:00
theoreticalbts
eb7f2f70d8 Merge remote-tracking branch 'abitmore/patch-4' into develop #633 2016-03-22 14:12:54 -04:00
abitmore
20f75ebaf0 Fix cli_wallet out-of-source builds #633 2016-03-20 15:34:10 +01:00
Nathan Hourt
b2835bc02d Add headers to install targets 2016-03-17 17:16:13 -05: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
ee3f81fa31 Fix build broken by previous patch #592 2016-03-15 15:58:02 -04:00
theoreticalbts
a7c88be7c7 debug_api: Add API call to stream JSON objects to file 2016-03-15 13:36:29 -04:00
theoreticalbts
77ac461a8a Implement debug_node target #606 2016-03-15 13:36:29 -04: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
e34b83c872 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 2f941c718f 2016-02-16 12:19:59 -05:00
Daniel Larimer
2f941c718f Fix #586 - decoding memo for sender in CLI wallet 2016-02-16 12:07:24 -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
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
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
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
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
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
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
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
theoreticalbts
61687790e3 wallet: Remove libraries/wallet/cache.cpp #510 2016-01-08 11:29:39 -05:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
Fabian Schuh
a2ce86bf4f Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account' 2015-12-10 13:01:53 +01:00
theoreticalbts
020dc2e789 Merge branch 'graphene/develop' into prerel-2015-12-07 2015-12-07 17:45:45 -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
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
theoreticalbts
47585a6b9a Fix cli_wallet referrer percentage type #449 2015-11-19 14:11:40 -05:00
Scott Howard
70d364251a add cancel_order to wallet api #424 2015-11-02 17:53:57 -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
Daniel Larimer
20c8ca8fa1 Fix #398 - reserve_asset was calling fund_fee_pool in wallet 2015-10-30 11:18:52 -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
57969d5018 cli_wallet: Show txid's for transactions in blocks 2015-10-23 15:00:31 -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
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
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
6b1b794ff4 prevent excessive saving of wallet backups 2015-10-15 13:52:28 -04:00
Daniel Larimer
15e4464300 Merge branch 'master' into bitshares 2015-10-14 14:50:38 -04:00
Daniel Larimer
6a117572fd prevent excessive saving of wallet backups 2015-10-13 18:19:07 -04:00
Eric Frias
21caba4cfa remove stray semicolon that confuses doxygen 2015-10-13 10:44:18 -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
837e4f254e wallet.cpp: More detailed logging of exception when broadcasting 2015-10-09 17:22:56 -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
Eric Frias
9261314997 Merge branch 'github_master' 2015-10-06 17:15:34 -04:00
theoreticalbts
6daa54da46 cli_wallet: Implement propose_fee_change 2015-09-29 11:55:26 -04:00
theoreticalbts
96e8f8dd6d cli_wallet: Improve propose_parameter_change interface 2015-09-29 11:55:26 -04:00
Eric Frias
bdbb94de31 Add missing default constructors for serialized types 2015-09-22 15:11:28 -04:00
Daniel Larimer
93c72b0595 wallet api now returns the memo and a human readable description 2015-09-14 11:33:18 -04:00
theoreticalbts
358a88037c wallet.cpp: Subscribe to block updates, fix #302 2015-09-10 15:56:08 -04:00
theoreticalbts
0b6f7fe430 wallet.cpp: Ask remote DB for accounts on startup 2015-09-10 15:41:43 -04:00
theoreticalbts
b84154d6e7 wallet.cpp: Call update_account() to sync all account states to the blockchain when loading a wallet 2015-09-08 16:08:15 -04:00
Daniel Larimer
198cfd1231 Merge branch 'master' of github.com:cryptonomex/graphene 2015-09-02 18:43:21 -04:00
Daniel Larimer
1ebd0f5af6 Updating wallet to report participation rate. 2015-09-02 18:42:42 -04:00
theoreticalbts
d2092e0d3a cli_wallet: Expose network_node API 2015-09-02 14:56:48 -04:00
theoreticalbts
b0fd510d51 cli_wallet: Print signing_key in base58 2015-09-01 16:33:11 -04:00
theoreticalbts
efac97e060 cli_wallet: Implement withdrawal for vesting balance objects #286 2015-09-01 16:21:35 -04:00
theoreticalbts
2f88cc86ba cli_wallet: Implement update_witness command #282 2015-09-01 16:21:33 -04:00
theoreticalbts
a23e2ec3fe cli_wallet: Include block_id and signed_by in get_block API result #253 2015-08-28 00:19:45 -04:00
Daniel Larimer
2a494d9de0 Merge branch 'witness_schedule_refactor' 
Also fix object_id addition
 2015-08-27 11:33:42 -04:00
Daniel Larimer
e5106c15a3 update subscribe callback 2015-08-26 18:01:48 -04:00