Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-06 21:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace other hex with tx for takersFromTx

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-14 21:36:24 +01:00
parent 2803eff14d
commit 6823b0cfe3
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/io/bitsquare/btc/WalletService.java
View File

@ -782,17 +782,17 @@ public class WalletService {
// Offerer signs tx and publishes it
public void offererSignAndPublishTx(Transaction preparedDepositTx,
Transaction takersSignedDepositTx,
String takersSignedConnOutAsHex,
String takersSignedScriptSigAsHex,
Transaction takersFromTx,
byte[] takersSignedScriptSig,
long offererTxOutIndex,
long takerTxOutIndex,
FutureCallback<Transaction> callback) {
log.debug("offererSignAndPublishTx");
log.trace("inputs: ");
log.trace("preparedDepositTx=" + preparedDepositTx);
log.trace("takersSignedTxAsHex=" + takersSignedDepositTx);
log.trace("takersSignedConnOutAsHex=" + takersSignedConnOutAsHex);
log.trace("takersSignedScriptSigAsHex=" + takersSignedScriptSigAsHex);
log.trace("takersSignedTx=" + takersSignedDepositTx);
log.trace("takersFromTx=" + takersFromTx);
log.trace("takersSignedScriptSig=" + takersSignedScriptSig);
log.trace("callback=" + callback);
// We create an empty tx (did not find a way to manipulate a tx input, otherwise the takers tx could be used
@ -819,11 +819,11 @@ public class WalletService {
log.trace("takersSignedTx = " + takersSignedDepositTx);
// add input
Transaction takersSignedTxConnOut = new Transaction(params, Utils.parseAsHexOrBase58(takersSignedConnOutAsHex));
TransactionOutPoint takersSignedTxOutPoint =
new TransactionOutPoint(params, takerTxOutIndex, takersSignedTxConnOut);
//todo not needed
takersFromTx = new Transaction(params, takersFromTx.bitcoinSerialize());
TransactionOutPoint takersSignedTxOutPoint = new TransactionOutPoint(params, takerTxOutIndex, takersFromTx);
TransactionInput takersSignedTxInput = new TransactionInput(
params, tx, Utils.parseAsHexOrBase58(takersSignedScriptSigAsHex), takersSignedTxOutPoint);
params, tx, takersSignedScriptSig, takersSignedTxOutPoint);
takersSignedTxInput.setParent(tx);
tx.addInput(takersSignedTxInput);

20
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
View File

@ -61,8 +61,8 @@ public class BuyerAsOffererModel extends OfferSharedModel {
private Transaction takersSignedDepositTx;
private String txConnOutAsHex;
private String txScriptSigAsHex;
private Transaction takersFromTx;
private byte[] txScriptSig;
private long takerTxOutIndex;
private Coin takerPaybackAmount;
@ -186,20 +186,20 @@ public class BuyerAsOffererModel extends OfferSharedModel {
this.takersSignedDepositTx = takersSignedDepositTx;
}
public String getTxConnOutAsHex() {
return txConnOutAsHex;
public Transaction getTakersFromTx() {
return takersFromTx;
}
public void setTxConnOutAsHex(String txConnOutAsHex) {
this.txConnOutAsHex = txConnOutAsHex;
public void setTakersFromTx(Transaction takersFromTx) {
this.takersFromTx = takersFromTx;
}
public String getTxScriptSigAsHex() {
return txScriptSigAsHex;
public byte[] getTxScriptSig() {
return txScriptSig;
}
public void setTxScriptSigAsHex(String txScriptSigAsHex) {
this.txScriptSigAsHex = txScriptSigAsHex;
public void setTxScriptSig(byte[] txScriptSig) {
this.txScriptSig = txScriptSig;
}
public long getTakerTxOutIndex() {

4
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
View File

@ -47,8 +47,8 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOf
model.setTakerMessagePublicKey(checkNotNull(message.getTakerMessagePublicKey()));
model.setTakerContractAsJson(nonEmptyStringOf(message.getTakerContractAsJson()));
model.setTakersSignedDepositTx(checkNotNull(message.getTakersSignedDepositTx()));
model.setTxConnOutAsHex(nonEmptyStringOf(message.getTxConnOutAsHex()));
model.setTxScriptSigAsHex(nonEmptyStringOf(message.getTxScriptSigAsHex()));
model.setTakersFromTx(checkNotNull(message.getTakersFromTx()));
model.setTxScriptSig(checkNotNull(message.getTxScriptSig()));
model.setTakerTxOutIndex(nonNegativeLongOf(message.getTakerTxOutIndex()));
complete();

4
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
View File

@ -44,8 +44,8 @@ public class SignAndPublishDepositTx extends Task<BuyerAsOffererModel> {
model.getWalletService().offererSignAndPublishTx(
model.getPreparedDepositTx(),
model.getTakersSignedDepositTx(),
model.getTxConnOutAsHex(),
model.getTxScriptSigAsHex(),
model.getTakersFromTx(),
model.getTxScriptSig(),
model.getOffererTxOutIndex(),
model.getTakerTxOutIndex(),
new FutureCallback<Transaction>() {

20
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
View File

@ -33,8 +33,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
private final String accountID;
private final PublicKey takerMessagePublicKey;
private final Transaction takersSignedDepositTx;
private final String txScriptSigAsHex;
private final String txConnOutAsHex;
private final byte[] txScriptSig;
private final Transaction takersFromTx;
private final String contractAsJson;
private final String takerContractSignature;
private final String takerPayoutAddress;
@ -48,8 +48,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
String accountID,
PublicKey takerMessagePublicKey,
Transaction takersSignedDepositTx,
String txScriptSigAsHex,
String txConnOutAsHex,
byte[] txScriptSig,
Transaction takersFromTx,
String contractAsJson,
String takerContractSignature,
String takerPayoutAddress,
@ -61,8 +61,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
this.accountID = accountID;
this.takerMessagePublicKey = takerMessagePublicKey;
this.takersSignedDepositTx = takersSignedDepositTx;
this.txScriptSigAsHex = txScriptSigAsHex;
this.txConnOutAsHex = txConnOutAsHex;
this.txScriptSig = txScriptSig;
this.takersFromTx = takersFromTx;
this.contractAsJson = contractAsJson;
this.takerContractSignature = takerContractSignature;
this.takerPayoutAddress = takerPayoutAddress;
@ -96,12 +96,12 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
return takersSignedDepositTx;
}
public String getTxScriptSigAsHex() {
return txScriptSigAsHex;
public byte[] getTxScriptSig() {
return txScriptSig;
}
public String getTxConnOutAsHex() {
return txConnOutAsHex;
public Transaction getTakersFromTx() {
return takersFromTx;
}
public String getTakerContractAsJson() {

5
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
View File

@ -24,7 +24,6 @@ import io.bitsquare.util.taskrunner.Task;
import io.bitsquare.util.taskrunner.TaskRunner;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,8 +46,8 @@ public class SendSignedTakerDepositTxAsHex extends Task<SellerAsTakerModel> {
model.getAccountId(),
model.getMessagePublicKey(),
takersSignedDepositTx,
Utils.HEX.encode(takersSignedDepositTx.getInput(1).getScriptBytes()),
Utils.HEX.encode(takersSignedDepositTx.getInput(1).getConnectedOutput().getParentTransaction().bitcoinSerialize()),
takersSignedDepositTx.getInput(1).getScriptBytes(),
takersSignedDepositTx.getInput(1).getConnectedOutput().getParentTransaction(),
model.getTrade().getContractAsJson(),
model.getTrade().getTakerContractSignature(),
model.getWalletService().getAddressInfo(model.getTrade().getId()).getAddressString(),