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

6051 commits

This branch
This branch
All branches
Author SHA1 Message Date
sqrrm
56f4caf7bc
Add basic UI for bond lockup 2018-06-25 13:53:33 +02:00
Manfred Karrer
61b8b5f28e
Merge branch 'merit' into voting 2018-06-19 19:53:43 +02:00
Manfred Karrer
a4debc7c87
Add merit implementation 2018-06-19 19:51:57 +02:00
Manfred Karrer
aab1f579ab
Merge branch 'voting' into merit 2018-06-16 21:18:27 +02:00
Manfred Karrer
a21fed6b52
Merge branch 'api-integration' into voting 
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
 2018-06-16 14:48:20 +02:00
Manfred Karrer
ba011d4629
Merge branch 'api-integration' into voting 
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
 2018-06-16 14:22:51 +02:00
Manfred Karrer
9c3865a331
Use verbosity in getBlock rpc call to get all txs 
Update to btcd-cli4j cb5c474b
 2018-06-16 13:39:27 +02:00
Manfred Karrer
ac17955dbe
Add mavenLocal to repositories 2018-06-16 13:15:58 +02:00
Manfred Karrer
15baead905
Add mavenLocal, updatte hashes 2018-06-08 13:42:58 +02:00
Manfred Karrer
b2aaed9c0d
Remove protectedDataStore at blindVote 
- Fix issue with same address for change and issuance candidate (use freshReceiveAddress instead of currentReceiveAddress)
- Check if issuance candidate ended up in an issuance tx at StateService.isBsqTxOutputType
- Change dust value to 546
- Remove blockHash in BlindVoteAppendOnlyPayload
 2018-06-08 13:25:23 +02:00
Manfred Karrer
de9ced06d3
Merge branch 'master' into voting 2018-06-07 09:01:47 +02:00
Manfred Karrer
f5c92097de
Complete API refactoring. 
Supported demo use case:

Case 1: Run Desktop + API
- Run Bisq Desktop app with gRPC server (pass option key to enable it)
- Run gRPC client
- Fund Bisq Desktop with some BTC balance
- Call getBalance on gRPC client -> get satoshi of available balance

Case 2: Run gRPC API headless

The HTTP API classes are prepared and should work with the same model,
but there is nothing integrated fro the existing API project as that
will require bigger refactorings and changes on their side.
 2018-06-06 19:05:49 +02:00
Manfred Karrer
bf46320cbc
Merge branch 'refactoring-mainviewmodel' into api-integration 
# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
 2018-06-06 15:10:54 +02:00
Manfred Karrer
07e3d64cc9
Add popup if bitcoinLocalhostNode detected 2018-06-06 12:01:42 +02:00
Manfred Karrer
a1baf59b16
Merge branch 'master' into refactoring-mainviewmodel 2018-06-06 11:54:47 +02:00
Manfred Karrer
35e5d82ece
Fix concurrent modification error 2018-06-05 13:24:41 +02:00
Manfred Karrer
175e11d81c
Update build.gradle to fix failing checksum tests 
The calculated checksum from the calculateChecksums task did not
reflect updates of libdohj and bitcoinj.
libdohj is a dependency in common but seems the calculateChecksums task
in desktop did not resolve that correctly. It did not change the
checksum after the libdohj version has changed and led to build errors.
Adding the libdohj dependency in Desktop as well solves the issue.
@bceams: If there is a better solution to solve that feel free to
revert and apply....
 2018-06-05 11:52:41 +02:00
Manfred Karrer
f1d9563c14
Add headless BisqCoreApp and BisqCoreAppMain 2018-06-03 21:11:26 +02:00
Manfred Karrer
59dbc34ff8
Move checkForCorrectOSArchitecture to BisqSetup 2018-06-03 20:08:35 +02:00
Manfred Karrer
598bcb10b8
Add MarketPricePresentation to guice module 2018-06-03 20:02:37 +02:00
Manfred Karrer
76879ac13b
Refactoring MainViewModel 
- Move p2p network setup code code to P2PNetworkSetup
- Move wallet setup code code to WalletAppSetup
- Move marketPrice code to MarketPricePresentation
 2018-06-03 20:00:29 +02:00
Manfred Karrer
d914eaab00
Group wallet init code 
- Move filter code to CorruptedDatabaseFilesHandler.getCorruptedDatabaseFiles
- Add tradeManager.getSetOfAllTradeIds
 2018-06-03 14:50:30 +02:00
Manfred Karrer
eba5389348
Remove checkIfOpenOffersMatchTradeProtocolVersion method 2018-06-03 14:34:56 +02:00
Manfred Karrer
0c6fb8688c
Remove removeOffersWithoutAccountAgeWitness method 2018-06-03 14:24:57 +02:00
Manfred Karrer
89389abd30
Refactor TradeManager startup code 
- Group TradeManager startup code to initTradeManager
- Move applyTradePeriodState and updateTradePeriodState to TradeManager
 2018-06-03 14:21:47 +02:00
Manfred Karrer
0aecfe4fed
Introduce presentation classes in core 
- Add BalanceModel in core
- Add BalancePresentation, DisputePresentation and TradePresentation in core
- Remove balance calculation code from MainViewModel to BalanceModel
- Move BSFormatter and BSQFormatter to core
- Move onTradesChanged to TradeManager
- Add CorePresentationModule
 2018-06-03 14:07:57 +02:00
Manfred Karrer
e3b10b89d9
Move onDisputesChangeListener to disputeManager 2018-06-03 13:15:29 +02:00
Manfred Karrer
3602d4eb0f
Add dependencies of http-api 2018-05-31 02:28:53 +02:00
Manfred Karrer
a22b24b6d5
Move BtcAddressValidator to core 2018-05-31 02:28:26 +02:00
Manfred Karrer
ef58b17d75
Cleanup 2018-05-31 01:50:06 +02:00
Manfred Karrer
8ddcd937c2
Add support for BisqHttpApi to DesktopMain 
- Add option keys desktopWithHttpApi and desktopWithGrpcApi
- Add BisqDaemon to BisqApp
- Fix wrong package of BisqGrpcClient and BisqGrpcServer
- Add BisqHttpApi stub
- Add http-api and bisq-grpc to Desktop
 2018-05-31 01:13:05 +02:00
Manfred Karrer
07cf5dbef7
Update idea files, update gradle 2018-05-31 00:21:30 +02:00
Manfred Karrer
c013130bb1
Merge pull request #1557 from ManfredKarrer/remove-venmo-cashapp 
Remove venmo cashapp
 2018-05-28 13:15:14 +02:00
Manfred Karrer
30ab8c86cf
Merge pull request #1556 from ManfredKarrer/mk_master 
Fix reuse of change addresses
 2018-05-28 13:14:58 +02:00
Manfred Karrer
a634c6338a
Merge branch 'master' into voting 2018-05-27 13:36:59 +02:00
Manfred Karrer
e7bdfecca1
Update hashes of libdohj, bitcoinj-core and commons-codec 2018-05-27 13:36:27 +02:00
Manfred Karrer
805ca18040
Merge branch 'master' into voting 2018-05-27 13:27:42 +02:00
Manfred Karrer
534f347064
Remove Venmo and CashApp 
- Filter Venmo and CashApp at dropdown for account creation
- Delete Venmo and CashApp account if not used in offers or trades
- Set all Venmo and CashApp classes deprecated
 2018-05-25 23:03:52 +02:00
Manfred Karrer
4e378e4b1a
Download hash file for jar 
- See: https://github.com/bisq-network/bisq-core/issues/114
 2018-05-25 22:04:26 +02:00
Manfred Karrer
1570ec3e74
Update tools.jar for deterministic builds 
- Create hash of jar and copy it to deploy dir
- Remove BC jars from -srcfiles
- Remove commented out code for policy file
 2018-05-25 22:03:42 +02:00
Manfred Karrer
8d939f0f37
Add tools.jar for reproducible builds 
- tools.jar is built from: https://github.com/ManfredKarrer/tools
Should be included in main project to avoid to copy over the jar,
but as long the reproducible build is not complete we prefer to not
add too much changes to the code base
 2018-05-25 15:18:36 +02:00
Manfred Karrer
aa7c9564f2
Update build file 
- Remove BC inclusion (not working that way)
- Add support for reproducible builds
 2018-05-25 15:16:22 +02:00
Manfred Karrer
e5003d9d28
Merge branch 'master' into mk_master 2018-05-25 15:11:23 +02:00
Manfred Karrer
aa6ec28d2e
Fix reuse of change addresses 
Fixes issue: https://github.com/bisq-network/bisq-desktop/issues/1540
 2018-05-25 14:54:45 +02:00
Manfred Karrer
88dfaf642e
Use USD as default for PerfectMoney dummy account 2018-05-25 13:37:26 +02:00
Manfred Karrer
586e5564af
Merge pull request #1553 from ripcurlx/relax-account-number-restriction-for-argentina 
Remove validation for Argentinian account numbers and allow manual edit
 2018-05-24 12:57:56 +02:00
Christoph Atteneder
5b2a84ffea
Remove validation for Argentinian account numbers and allow manual edit 2018-05-23 19:30:11 +02:00
Manfred Karrer
de283a56f6
Merge pull request #1552 from ripcurlx/fix-format-duration-as-words 
Fix wrong duration translation in double digit numbers
 2018-05-23 19:06:14 +02:00
Christoph Atteneder
8eed6908c7
Fix wrong singular word translation in double digit numbers 2018-05-23 18:50:43 +02:00
Manfred Karrer
fc81c92f20
Merge branch 'master' into mk_master 2018-05-15 23:17:34 +02:00