mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move contractHash creation to MakerCreateAndSignContract

Browse source
This commit is contained in:
chimp1984 2020-09-21 23:26:51 -05:00
parent 0f36ae8928
commit 538db2f36f
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java
View file

@ -26,7 +26,6 @@ import bisq.core.trade.Trade;
import bisq.core.trade.protocol.TradingPeer; import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask; import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.common.crypto.Hash;
import bisq.common.taskrunner.TaskRunner; import bisq.common.taskrunner.TaskRunner;
import org.bitcoinj.core.Address; import org.bitcoinj.core.Address;
@ -60,9 +59,6 @@ public class BuyerAsMakerCreatesAndSignsDepositTx extends TradeTask {
TradingPeer tradingPeer = processModel.getTradingPeer(); TradingPeer tradingPeer = processModel.getTradingPeer();
Offer offer = checkNotNull(trade.getOffer()); Offer offer = checkNotNull(trade.getOffer());
byte[] contractHash = Hash.getSha256Hash(checkNotNull(trade.getContractAsJson()));
trade.setContractHash(contractHash);
Coin makerInputAmount = offer.getBuyerSecurityDeposit(); Coin makerInputAmount = offer.getBuyerSecurityDeposit();
Optional<AddressEntry> addressEntryOptional = walletService.getAddressEntry(id, AddressEntry.Context.MULTI_SIG); Optional<AddressEntry> addressEntryOptional = walletService.getAddressEntry(id, AddressEntry.Context.MULTI_SIG);
checkArgument(addressEntryOptional.isPresent(), "addressEntryOptional must be present"); checkArgument(addressEntryOptional.isPresent(), "addressEntryOptional must be present");
@ -87,7 +83,7 @@ public class BuyerAsMakerCreatesAndSignsDepositTx extends TradeTask {
"buyerPubKey from AddressEntry must match the one from the trade data. trade id =" + id); "buyerPubKey from AddressEntry must match the one from the trade data. trade id =" + id);
PreparedDepositTxAndMakerInputs result = processModel.getTradeWalletService().buyerAsMakerCreatesAndSignsDepositTx( PreparedDepositTxAndMakerInputs result = processModel.getTradeWalletService().buyerAsMakerCreatesAndSignsDepositTx(
contractHash, trade.getContractHash(),
makerInputAmount, makerInputAmount,
msOutputAmount, msOutputAmount,
takerRawTransactionInputs, takerRawTransactionInputs,

5
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerCreateAndSignContract.java
View file

@ -27,6 +27,7 @@ import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.network.p2p.NodeAddress; import bisq.network.p2p.NodeAddress;
import bisq.common.crypto.Hash;
import bisq.common.crypto.Sig; import bisq.common.crypto.Sig;
import bisq.common.taskrunner.TaskRunner; import bisq.common.taskrunner.TaskRunner;
import bisq.common.util.Utilities; import bisq.common.util.Utilities;
@ -93,6 +94,10 @@ public class MakerCreateAndSignContract extends TradeTask {
trade.setContract(contract); trade.setContract(contract);
trade.setContractAsJson(contractAsJson); trade.setContractAsJson(contractAsJson);
trade.setMakerContractSignature(signature); trade.setMakerContractSignature(signature);
byte[] contractHash = Hash.getSha256Hash(checkNotNull(trade.getContractAsJson()));
trade.setContractHash(contractHash);
processModel.setMyMultiSigPubKey(makerMultiSigPubKey); processModel.setMyMultiSigPubKey(makerMultiSigPubKey);
complete(); complete();