Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-25 09:50:54 -04:00
Code Issues Projects Releases Packages 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
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 // Offerer signs tx and publishes it
public void offererSignAndPublishTx(Transaction preparedDepositTx, public void offererSignAndPublishTx(Transaction preparedDepositTx,
Transaction takersSignedDepositTx, Transaction takersSignedDepositTx,
String takersSignedConnOutAsHex, Transaction takersFromTx,
String takersSignedScriptSigAsHex, byte[] takersSignedScriptSig,
long offererTxOutIndex, long offererTxOutIndex,
long takerTxOutIndex, long takerTxOutIndex,
FutureCallback<Transaction> callback) { FutureCallback<Transaction> callback) {
log.debug("offererSignAndPublishTx"); log.debug("offererSignAndPublishTx");
log.trace("inputs: "); log.trace("inputs: ");
log.trace("preparedDepositTx=" + preparedDepositTx); log.trace("preparedDepositTx=" + preparedDepositTx);
log.trace("takersSignedTxAsHex=" + takersSignedDepositTx); log.trace("takersSignedTx=" + takersSignedDepositTx);
log.trace("takersSignedConnOutAsHex=" + takersSignedConnOutAsHex); log.trace("takersFromTx=" + takersFromTx);
log.trace("takersSignedScriptSigAsHex=" + takersSignedScriptSigAsHex); log.trace("takersSignedScriptSig=" + takersSignedScriptSig);
log.trace("callback=" + callback); 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 // 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); log.trace("takersSignedTx = " + takersSignedDepositTx);
// add input // add input
Transaction takersSignedTxConnOut = new Transaction(params, Utils.parseAsHexOrBase58(takersSignedConnOutAsHex)); //todo not needed
TransactionOutPoint takersSignedTxOutPoint = takersFromTx = new Transaction(params, takersFromTx.bitcoinSerialize());
new TransactionOutPoint(params, takerTxOutIndex, takersSignedTxConnOut); TransactionOutPoint takersSignedTxOutPoint = new TransactionOutPoint(params, takerTxOutIndex, takersFromTx);
TransactionInput takersSignedTxInput = new TransactionInput( TransactionInput takersSignedTxInput = new TransactionInput(
params, tx, Utils.parseAsHexOrBase58(takersSignedScriptSigAsHex), takersSignedTxOutPoint); params, tx, takersSignedScriptSig, takersSignedTxOutPoint);
takersSignedTxInput.setParent(tx); takersSignedTxInput.setParent(tx);
tx.addInput(takersSignedTxInput); 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 Transaction takersSignedDepositTx;
private String txConnOutAsHex; private Transaction takersFromTx;
private String txScriptSigAsHex; private byte[] txScriptSig;
private long takerTxOutIndex; private long takerTxOutIndex;
private Coin takerPaybackAmount; private Coin takerPaybackAmount;
@ -186,20 +186,20 @@ public class BuyerAsOffererModel extends OfferSharedModel {
this.takersSignedDepositTx = takersSignedDepositTx; this.takersSignedDepositTx = takersSignedDepositTx;
} }
public String getTxConnOutAsHex() { public Transaction getTakersFromTx() {
return txConnOutAsHex; return takersFromTx;
} }
public void setTxConnOutAsHex(String txConnOutAsHex) { public void setTakersFromTx(Transaction takersFromTx) {
this.txConnOutAsHex = txConnOutAsHex; this.takersFromTx = takersFromTx;
} }
public String getTxScriptSigAsHex() { public byte[] getTxScriptSig() {
return txScriptSigAsHex; return txScriptSig;
} }
public void setTxScriptSigAsHex(String txScriptSigAsHex) { public void setTxScriptSig(byte[] txScriptSig) {
this.txScriptSigAsHex = txScriptSigAsHex; this.txScriptSig = txScriptSig;
} }
public long getTakerTxOutIndex() { 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.setTakerMessagePublicKey(checkNotNull(message.getTakerMessagePublicKey()));
model.setTakerContractAsJson(nonEmptyStringOf(message.getTakerContractAsJson())); model.setTakerContractAsJson(nonEmptyStringOf(message.getTakerContractAsJson()));
model.setTakersSignedDepositTx(checkNotNull(message.getTakersSignedDepositTx())); model.setTakersSignedDepositTx(checkNotNull(message.getTakersSignedDepositTx()));
model.setTxConnOutAsHex(nonEmptyStringOf(message.getTxConnOutAsHex())); model.setTakersFromTx(checkNotNull(message.getTakersFromTx()));
model.setTxScriptSigAsHex(nonEmptyStringOf(message.getTxScriptSigAsHex())); model.setTxScriptSig(checkNotNull(message.getTxScriptSig()));
model.setTakerTxOutIndex(nonNegativeLongOf(message.getTakerTxOutIndex())); model.setTakerTxOutIndex(nonNegativeLongOf(message.getTakerTxOutIndex()));
complete(); 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.getWalletService().offererSignAndPublishTx(
model.getPreparedDepositTx(), model.getPreparedDepositTx(),
model.getTakersSignedDepositTx(), model.getTakersSignedDepositTx(),
model.getTxConnOutAsHex(), model.getTakersFromTx(),
model.getTxScriptSigAsHex(), model.getTxScriptSig(),
model.getOffererTxOutIndex(), model.getOffererTxOutIndex(),
model.getTakerTxOutIndex(), model.getTakerTxOutIndex(),
new FutureCallback<Transaction>() { 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 String accountID;
private final PublicKey takerMessagePublicKey; private final PublicKey takerMessagePublicKey;
private final Transaction takersSignedDepositTx; private final Transaction takersSignedDepositTx;
private final String txScriptSigAsHex; private final byte[] txScriptSig;
private final String txConnOutAsHex; private final Transaction takersFromTx;
private final String contractAsJson; private final String contractAsJson;
private final String takerContractSignature; private final String takerContractSignature;
private final String takerPayoutAddress; private final String takerPayoutAddress;
@ -48,8 +48,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
String accountID, String accountID,
PublicKey takerMessagePublicKey, PublicKey takerMessagePublicKey,
Transaction takersSignedDepositTx, Transaction takersSignedDepositTx,
String txScriptSigAsHex, byte[] txScriptSig,
String txConnOutAsHex, Transaction takersFromTx,
String contractAsJson, String contractAsJson,
String takerContractSignature, String takerContractSignature,
String takerPayoutAddress, String takerPayoutAddress,
@ -61,8 +61,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
this.accountID = accountID; this.accountID = accountID;
this.takerMessagePublicKey = takerMessagePublicKey; this.takerMessagePublicKey = takerMessagePublicKey;
this.takersSignedDepositTx = takersSignedDepositTx; this.takersSignedDepositTx = takersSignedDepositTx;
this.txScriptSigAsHex = txScriptSigAsHex; this.txScriptSig = txScriptSig;
this.txConnOutAsHex = txConnOutAsHex; this.takersFromTx = takersFromTx;
this.contractAsJson = contractAsJson; this.contractAsJson = contractAsJson;
this.takerContractSignature = takerContractSignature; this.takerContractSignature = takerContractSignature;
this.takerPayoutAddress = takerPayoutAddress; this.takerPayoutAddress = takerPayoutAddress;
@ -96,12 +96,12 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
return takersSignedDepositTx; return takersSignedDepositTx;
} }
public String getTxScriptSigAsHex() { public byte[] getTxScriptSig() {
return txScriptSigAsHex; return txScriptSig;
} }
public String getTxConnOutAsHex() { public Transaction getTakersFromTx() {
return txConnOutAsHex; return takersFromTx;
} }
public String getTakerContractAsJson() { 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 io.bitsquare.util.taskrunner.TaskRunner;
import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -47,8 +46,8 @@ public class SendSignedTakerDepositTxAsHex extends Task<SellerAsTakerModel> {
model.getAccountId(), model.getAccountId(),
model.getMessagePublicKey(), model.getMessagePublicKey(),
takersSignedDepositTx, takersSignedDepositTx,
Utils.HEX.encode(takersSignedDepositTx.getInput(1).getScriptBytes()), takersSignedDepositTx.getInput(1).getScriptBytes(),
Utils.HEX.encode(takersSignedDepositTx.getInput(1).getConnectedOutput().getParentTransaction().bitcoinSerialize()), takersSignedDepositTx.getInput(1).getConnectedOutput().getParentTransaction(),
model.getTrade().getContractAsJson(), model.getTrade().getContractAsJson(),
model.getTrade().getTakerContractSignature(), model.getTrade().getTakerContractSignature(),
model.getWalletService().getAddressInfo(model.getTrade().getId()).getAddressString(), model.getWalletService().getAddressInfo(model.getTrade().getId()).getAddressString(),