Ecosystem/haveno
Ecosystem/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-09-29 03:51:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to monero-java v0.7.0

Browse source
This commit is contained in:
woodser 2022-05-09 09:34:21 -04:00
parent 3d278a7952
commit e4a8aa45e7
8 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -41,7 +41,7 @@ configure(subprojects) {
grpcVersion = '1.25.0' grpcVersion = '1.25.0'
gsonVersion = '2.8.5' gsonVersion = '2.8.5'
guavaVersion = '28.2-jre' guavaVersion = '28.2-jre'
moneroJavaVersion = '0.6.4' moneroJavaVersion = '0.7.0'
httpclient5Version = '5.0' httpclient5Version = '5.0'
guiceVersion = '4.2.2' guiceVersion = '4.2.2'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'

4
core/src/main/java/bisq/core/api/CoreDisputesService.java
View file

@ -102,7 +102,7 @@ public class CoreDisputesService {
// Sends the openNewDisputeMessage to arbitrator, who will then create 2 disputes // Sends the openNewDisputeMessage to arbitrator, who will then create 2 disputes
// one for the opener, the other for the peer, see sendPeerOpenedDisputeMessage. // one for the opener, the other for the peer, see sendPeerOpenedDisputeMessage.
MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId()); MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId());
String updatedMultisigHex = multisigWallet.getMultisigHex(); String updatedMultisigHex = multisigWallet.exportMultisigHex();
disputeManager.sendOpenNewDisputeMessage(dispute, false, updatedMultisigHex, resultHandler, faultHandler); disputeManager.sendOpenNewDisputeMessage(dispute, false, updatedMultisigHex, resultHandler, faultHandler);
tradeManager.requestPersistence(); tradeManager.requestPersistence();
@ -279,7 +279,7 @@ public class CoreDisputesService {
} }
// send arbitrator's updated multisig hex with dispute result // send arbitrator's updated multisig hex with dispute result
disputeResult.setArbitratorUpdatedMultisigHex(multisigWallet.getMultisigHex()); disputeResult.setArbitratorUpdatedMultisigHex(multisigWallet.exportMultisigHex());
// close multisig wallet // close multisig wallet
xmrWalletService.closeMultisigWallet(dispute.getTradeId()); xmrWalletService.closeMultisigWallet(dispute.getTradeId());

4
core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
View file

@ -338,7 +338,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
Trade trade = tradeManager.getTrade(tradeId); Trade trade = tradeManager.getTrade(tradeId);
synchronized (trade) { 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? 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); xmrWalletService.closeMultisigWallet(tradeId);
} }
} }
@ -582,7 +582,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
trade.setPayoutTxId(txSet.getTxs().get(0).getHash()); trade.setPayoutTxId(txSet.getTxs().get(0).getHash());
trade.setState(Trade.State.SELLER_PUBLISHED_PAYOUT_TX); trade.setState(Trade.State.SELLER_PUBLISHED_PAYOUT_TX);
dispute.setDisputePayoutTxId(txSet.getTxs().get(0).getHash()); dispute.setDisputePayoutTxId(txSet.getTxs().get(0).getHash());
sendPeerPublishedPayoutTxMessage(multisigWallet.getMultisigHex(), txSet.getMultisigTxHex(), dispute, contract); sendPeerPublishedPayoutTxMessage(multisigWallet.exportMultisigHex(), txSet.getMultisigTxHex(), dispute, contract);
updateTradeOrOpenOfferManager(tradeId); updateTradeOrOpenOfferManager(tradeId);
} }

2
core/src/main/java/bisq/core/trade/protocol/tasks/ProcessUpdateMultisigRequest.java
View file

@ -69,7 +69,7 @@ public class ProcessUpdateMultisigRequest extends TradeTask {
// get updated multisig hex // get updated multisig hex
multisigWallet.sync(); multisigWallet.sync();
String updatedMultisigHex = multisigWallet.getMultisigHex(); String updatedMultisigHex = multisigWallet.exportMultisigHex();
// import the multisig hex // import the multisig hex
int numOutputsSigned = multisigWallet.importMultisigHex(request.getUpdatedMultisigHex()); int numOutputsSigned = multisigWallet.importMultisigHex(request.getUpdatedMultisigHex());

3
core/src/main/java/bisq/core/trade/protocol/tasks/UpdateMultisigWithTradingPeer.java
View file

@ -30,7 +30,6 @@ import bisq.network.p2p.SendDirectMessageListener;
import bisq.common.app.Version; import bisq.common.app.Version;
import bisq.common.taskrunner.TaskRunner; import bisq.common.taskrunner.TaskRunner;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
@ -82,7 +81,7 @@ public class UpdateMultisigWithTradingPeer extends TradeTask {
// get updated multisig hex // get updated multisig hex
multisigWallet.sync(); multisigWallet.sync();
String updatedMultisigHex = multisigWallet.getMultisigHex(); String updatedMultisigHex = multisigWallet.exportMultisigHex();
// message trading peer with updated multisig hex // message trading peer with updated multisig hex
UpdateMultisigRequest message = new UpdateMultisigRequest( UpdateMultisigRequest message = new UpdateMultisigRequest(

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerPreparesPaymentSentMessage.java
View file

@ -71,7 +71,7 @@ public class BuyerPreparesPaymentSentMessage extends TradeTask {
trade.getBuyer().setPayoutTx(payoutTx); trade.getBuyer().setPayoutTx(payoutTx);
trade.getBuyer().setPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex()); trade.getBuyer().setPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
} else { } else {
trade.getSelf().setUpdatedMultisigHex(multisigWallet.getMultisigHex()); trade.getSelf().setUpdatedMultisigHex(multisigWallet.exportMultisigHex());
} }
// close multisig wallet // close multisig wallet

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -460,7 +460,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
String payoutTxHashAsString = null; String payoutTxHashAsString = null;
MoneroTxWallet payoutTx = trade.getPayoutTx(); MoneroTxWallet payoutTx = trade.getPayoutTx();
MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId()); MoneroWallet multisigWallet = xmrWalletService.getMultisigWallet(trade.getId());
String updatedMultisigHex = multisigWallet.getMultisigHex(); String updatedMultisigHex = multisigWallet.exportMultisigHex();
xmrWalletService.closeMultisigWallet(trade.getId()); // close multisig wallet xmrWalletService.closeMultisigWallet(trade.getId()); // close multisig wallet
if (payoutTx != null) { if (payoutTx != null) {
// payoutTxSerialized = payoutTx.bitcoinSerialize(); // TODO (woodser): no need to pass serialized txs for xmr // payoutTxSerialized = payoutTx.bitcoinSerialize(); // TODO (woodser): no need to pass serialized txs for xmr

10
gradle/verification-metadata.xml
View file

@ -739,12 +739,12 @@
<sha256 value="4728eddd64e6ae3e1f205a775c6a327b24bd990b86d528584a17450a8b5f00d6" origin="Generated by Gradle"/> <sha256 value="4728eddd64e6ae3e1f205a775c6a327b24bd990b86d528584a17450a8b5f00d6" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="io.github.monero-ecosystem" name="monero-java" version="0.6.4"> <component group="io.github.monero-ecosystem" name="monero-java" version="0.7.0">
<artifact name="monero-java-0.6.4.jar"> <artifact name="monero-java-0.7.0.jar">
<sha256 value="3e673e1e4c18b7601843e1e22e61b47d9002207cbc9474e11943a3732509a9d3" origin="Generated by Gradle"/> <sha256 value="dbd9249df77c4d313b385bc5352a9e61ad930fae79acb5178813be19c2bb4771" origin="Generated by Gradle"/>
</artifact> </artifact>
<artifact name="monero-java-0.6.4.pom"> <artifact name="monero-java-0.7.0.pom">
<sha256 value="096741a678d41d22a22f66b5afb2d568c6d496db40c0872d273b3e290b6de09d" origin="Generated by Gradle"/> <sha256 value="ead76a2facdfaa55fcc2bc4aa706e3c6eebd5df4b9dcb153a9ff01f8f0324596" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="io.grpc" name="grpc-api" version="1.25.0"> <component group="io.grpc" name="grpc-api" version="1.25.0">