From 6823b0cfe34018f7d4f884aa55447b207d10b214 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 14 Mar 2015 21:36:24 +0100 Subject: [PATCH] Replace other hex with tx for takersFromTx --- .../java/io/bitsquare/btc/WalletService.java | 18 ++++++++--------- .../trade/offerer/BuyerAsOffererModel.java | 20 +++++++++---------- ...RequestOffererPublishDepositTxMessage.java | 4 ++-- .../tasks/SignAndPublishDepositTx.java | 4 ++-- ...RequestOffererPublishDepositTxMessage.java | 20 +++++++++---------- .../tasks/SendSignedTakerDepositTxAsHex.java | 5 ++--- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java index 77c4c9dbe9..107ad1122e 100644 --- a/core/src/main/java/io/bitsquare/btc/WalletService.java +++ b/core/src/main/java/io/bitsquare/btc/WalletService.java @@ -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 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); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java index 3a6d9c943a..b2ba20900f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java @@ -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() { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java index 0f1739ca27..ce827d467f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java @@ -47,8 +47,8 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task { model.getWalletService().offererSignAndPublishTx( model.getPreparedDepositTx(), model.getTakersSignedDepositTx(), - model.getTxConnOutAsHex(), - model.getTxScriptSigAsHex(), + model.getTakersFromTx(), + model.getTxScriptSig(), model.getOffererTxOutIndex(), model.getTakerTxOutIndex(), new FutureCallback() { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java index 9553a7fd92..337812c328 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java @@ -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() { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java index 3704c81b95..bc28849462 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java @@ -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 { 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(),