Use sourceOfferPayload when cloning the OfferPayload for the fields which must not get changed (like security deposit could get adjusted by the UI).

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2023-05-12 19:26:32 +07:00
parent 60fad3ab6c
commit f843345dcc
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307

View file

@ -190,7 +190,7 @@ class CloneOfferDataModel extends MutableOfferDataModel {
public void onCloneOffer(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { public void onCloneOffer(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
Offer clonedOffer = createClonedOffer(); Offer clonedOffer = createClonedOffer();
openOfferManager.placeOffer(clonedOffer, openOfferManager.placeOffer(clonedOffer,
clonedOffer.getBuyerSecurityDeposit().getValue(), sourceOpenOffer.getOffer().getBuyerSecurityDeposit().getValue(),
false, false,
true, true,
sourceOpenOffer.getTriggerPrice(), sourceOpenOffer.getTriggerPrice(),
@ -211,18 +211,18 @@ class CloneOfferDataModel extends MutableOfferDataModel {
long date = new Date().getTime(); long date = new Date().getTime();
OfferPayload clonedOfferPayload = new OfferPayload(newOfferId, OfferPayload clonedOfferPayload = new OfferPayload(newOfferId,
date, date,
editedOfferPayload.getOwnerNodeAddress(), sourceOfferPayload.getOwnerNodeAddress(),
editedOfferPayload.getPubKeyRing(), sourceOfferPayload.getPubKeyRing(),
editedOfferPayload.getDirection(), sourceOfferPayload.getDirection(),
editedOfferPayload.getPrice(), editedOfferPayload.getPrice(),
editedOfferPayload.getMarketPriceMargin(), editedOfferPayload.getMarketPriceMargin(),
editedOfferPayload.isUseMarketBasedPrice(), editedOfferPayload.isUseMarketBasedPrice(),
editedOfferPayload.getAmount(), sourceOfferPayload.getAmount(),
editedOfferPayload.getMinAmount(), sourceOfferPayload.getMinAmount(),
editedOfferPayload.getBaseCurrencyCode(), editedOfferPayload.getBaseCurrencyCode(),
editedOfferPayload.getCounterCurrencyCode(), editedOfferPayload.getCounterCurrencyCode(),
editedOfferPayload.getArbitratorNodeAddresses(), sourceOfferPayload.getArbitratorNodeAddresses(),
editedOfferPayload.getMediatorNodeAddresses(), sourceOfferPayload.getMediatorNodeAddresses(),
editedOfferPayload.getPaymentMethodId(), editedOfferPayload.getPaymentMethodId(),
editedOfferPayload.getMakerPaymentAccountId(), editedOfferPayload.getMakerPaymentAccountId(),
sharedMakerTxId, sharedMakerTxId,
@ -232,11 +232,11 @@ class CloneOfferDataModel extends MutableOfferDataModel {
editedOfferPayload.getAcceptedBankIds(), editedOfferPayload.getAcceptedBankIds(),
editedOfferPayload.getVersionNr(), editedOfferPayload.getVersionNr(),
editedOfferPayload.getBlockHeightAtOfferCreation(), editedOfferPayload.getBlockHeightAtOfferCreation(),
editedOfferPayload.getTxFee(), sourceOfferPayload.getTxFee(),
editedOfferPayload.getMakerFee(), sourceOfferPayload.getMakerFee(),
editedOfferPayload.isCurrencyForMakerFeeBtc(), sourceOfferPayload.isCurrencyForMakerFeeBtc(),
editedOfferPayload.getBuyerSecurityDeposit(), sourceOfferPayload.getBuyerSecurityDeposit(),
editedOfferPayload.getSellerSecurityDeposit(), sourceOfferPayload.getSellerSecurityDeposit(),
editedOfferPayload.getMaxTradeLimit(), editedOfferPayload.getMaxTradeLimit(),
editedOfferPayload.getMaxTradePeriod(), editedOfferPayload.getMaxTradePeriod(),
editedOfferPayload.isUseAutoClose(), editedOfferPayload.isUseAutoClose(),