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

3382 commits

Author SHA1 Message Date
Manfred Karrer
ce62f74eb9 Refactoring: rename method 2017-07-11 21:01:47 +02:00
Manfred Karrer
9b394794ee Adjust setup procedure 2017-07-11 20:45:52 +02:00
Manfred Karrer
c76a4ac898 Use txOutputType = TxOutputType.UNDEFINED; instead of null 2017-07-11 20:45:33 +02:00
Manfred Karrer
d4867f712a Fix null pointer 2017-07-11 15:28:01 +02:00
Manfred Karrer
e2af215a57 Set txOutputType default to TxOutputType.UNDEFINED instead of null 2017-07-11 15:27:47 +02:00
Manfred Karrer
be8703fdac Move check for peer address after message type check 2017-07-10 16:58:28 +02:00
Manfred Karrer
fc9acb4eb4 Fix check if onMessage at connection is matching requested peer address 2017-07-10 16:55:27 +02:00
Manfred Karrer
67134651ee Improve log 2017-07-10 16:53:45 +02:00
Manfred Karrer
bda069fd17 Fix null pointers 2017-07-10 12:42:54 +02:00
Manfred Karrer
77f8bdb7b0 Merge branch 'master' into DAO_phase1 2017-07-09 23:07:04 +02:00
Manfred Karrer
7a8e99d7b1 Apply Protobuffer to DAO data 2017-07-08 01:36:35 +02:00
Manfred Karrer
7e96ee51f9 Refactoring: move package, rename RequestManager 2017-07-06 22:47:04 +02:00
Manfred Karrer
10fe5493eb Add getBlocks handler 2017-07-06 21:57:24 +02:00
Manfred Karrer
973a4db739 Check if seedNodes are available atrequestPreliminaryData call and set isBootstrapped to true if not available and call listeners (onNoSeedNodeAvailable). 2017-07-06 13:24:07 +02:00
Manfred Karrer
c9e44a734c Add optional requestFees call. 2017-07-06 13:23:46 +02:00
Manfred Karrer
0572f2e009 Move code from constructor to onAllServicesInitialized 2017-07-05 23:42:15 +02:00
Manfred Karrer
e75bc9023e Dev setup 2017-07-05 23:40:35 +02:00
Manfred Karrer
a240ae30d1 Fix Statistics node 2017-07-03 20:49:30 +02:00
Manfred Karrer
034b68446d Adjust BSQ fee 2017-07-03 20:48:21 +02:00
Manfred Karrer
f5479eca2c Merge branch 'master' into Development 2017-07-03 02:37:24 +02:00
Manfred Karrer
3deb80d23c Add check for areWalletsAvailable 2017-07-03 02:30:45 +02:00
Manfred Karrer
301bbb3814 Remove dev log 2017-07-01 04:09:05 +02:00
Manfred Karrer
6d5868eaa4 Filter old trade statistic items 2017-07-01 03:05:28 +02:00
Manfred Karrer
9ac05ad28e Fix missing entryMap init for seednodes 2017-07-01 03:05:14 +02:00
Manfred Karrer
73f2139923 Fixed missing price update in offerbook table. 
Rename currenciesUpdateFlagProperty to updateCounterProperty.
Remove dev logs
 2017-07-01 00:11:20 +02:00
Manfred Karrer
875db1f32e Move base currency/network selection from network settings to preferences 2017-06-30 22:01:35 +02:00
Manfred Karrer
926f317a37 Add support for different REFERENCE_DEFAULT_MIN_TX_FEE by base currency 2017-06-30 21:29:32 +02:00
Manfred Karrer
5be0a3750e Add btc address validator to last trade step for withdrawal. 
Remove dontshow again option for tx summary popup.
 2017-06-30 21:03:36 +02:00
Manfred Karrer
45001ad965 Increase timeout to 2 min 2017-06-30 20:27:08 +02:00
Manfred Karrer
bb0f0ec273 Add callback for tradeFee tx to be seen in the network to avoid errors at take offer that the trade address is not funded. 2017-06-30 20:17:27 +02:00
Mike Rosseel
ad742403c9 fix merge errors - deleted files 2017-06-30 16:53:18 +02:00
Manfred Karrer
35635c7b9d Turn off logs for BlockingClient 2017-06-30 13:10:53 +02:00
Mike Rosseel
cdc9649dd2 Merge remote-tracking branch 'origin/Development' into issue544-api 2017-06-30 11:21:02 +02:00
Manfred Karrer
31ace1c5d3 Fix missing handling of diff. PersistedEntryMaps (trade statistics) from resource file 2017-06-29 20:22:08 +02:00
Mike Rosseel
0ffac07fd6 Merge branch 'Development' into issue544-api 
Conflicts:
	api/src/main/java/io/bisq/api/app/Api.java
	api/src/main/java/io/bisq/api/app/ApiModule.java
	common/src/main/java/io/bisq/common/app/Version.java
	common/src/main/java/io/bisq/common/crypto/PGP.java
	common/src/main/java/io/bisq/common/locale/BankUtil.java
	common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
	common/src/main/java/io/bisq/common/locale/LanguageUtil.java
	common/src/main/java/io/bisq/common/locale/Res.java
	common/src/main/java/io/bisq/common/proto/ProtoUtil.java
	common/src/main/java/io/bisq/common/storage/FileManager.java
	common/src/main/java/io/bisq/common/storage/Storage.java
	common/src/main/proto/pb.proto
	common/src/main/resources/i18n/displayStrings.properties
	common/src/main/resources/i18n/displayStrings_de.properties
	common/src/main/resources/i18n/displayStrings_es.properties
	common/src/main/resources/i18n/displayStrings_sr.properties
	common/src/main/resources/i18n/in_dev/displayStrings_es.properties
	core/src/main/java/io/bisq/core/alert/Alert.java
	core/src/main/java/io/bisq/core/app/BisqEnvironment.java
	core/src/main/java/io/bisq/core/app/BisqExecutable.java
	core/src/main/java/io/bisq/core/arbitration/messages/DisputeCommunicationMessage.java
	core/src/main/java/io/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
	core/src/main/java/io/bisq/core/btc/wallet/BisqDeterministicKeyChain.java
	core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java
	core/src/main/java/io/bisq/core/btc/wallet/BtcDeterministicKeyChain.java
	core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java
	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bisq/core/dao/DaoPeriodService.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqFullNode.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqLiteNode.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
	core/src/main/java/io/bisq/core/dao/blockchain/btcd/PubKeyScript.java
	core/src/main/java/io/bisq/core/dao/blockchain/btcd/ScriptTypes.java
	core/src/main/java/io/bisq/core/dao/blockchain/json/JsonSpentInfo.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqChainState.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqFullNodeExecutor.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqParser.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/IssuanceVerification.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/OpReturnVerification.java
	core/src/main/java/io/bisq/core/dao/blockchain/parse/RpcService.java
	core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutputType.java
	core/src/main/java/io/bisq/core/dao/vote/VotingDefaultValues.java
	core/src/main/java/io/bisq/core/filter/Filter.java
	core/src/main/java/io/bisq/core/offer/OfferPayload.java
	core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
	core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
	core/src/main/java/io/bisq/core/payment/NationalBankAccount.java
	core/src/main/java/io/bisq/core/payment/PaymentAccountList.java
	core/src/main/java/io/bisq/core/payment/SameBankAccount.java
	core/src/main/java/io/bisq/core/payment/SepaAccount.java
	core/src/main/java/io/bisq/core/payment/SpecificBanksAccount.java
	core/src/main/java/io/bisq/core/payment/payload/BankAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/CashDepositAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/NationalBankAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
	core/src/main/java/io/bisq/core/payment/payload/SameBankAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/SepaAccountPayload.java
	core/src/main/java/io/bisq/core/payment/payload/SpecificBanksAccountPayload.java
	core/src/main/java/io/bisq/core/trade/Trade.java
	core/src/main/java/io/bisq/core/trade/protocol/SellerAsMakerProtocol.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/CheckIfPeerIsBanned.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessPayDepositRequest.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyArbitratorSelection.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyMediatorSelection.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/CreateTakerFeeTx.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerProcessPublishDepositTxRequest.java
	core/src/main/java/io/bisq/core/user/PreferencesPayload.java
	core/src/main/resources/bisq.policy
	core/src/test/java/io/bisq/core/arbitration/ArbitratorTest.java
	core/src/test/java/io/bisq/core/dao/vote/VoteManagerTest.java
	core/src/test/java/io/bisq/core/dao/vote/VotingDefaultValuesTest.java
	core/src/test/java/io/bisq/core/payment/OKPayAccountPayloadTest.java
	core/src/test/java/io/bisq/core/trade/TradableListTest.java
	core/src/test/java/io/bisq/core/util/ProtoUtilTest.java
	doc/CONTRIBUTING.md
	doc/bisq-sn.cron.sh
	doc/bisq-sn.init.sh
	doc/build.md
	doc/install_on_unix.sh
	doc/monitor-bisq-sn.cron.sh
	doc/protobuffer.md
	doc/seed-node-daemon.md
	gui/src/main/java/io/bisq/gui/app/BisqApp.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java
	gui/src/main/java/io/bisq/gui/main/MainView.java
	gui/src/main/java/io/bisq/gui/main/MainViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java
	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml
	gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml
	gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml
	gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java
	gui/src/main/java/io/bisq/gui/main/debug/DebugView.java
	gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java
	gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java
	gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
	gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
	gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml
	gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
	gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java
	gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
	gui/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java
	gui/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java
	gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java
	gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java
	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
	jtorproxy/src/main/java/io/nucleo/net/Connection.java
	jtorproxy/src/main/java/io/nucleo/net/Node.java
	network/pom.xml
	network/src/main/java/io/bisq/network/Socks5ProxyProvider.java
	network/src/main/java/io/bisq/network/Socks5SeedOnionDiscovery.java
	network/src/main/java/io/bisq/network/p2p/storage/payload/ExpirablePayload.java
	network/src/main/java/io/bisq/network/p2p/storage/payload/MailboxStoragePayload.java
	network/src/main/java/io/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java
	network/src/main/java/io/bisq/network/p2p/storage/payload/StoragePayload.java
	network/src/main/resources/PersistedEntryMap
	network/src/test/java/io/bisq/network/crypto/EncryptionServiceTests.java
	network/src/test/java/io/bisq/network/p2p/network/NetworkStressTest.java
	network/src/test/java/io/bisq/network/p2p/storage/P2PDataStorageTest.java
	package/linux/32bitBuild.sh
	package/linux/64bitBuild.sh
	package/mac/bisq.icns
	package/mac/bisq.iconset/icon_128x128.png
	package/mac/bisq.iconset/icon_128x128@2x.png
	package/mac/bisq.iconset/icon_16x16.png
	package/mac/bisq.iconset/icon_16x16@2x.png
	package/mac/bisq.iconset/icon_256x256.png
	package/mac/bisq.iconset/icon_256x256@2x.png
	package/mac/bisq.iconset/icon_32x32.png
	package/mac/bisq.iconset/icon_32x32@2x.png
	package/mac/bisq.iconset/icon_512x512.png
	package/mac/bisq.iconset/icon_512x512@2x.png
	package/mac/create_app.sh
	package/osx/Info.plist
	package/osx/finalize.sh
	package/windows/32bitBuild.bat
	package/windows/64bitBuild.bat
	package/windows/bisq-setup-icon.bmp
	package/windows/bisq.ico
	pom.xml
	provider/src/main/java/io/bisq/provider/fee/FeeRequestService.java
	provider/src/main/java/io/bisq/provider/price/PriceRequestService.java
	statistics/src/main/java/io/bisq/statistics/Statistics.java
	statistics/src/main/java/io/bitsquare/statistics/Statistics.java
	statistics/src/main/resources/logback.xml
 2017-06-29 16:40:32 +02:00
Mike Rosseel
a0ecf38cf0 Revert "Revert "bisq -> Bisq"" 
This reverts commit 1dd3245347.
 2017-06-29 15:29:13 +02:00
Mike Rosseel
e851db1f01 merge 2017-06-29 15:08:33 +02:00
Mike Rosseel
1dd3245347 Revert "bisq -> Bisq" 
This reverts commit fc863b8278.
 2017-06-29 14:07:19 +02:00
Mike Rosseel
fc863b8278 bisq -> Bisq 2017-06-29 11:42:59 +02:00
Manfred Karrer
7441f346a2 Fix issue with InsufficientMoneyException 2017-06-28 13:14:09 +02:00
Manfred Karrer
d6e3bdd100 Fix issue with InsufficientMoneyException 2017-06-28 12:45:23 +02:00
Manfred Karrer
8197be2c8a Cleanup TODOs 2017-06-27 21:47:03 +02:00
Manfred Karrer
e11b314bbb Add email to bank accounts. Add warning and info for bank accounts regarding chargeback risk and id verification. Add warning to CXC accounts. 2017-06-27 21:05:47 +02:00
Manfred Karrer
e258b17e7a Update license with Bisq instead of bisq 2017-06-27 01:39:11 +02:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
46d8e6bc05 Use new BTD DAO genesis tx. Use BTC as default currency. Use BTC as base currency for DAO. Deactivate dev key for arbitrator 2017-06-27 00:07:34 +02:00
Manfred Karrer
724615b4ad Fix navigation issue. adjust logging. 2017-06-26 20:12:15 +02:00
Manfred Karrer
61b9766052 Use BTC as base currency for BSQ. 
Update PersistedEntryMap (trade statistics)
Remvoe amountTextField from BSQ receive view.
Disable other menu iems in DAO view, show disabled tabs of phase 2.
Fix nullpointer with setTradeCurrencyFromPaymentAccount in CreateOfferDataModel.
 2017-06-26 19:24:36 +02:00
Manfred Karrer
728dead33c Add timeout and resend support for p2p messages in trade process 2017-06-26 16:09:59 +02:00