Eric Frias
14295772f0
Merge branch 'bitshares-2-bitshares'
...
# Conflicts:
# libraries/fc
2016-02-26 11:29:25 -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
