Mike Rosseel
f3d1c87d4e
hand-merge of policyfile-dev branch
2017-02-20 17:04:17 +01:00
Mike Rosseel
f531659bf2
Merge branch 'DAO' into policyfile
2017-02-20 15:31:35 +01:00
Mike Rosseel
26aa1ae48d
Merge branch 'DAO' into policyfile
...
Conflicts:
package/mac/create_app.sh
package/windows/32bitBuild.bat
package/windows/64bitBuild.bat
2017-02-20 15:16:13 +01:00
Manfred Karrer
a24609e21b
Check that MultiSig address entry matches stored pubKey. Save pubKey in processModel. Add more logging of txs.
2017-02-19 19:01:52 -05:00
Manfred Karrer
aa084dba28
User percentage based trade fee as well as market price based factor. Display % in fee info popups.
2017-02-19 13:40:47 -05:00
Manfred Karrer
0580e73179
Use new tx and trade fees. UI improvements, remove trade fee from provider data
2017-02-16 15:43:38 -05:00
Manfred Karrer
839670739d
Cleanup
2017-02-12 14:09:01 -05:00
Manfred Karrer
d666490424
Set v 0.5.0.0, fix issues after merge.
2017-02-12 13:38:26 -05:00
Manfred Karrer
358f292cbe
Merge branch 'Development' into DAO
...
# Conflicts:
# common/src/main/java/io/bitsquare/app/Version.java
# core/src/main/java/io/bitsquare/btc/FeePolicy.java
# core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java
# core/src/main/java/io/bitsquare/btc/WalletService.java
# core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
# core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
# core/src/main/java/io/bitsquare/trade/BuyerTrade.java
# core/src/main/java/io/bitsquare/trade/SellerTrade.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java
# gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
# network/src/main/resources/PersistedP2PStorageData
# package/mac/create_app.sh
# pom.xml
# provider/src/main/java/io/bitsquare/provider/ProviderMain.java
# provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java
2017-02-12 12:59:29 -05:00
Manfred Karrer
246b15bee9
Add util for printing all altcoins for adding to FAQ page
2017-02-11 22:33:08 -05:00
Manfred Karrer
f42628fcd8
Add offer as parameter to getSecurityDeposit and getFixedTxFeeForTrades calls if available to support trades between different protocol versions
2017-02-11 21:06:01 -05:00
Manfred Karrer
890c724a87
Prepare for v 0.4.9.9
2017-02-10 19:49:33 -05:00
Manfred Karrer
49940b6420
Small adoptions, cleanups
2017-02-10 19:47:44 -05:00
Manfred Karrer
7028b3afef
Add checkIfOpenOffersMatchTradeProtocolVersion method at startup
2017-02-10 18:36:32 -05:00
Manfred Karrer
6cf439b8bd
Connect to local Bitcoin Core node if it is running (ignore use Tor flag)
2017-02-10 16:33:17 -05:00
Manfred Karrer
6a03ce31e1
Fix missing breaks
2017-02-10 16:33:04 -05:00
Manfred Karrer
891580f458
Add test for version update check (support versions with more then 4 digits)
2017-02-10 14:11:26 -05:00
Manfred Karrer
376adb6d1e
Move digest-enforcer-rules to gui module and add more entries
2017-02-09 23:58:55 -05:00
Manfred Karrer
75946a3901
Add SWT
2017-02-09 18:00:17 -05:00
Mike Rosseel
6c6937f61f
add maven dependency check plugin
2017-02-09 16:22:45 +01:00
Manfred Karrer
8c57616f7a
Remove used key
2017-02-08 18:35:34 -05:00
Manfred Karrer
a83acbeb25
Reduce tx fee, sec. deposit and createe offer fee, cleanup, comments update
2017-02-08 16:15:14 -05:00
Manfred Karrer
c6f5c9ecb5
Increase trade and offer availability timeouts
2017-02-07 21:05:32 -05:00
Manfred Karrer
4cafddabc7
Add version nr to offer id, use more randomized prefix for short id
2017-02-07 19:44:45 -05:00
Manfred Karrer
d65e098933
Increase tx fee to 0.0007 btc, increase tradeprotocol version, change log level for tx details to INFO
2017-02-07 18:47:20 -05:00
Manfred Karrer
088370fa1d
Remove duplicate entry
2017-02-07 10:35:49 -05:00
Manfred Karrer
283b4723e6
Added Botswana
2017-02-07 10:11:08 -05:00
Manfred Karrer
d88aceddf8
Clean up, add missing coins (LTBcoin, SFSC)
2017-02-07 10:05:15 -05:00
Manfred Karrer
86face32d6
Add PIVX
2017-02-06 22:42:44 -05:00
Manfred Karrer
e1d917f6c7
Merged PR ( https://github.com/bitsquare/bitsquare/pull/730 ) with some fixes and improvements. Use bitcoinj v 0.13.1.8
2017-02-03 07:42:33 -05:00
Manfred Karrer
7cba76fbe9
Revert merged PR ( https://github.com/bitsquare/bitsquare/pull/730 )
2017-02-02 20:36:10 -05:00
Manfred Karrer
a1e7ccc1bf
Merge pull request #730 from dan-da/hiddenservices_pr
...
DNS lookups over Tor and connecting bitcoinj to .onion addresses.
2017-02-02 19:24:54 -05:00
Manfred Karrer
e14d70b9d9
Correct input validation of Norwegian bank account numbers
...
(https://github.com/bitsquare/bitsquare/pull/707 )
2017-02-02 19:23:19 -05:00
Mike Rosseel
a71ee3a9a0
remove commented out adding of property files. A full rework of this class is outside of the scope of this task but some things can surely be removed.
2017-01-30 08:11:56 +01:00
Manfred Karrer
3d60ad4d76
Improve logs
2017-01-28 17:12:06 +01:00
Manfred Karrer
051c5259b0
Adjust fields for Chile
2017-01-28 17:09:37 +01:00
Mike Rosseel
52b0e547e3
small fixes
2017-01-26 09:08:31 +01:00
Mike Rosseel
a7f590d6a3
more runtime permissions needed
2017-01-25 09:54:10 +01:00
Mike Rosseel
7dac393e61
after tests in production
2017-01-24 21:23:20 +01:00
Mike Rosseel
0581d05eca
Merge branch 'DAO' into policyfile
2017-01-24 08:44:20 +01:00
Mike Rosseel
fd643a7a88
working policy file
2017-01-24 08:43:53 +01:00
danda
9da8939aa6
Changes to support DNS lookups over Tor:
...
+ Add DnsTorLookup class that uses Tor Socks5 RESOLVE extension.
+ Add Socks5DnsDiscovery class that runs on separate threads for each lookup
Changes to support connecting to .onion addresses:
+ Add Socks5SeedOnionDiscovery class for discovery of .onion seeds.
+ Add Socks5MultiDiscovery wrapper class with modes for using ipv4 seeds, .onion seeds, dns, or all/mixed.
remove unused class
2017-01-21 08:45:49 -08:00
Manfred Karrer
e224422b83
Cleanup
2017-01-17 22:33:15 +01:00
Manfred Karrer
8f871e2629
Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests
2017-01-17 02:56:30 +01:00
Manfred Karrer
37a8d6af94
et pubkey transient and use bytearray instead
2017-01-10 16:40:56 +01:00
Manfred Karrer
dd591a44da
Remove UTXOProvider -> use CoinSelector instead. Add prog args for block and wallet notification ports for rpc to support 2 apps
2017-01-10 03:06:58 +01:00
Manfred Karrer
7ea1718d86
Fix wrong txId in SquUtxo, use walletFactroy and custom SquWallet (WIP)
2017-01-10 00:06:01 +01:00
Manfred Karrer
1fd526199d
Add bitcoind rpc service for requesting blocks. Add params in voting. Change UI for voting. (WIP)
2017-01-08 22:09:41 +01:00
Manfred Karrer
10a5e84a4a
Add Byte
2017-01-06 00:35:12 +01:00
Manfred Karrer
7fde564e80
Use key of SQU input for signing
2017-01-04 20:18:53 +01:00
