mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2

Browse Source 
# Conflicts:
#	core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
#	core/src/main/java/bisq/core/api/CoreOffersService.java
#	core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java
#	core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java
#	core/src/main/java/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
#	core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java
#	core/src/main/java/bisq/core/proto/ProtoDevUtil.java
#	core/src/main/java/bisq/core/trade/TradeManager.java
#	core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java
#	core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
#	core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
#	core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/Provider.java
#	core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
#	core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java
#	core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java
#	core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
#	desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
#	desktop/src/main/java/bisq/desktop/main/PriceUtil.java
#	desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
#	desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
#	desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
#	desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
#	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/util/DisplayUtils.java
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java
#	desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java
#	desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java
#	desktop/src/test/java/bisq/desktop/maker/OfferMaker.java
#	monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java
This commit is contained in:
chimp1984 2021-11-02 16:04:12 +01:00
commit d5dfdb4a35
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
17 changed files with 31 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -414,7 +414,7 @@ configure(project(':desktop')) {
modules = ['javafx.controls', 'javafx.fxml']
}
version = '1.7.5'
version = '1.7.5-SNAPSHOT'
jar.manifest.attributes(
"Implementation-Title": project.name,

1
core/src/main/java/bisq/core/offer/OfferBookService.java
View File

@ -19,6 +19,7 @@ package bisq.core.offer;
import bisq.core.filter.FilterManager;
import bisq.core.locale.Res;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.provider.price.PriceFeedService;
import bisq.network.p2p.BootstrapListener;

1
core/src/main/java/bisq/core/offer/OfferForJson.java
View File

@ -21,6 +21,7 @@ import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.monetary.Price;
import bisq.core.monetary.Volume;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.payment.payload.PaymentMethod;
import bisq.common.util.MathUtils;

2
core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java
View File

@ -102,7 +102,7 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
return fromProto(trade,
return Trade.fromProto(trade,
proto,
coreProtoResolver);
}

2
core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java
View File

@ -93,7 +93,7 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
if (uid == null) {
uid = UUID.randomUUID().toString();
}
return fromProto(new BuyerAsTakerTrade(
return Trade.fromProto(new BuyerAsTakerTrade(
Offer.fromProto(proto.getOffer()),
Coin.valueOf(proto.getTradeAmountAsLong()),
Coin.valueOf(proto.getTxFeeAsLong()),

2
core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java
View File

@ -103,7 +103,7 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
return fromProto(trade,
return Trade.fromProto(trade,
proto,
coreProtoResolver);
}

2
core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java
View File

@ -93,7 +93,7 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
if (uid == null) {
uid = UUID.randomUUID().toString();
}
return fromProto(new SellerAsTakerTrade(
return Trade.fromProto(new SellerAsTakerTrade(
Offer.fromProto(proto.getOffer()),
Coin.valueOf(proto.getTradeAmountAsLong()),
Coin.valueOf(proto.getTxFeeAsLong()),

63
core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
View File

@ -1,63 +0,0 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade.protocol.bisq_v1.tasks;
import bisq.core.filter.FilterManager;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.bisq_v1.TradeUtil;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.network.p2p.NodeAddress;
import bisq.common.taskrunner.TaskRunner;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class ApplyFilter extends TradeTask {
public ApplyFilter(TaskRunner<Trade> taskHandler, Trade trade) {
super(taskHandler, trade);
}
@Override
protected void run() {
try {
runInterceptHook();
NodeAddress nodeAddress = checkNotNull(processModel.getTempTradingPeerNodeAddress());
@Nullable
PaymentAccountPayload paymentAccountPayload = processModel.getTradePeer().getPaymentAccountPayload();
FilterManager filterManager = processModel.getFilterManager();
TradeUtil.applyFilter(trade,
filterManager,
nodeAddress,
paymentAccountPayload,
this::complete,
this::failed);
} catch (Throwable t) {
failed(t);
}
}
}

4
core/src/main/resources/wallet/checkpoints.txt
View File

@ -1,6 +1,6 @@
TXT CHECKPOINTS 1
0
347
349
AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@ -348,3 +348,5 @@ H/scEVeqoHwiR4XCAAqVAAQAACAp7Oq3+Dyk8n8irC8NurbgW+TyqKfBAwAAAAAAAAAAAMpdMLs3r3kB
IGLxQ5ggT209mY8YAAqc4AQA/z+UNYXSpcMbQedgEG83G6j+JomAmZkBAAAAAAAAAAAAALF2cIhIGcY/Y5hk97vS8iowfcasg8RKMU+1GnC8peaJ6wgWYQsYEhc3Dc2x
INJeT/7WHqcUv/ASAAqkwAQAACAW1bP3ULCb7l1WrnZh1Fhdtr5iEoiNCQAAAAAAAAAAAL+GJQD++FLt8be0h0yd/f7oJ6+wHbrc9Wrx4d4UmM48jFYmYaD6DxfK6HL9
IVCJbIepFmtNRMOrAAqsoATg/z9jvkqOCEjsMXZ5NSTR70jjJY6jcMsZAAAAAAAAAAAAAJ3FfWBYz4SZErDMatFIMKICRh05en60mvmWrgW1GboLNQQ4YeRIDxfArM0V
IdRva310VAL/1T6KAAq0gAQAACDYRNhykSZE0FCNDbMD3ep37sppeREVBQAAAAAAAAAAACQVT8noR4EQStMyf0BwxU7X1oXPSv4XXntyzNI2Pw9nfO1JYevQDhdFHdB6
IlyBuc55IaovtRgZAAq8YAQAACAFDOUuzSPi2Pb5kdp+wxKBfvspFnUcDgAAAAAAAAAAADcc9lDs5JP/E+v1DrUxBRV/PfB8Sbd7hC7mhLrwNS5Rt49bYTImDheC4ukE

2
desktop/package/linux/Dockerfile
View File

@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
ENV version 1.7.5
ENV version 1.7.5-SNAPSHOT
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
apt-get install -y vim fakeroot

2
desktop/package/macosx/finalize.sh
View File

@ -2,7 +2,7 @@
cd ../../
version="1.7.5"
version="1.7.5-SNAPSHOT"
target_dir="releases/$version"

2
desktop/package/macosx/insert_snapshot_version.sh
View File

@ -2,7 +2,7 @@
cd $(dirname $0)/../../../
version=1.7.4
version=1.7.5
find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \

14
desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View File

@ -77,11 +77,15 @@ import bisq.common.UserThread;
import bisq.common.app.DevEnv;
import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.crypto.Hash;
import bisq.common.file.CorruptedStorageFileHandler;
import bisq.common.util.Hex;
import bisq.common.util.Tuple2;
import com.google.inject.Inject;
import com.google.common.base.Charsets;
import org.fxmisc.easybind.EasyBind;
import org.fxmisc.easybind.monadic.MonadicBinding;
@ -341,7 +345,15 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
bisqSetup.setChainFileLockedExceptionHandler(msg -> new Popup().warning(msg)
.useShutDownButton()
.show());
bisqSetup.setLockedUpFundsHandler(msg -> new Popup().width(850).warning(msg).show());
bisqSetup.setLockedUpFundsHandler(msg -> {
// repeated popups of the same message text can be stopped by selecting the "Dont show again" checkbox
String key = Hex.encode(Hash.getSha256Ripemd160hash(msg.getBytes(Charsets.UTF_8)));
if (preferences.showAgain(key)) {
new Popup().width(850).warning(msg)
.dontShowAgainId(key)
.show();
}
});
bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(this::showFirstPopupIfResyncSPVRequested);
bisqSetup.setRequestWalletPasswordHandler(aesKeyHandler -> walletPasswordWindow
.onAesKey(aesKeyHandler::accept)

1
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferView.java
View File

@ -33,7 +33,6 @@ import javax.inject.Named;
@FxmlView
public class CreateOfferView extends MutableOfferView<CreateOfferViewModel> {
@Inject
private CreateOfferView(CreateOfferViewModel model,
Navigation navigation,

BIN
p2p/src/main/resources/DaoStateStore_BTC_MAINNET (Stored with Git LFS)
View File

Binary file not shown.

BIN
p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET (Stored with Git LFS)
View File

Binary file not shown.

2
relay/src/main/resources/version.txt
View File

@ -1 +1 @@
1.7.5
1.7.5-SNAPSHOT