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
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
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
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
7aa33928f8
Merge branch 'master' into bitshares
2015-10-23 17:39:25 -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
15e4464300
Merge branch 'master' into bitshares
2015-10-14 14:50:38 -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
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
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
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
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
Vikram Rajkumar
be55df25d0
Initial work on BTS1 key import in CLI wallet
2015-08-14 17:06:29 -04:00
Vikram Rajkumar
d324a78809
Update BTS1 key import format
2015-08-14 12:43:12 -04:00
theoreticalbts
2e9876b557
Implement chain-locked transactions
2015-08-06 12:56:37 -04:00
Daniel Larimer
7e142eb4d6
Wallet Blind Transfer Implementation
...
Improve Pretty Printing of Operations
Fix bug preventing wallet from being unlocked after saving while locked.
Transfer from public to blind
Transfer from blind to blind
Transfer from blind to public
Blind Account History
2015-07-24 17:02:06 -04:00
Daniel Larimer
e4ff106cd4
Partial Wallet support for Blind Transfers
...
public->blind
blind->blind
TODO: blind->public
2015-07-24 11:37:37 -04:00