mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
3520 commits 3 branches 150 tags 4.1 GiB
Commit graph

1112 commits

Author SHA1 Message Date
Manfred Karrer
3441286d46 Add null check 2017-03-04 17:36:36 -05:00
Manfred Karrer
f0bf3daddf Update top altcoin list 2017-03-04 17:21:33 -05:00
Manfred Karrer
560cb0af80 Show sat/byte at tx print 2017-03-04 13:31:52 -05:00
Manfred Karrer
e553a038f5 Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set 2017-03-03 18:37:33 -05:00
Manfred Karrer
63c4bc546f Add TODO 2017-03-03 10:57:06 -05:00
Manfred Karrer
28a704ed85 Fix bug with backup path when path became invalid. Improve backup handling and UI. 2017-03-01 20:46:17 -05:00
Manfred Karrer
bbe7192041 Refactor Wallet classes 2017-03-01 19:49:23 -05:00
Manfred Karrer
27306cee11 Add checkpoint for testnet (again) 2017-03-01 18:29:43 -05:00
Manfred Karrer
c6897f730a Update comment 2017-03-01 11:33:34 -05:00
Manfred Karrer
f5b503deaf Update bip 44 nr to 142 2017-03-01 11:33:05 -05:00
Manfred Karrer
0d863fc163 Remove testnet checkpoint 2017-03-01 11:26:40 -05:00
Manfred Karrer
68494bd83d Update to checkpoint of block: 
000000000000000002884993a2b7306aa7b2af94b6ffe00bc7c689738f7816c6 from: 2017-01-22
 2017-03-01 11:26:00 -05:00
Manfred Karrer
f27437b008 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing. 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
 2017-03-01 10:19:23 -05:00
Manfred Karrer
4e467b9530 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing. 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
 2017-03-01 10:18:44 -05:00
Mike Rosseel
5b5329ffd4 fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer 2017-03-01 09:20:13 +01:00
Manfred Karrer
9704619f6b Merge remote-tracking branch 'origin/Development' into Development 2017-02-28 09:57:14 -05:00
Manfred Karrer
a239ccee10 Remove debug logs 2017-02-28 09:55:37 -05:00
Manfred Karrer
ab01e97ddc Move BTC_NODES and USE_TOR_FOR_BTC to BtcOptionKeys 2017-02-25 13:23:35 -05:00
Manfred Karrer
60597cec88 Rename all appearances of squ to bsq 2017-02-25 10:45:22 -05:00
Manfred Karrer
073302827b Add BSQ to altcoin list 2017-02-25 10:01:46 -05:00
Manfred Karrer
134b0a1220 Replace SQU with BSQ 2017-02-25 09:59:32 -05:00
Manfred Karrer
f5d05f0940 Fix null pointers, improve logs 2017-02-24 15:03:26 -05:00
Manfred Karrer
972721cdba Add more logs to empyt wallet and double spend method 2017-02-23 14:13:10 -05:00
Manfred Karrer
478ecac255 Merge branch 'master' into Development 2017-02-23 14:07:37 -05:00
Manfred Karrer
01fbab60b7 Fix missing tx fee at Empty Wallet method. Add more logs 2017-02-23 14:06:06 -05:00
Mike Rosseel
60e3f155b6 use correct version of neemre 2017-02-22 08:57:20 +01:00
Manfred Karrer
aae9479e1b Use same seed for both BTC and SQU wallet 2017-02-21 15:51:35 -05:00
Manfred Karrer
16ca619057 Overwrite first with random bytes before setting aesKey null 2017-02-21 09:45:56 -05:00
Manfred Karrer
2c211a9ae4 Add comments 2017-02-20 18:15:26 -05:00
Manfred Karrer
827c581a73 Make security deposit customizable at offer creation (allowed range: 0.001 BTC - 0.2 BTC). 
Use new max. trade limits
 2017-02-20 17:58:07 -05:00
Manfred Karrer
159b208273 Add btcd-cli4j lib as local build jar instead of using http repo. Add exclude for diff. version dependencies. 2017-02-20 14:29:58 -05:00
Manfred Karrer
fb63fd7c94 Merge branch 'policyfile' into DAO 2017-02-20 13:32:16 -05:00
Manfred Karrer
023d20da7a Add missing class 2017-02-20 13:30:41 -05:00
Mike Rosseel
f3d1c87d4e hand-merge of policyfile-dev branch 2017-02-20 17:04:17 +01:00
Manfred Karrer
78a8e1ba39 Use percentage based price as default, swap input text controls when toggle between fixed price and percentage based price. Hide percentage based inputs if no market price is available. 2017-02-20 11:02:54 -05: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
Mike Rosseel
5d6537a0d2 Removed the spring bug fix class because upgrading to 4.3.6-RELEASE fixed the bug + no more confusion on import between the two classes. Bitsquare now starts again, P2P to be tested 2017-02-20 09:50:09 +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
4f0d6484c5 Add saving of addressEntryList at each change of list, remove usage of AddressEntry in TradeWalletService. 
Add pubKey to contract window at trade details popup.
Remove unused arrays in SpendFromDepositTxWindow.
 2017-02-19 13:14:27 -05:00
Mike Rosseel
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01: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
Mike Rosseel
17798cabf0 move apps back to where they belong 2017-02-16 14:13:34 +01:00
Mike Rosseel
b8a68658b0 fromProtoBuf is code complete 2017-02-16 09:04:23 +01:00
Mike Rosseel
22d5d5267b compiles again 2017-02-14 17:33:35 +01: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