From e4a8aa45e727eda73f4e74f87fd006551da6e271 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 9 May 2022 09:34:21 -0400
Subject: [PATCH] update to monero-java v0.7.0

---
 build.gradle                                           |  2 +-
 .../main/java/bisq/core/api/CoreDisputesService.java   |  4 ++--
 .../dispute/arbitration/ArbitrationManager.java        |  4 ++--
 .../protocol/tasks/ProcessUpdateMultisigRequest.java   |  2 +-
 .../protocol/tasks/UpdateMultisigWithTradingPeer.java  |  3 +--
 .../tasks/buyer/BuyerPreparesPaymentSentMessage.java   |  2 +-
 .../pendingtrades/PendingTradesDataModel.java          |  2 +-
 gradle/verification-metadata.xml                       | 10 +++++-----
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index be885126..330a5c87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ configure(subprojects) {
         grpcVersion = '1.25.0'
         gsonVersion = '2.8.5'
         guavaVersion = '28.2-jre'
-        moneroJavaVersion = '0.6.4'
+        moneroJavaVersion = '0.7.0'
         httpclient5Version = '5.0'
         guiceVersion = '4.2.2'
         hamcrestVersion = '1.3'
diff --git a/core/src/main/java/bisq/core/api/CoreDisputesService.java b/core/src/main/java/bisq/core/api/CoreDisputesService.java
index 8f07b069..40317b14 100644
--- a/core/src/main/java/bisq/core/api/CoreDisputesService.java
+++ b/core/src/main/java/bisq/core/api/CoreDisputesService.java
@@ -102,7 +102,7 @@ public class CoreDisputesService {
             // Sends the openNewDisputeMessage to arbitrator, who will then create 2 disputes
             // one for the opener, the other for the peer, see sendPeerOpenedDisputeMessage.
             MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId());
-            String updatedMultisigHex = multisigWallet.getMultisigHex();
+            String updatedMultisigHex = multisigWallet.exportMultisigHex();
             disputeManager.sendOpenNewDisputeMessage(dispute, false, updatedMultisigHex, resultHandler, faultHandler);
             tradeManager.requestPersistence();
 
@@ -279,7 +279,7 @@ public class CoreDisputesService {
                     }
 
                     // send arbitrator's updated multisig hex with dispute result
-                    disputeResult.setArbitratorUpdatedMultisigHex(multisigWallet.getMultisigHex());
+                    disputeResult.setArbitratorUpdatedMultisigHex(multisigWallet.exportMultisigHex());
                     
                     // close multisig wallet
                     xmrWalletService.closeMultisigWallet(dispute.getTradeId());
diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
index 5db9bb27..73817378 100644
--- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
@@ -338,7 +338,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
                 Trade trade = tradeManager.getTrade(tradeId);
                 synchronized (trade) {
                     MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(tradeId); // TODO (woodser): this is closed after sending ArbitratorPayoutTxRequest to arbitrator which opens and syncs multisig and responds with signed dispute tx. more efficient way is to include with arbitrator-signed dispute tx with dispute result?
-                    sendArbitratorPayoutTxRequest(multisigWallet.getMultisigHex(), dispute, contract);
+                    sendArbitratorPayoutTxRequest(multisigWallet.exportMultisigHex(), dispute, contract);
                     xmrWalletService.closeMultisigWallet(tradeId);
                 }
             }
@@ -582,7 +582,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
       trade.setPayoutTxId(txSet.getTxs().get(0).getHash());
       trade.setState(Trade.State.SELLER_PUBLISHED_PAYOUT_TX);
       dispute.setDisputePayoutTxId(txSet.getTxs().get(0).getHash());
-      sendPeerPublishedPayoutTxMessage(multisigWallet.getMultisigHex(), txSet.getMultisigTxHex(), dispute, contract);
+      sendPeerPublishedPayoutTxMessage(multisigWallet.exportMultisigHex(), txSet.getMultisigTxHex(), dispute, contract);
       updateTradeOrOpenOfferManager(tradeId);
     }
 
diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessUpdateMultisigRequest.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessUpdateMultisigRequest.java
index c98b132a..8d29ef63 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessUpdateMultisigRequest.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessUpdateMultisigRequest.java
@@ -69,7 +69,7 @@ public class ProcessUpdateMultisigRequest extends TradeTask {
 
           // get updated multisig hex
           multisigWallet.sync();
-          String updatedMultisigHex = multisigWallet.getMultisigHex();
+          String updatedMultisigHex = multisigWallet.exportMultisigHex();
 
           // import the multisig hex
           int numOutputsSigned = multisigWallet.importMultisigHex(request.getUpdatedMultisigHex());
diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/UpdateMultisigWithTradingPeer.java b/core/src/main/java/bisq/core/trade/protocol/tasks/UpdateMultisigWithTradingPeer.java
index 5d86335d..4fdd5fbb 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/UpdateMultisigWithTradingPeer.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/UpdateMultisigWithTradingPeer.java
@@ -30,7 +30,6 @@ import bisq.network.p2p.SendDirectMessageListener;
 import bisq.common.app.Version;
 import bisq.common.taskrunner.TaskRunner;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.UUID;
 
@@ -82,7 +81,7 @@ public class UpdateMultisigWithTradingPeer extends TradeTask {
 
             // get updated multisig hex
             multisigWallet.sync();
-            String updatedMultisigHex = multisigWallet.getMultisigHex();
+            String updatedMultisigHex = multisigWallet.exportMultisigHex();
 
             // message trading peer with updated multisig hex
             UpdateMultisigRequest message = new UpdateMultisigRequest(
diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerPreparesPaymentSentMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerPreparesPaymentSentMessage.java
index bb0a97ee..f97e1e27 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerPreparesPaymentSentMessage.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerPreparesPaymentSentMessage.java
@@ -71,7 +71,7 @@ public class BuyerPreparesPaymentSentMessage extends TradeTask {
                 trade.getBuyer().setPayoutTx(payoutTx);
                 trade.getBuyer().setPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
             } else {
-                trade.getSelf().setUpdatedMultisigHex(multisigWallet.getMultisigHex());
+                trade.getSelf().setUpdatedMultisigHex(multisigWallet.exportMultisigHex());
             }
             
             // close multisig wallet
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
index 243087b6..7d1cdc36 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -460,7 +460,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
       String payoutTxHashAsString = null;
       MoneroTxWallet payoutTx = trade.getPayoutTx();
       MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId());
-      String updatedMultisigHex = multisigWallet.getMultisigHex();
+      String updatedMultisigHex = multisigWallet.exportMultisigHex();
       xmrWalletService.closeMultisigWallet(trade.getId()); // close multisig wallet
       if (payoutTx != null) {
 //          payoutTxSerialized = payoutTx.bitcoinSerialize(); // TODO (woodser): no need to pass serialized txs for xmr
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 13b8fac1..01630980 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -739,12 +739,12 @@
             <sha256 value="4728eddd64e6ae3e1f205a775c6a327b24bd990b86d528584a17450a8b5f00d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.monero-ecosystem" name="monero-java" version="0.6.4">
-         <artifact name="monero-java-0.6.4.jar">
-            <sha256 value="3e673e1e4c18b7601843e1e22e61b47d9002207cbc9474e11943a3732509a9d3" origin="Generated by Gradle"/>
+      <component group="io.github.monero-ecosystem" name="monero-java" version="0.7.0">
+         <artifact name="monero-java-0.7.0.jar">
+            <sha256 value="dbd9249df77c4d313b385bc5352a9e61ad930fae79acb5178813be19c2bb4771" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="monero-java-0.6.4.pom">
-            <sha256 value="096741a678d41d22a22f66b5afb2d568c6d496db40c0872d273b3e290b6de09d" origin="Generated by Gradle"/>
+         <artifact name="monero-java-0.7.0.pom">
+            <sha256 value="ead76a2facdfaa55fcc2bc4aa706e3c6eebd5df4b9dcb153a9ff01f8f0324596" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-api" version="1.25.0">