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

137 commits

Author SHA1 Message Date
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
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
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -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
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
oxarbitrage
2c473285b6 issue191 
Adding date parameters to cli wallet function get_market_history
 2017-03-01 12:02:28 -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
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
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
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
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
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