From 181fc4d620629e68a97ceb31cfd58c2b015e8c38 Mon Sep 17 00:00:00 2001
From: woodser <13068859+woodser@users.noreply.github.com>
Date: Tue, 18 Mar 2025 18:38:47 -0400
Subject: [PATCH] re-sign offers on protocol version update
---
.../haveno/core/offer/OpenOfferManager.java | 21 +++++++------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/haveno/core/offer/OpenOfferManager.java b/core/src/main/java/haveno/core/offer/OpenOfferManager.java
index 91e2284d46..6ae03a7042 100644
--- a/core/src/main/java/haveno/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/haveno/core/offer/OpenOfferManager.java
@@ -1876,27 +1876,20 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
originalOfferPayload.getChallengeHash(),
updatedExtraDataMap,
protocolVersion,
- originalOfferPayload.getArbitratorSigner(),
- originalOfferPayload.getArbitratorSignature(),
- originalOfferPayload.getReserveTxKeyImages(),
+ null,
+ null,
+ null,
originalOfferPayload.getExtraInfo());
- // Save states from original data to use for the updated
- Offer.State originalOfferState = originalOffer.getState();
- OpenOffer.State originalOpenOfferState = originalOpenOffer.getState();
+ // cancel old offer
+ log.info("Canceling outdated offer id={}", originalOffer.getId());
+ doCancelOffer(originalOpenOffer, false);
- // remove old offer
- originalOffer.setState(Offer.State.REMOVED);
- originalOpenOffer.setState(OpenOffer.State.CANCELED);
- removeOpenOffer(originalOpenOffer);
-
- // Create new Offer
+ // create new offer
Offer updatedOffer = new Offer(updatedPayload);
updatedOffer.setPriceFeedService(priceFeedService);
- updatedOffer.setState(originalOfferState);
OpenOffer updatedOpenOffer = new OpenOffer(updatedOffer, originalOpenOffer.getTriggerPrice());
- updatedOpenOffer.setState(originalOpenOfferState);
addOpenOffer(updatedOpenOffer);
requestPersistence();