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

102 commits

Author SHA1 Message Date
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
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
theoreticalbts
4c09d6b8ed cli_wallet: Implement worker creation and voting 2015-10-20 13:26:25 -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
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
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
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
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
theoreticalbts
59a3ca32b7 Remove secret hashes from witnesses 2015-08-26 17:43:00 -04:00
theoreticalbts
19d10e462c Implement GRAPHENE_PROXY_TO_SELF_ACCOUNT #267 2015-08-26 17:09:49 -04:00
theoreticalbts
6c052294e1 Remove block randomness and rewrite witness scheduling 2015-08-26 15:36:27 -04:00
theoreticalbts
d1484fb41e cli_wallet: Implement approve_proposal to more easily approve proposals 2015-08-25 18:02:52 -04:00
theoreticalbts
1d2dc6abda cli_wallet: Implement propose_parameter_change to more easily make proposals 2015-08-25 18:02:52 -04:00
Daniel Larimer
a79eff2761 progress toward witness schedule refactor 2015-08-25 13:45:20 -04:00
theoreticalbts
aeebb1be09 cli_wallet: Copy ws_server, ws_user, ws_password to new wallet 2015-08-24 15:15:31 -04:00
theoreticalbts
6372b25dea cli_wallet: Expose get_private_key() 2015-08-20 18:49:15 -04:00
theoreticalbts
3a7e65c888 chain_property_object: Implement chain_property_object as container for unchangeable properties set at genesis #238 2015-08-17 13:38:35 -04:00
Vikram Rajkumar
be55df25d0 Initial work on BTS1 key import in CLI wallet 2015-08-14 17:06:29 -04:00