Skip to content

Commit 033d701

Browse files
committed
feat(btcreleaseclient): remove signatures from svp spend tx before searching
1 parent fb463d6 commit 033d701

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/co/rsk/federate/btcreleaseclient/BtcReleaseClient.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
import org.ethereum.core.Block;
6767
import org.ethereum.core.TransactionReceipt;
6868
import org.ethereum.crypto.ECKey;
69-
import org.ethereum.db.BlockStore;
70-
import org.ethereum.db.ReceiptStore;
71-
import org.ethereum.db.TransactionInfo;
7269
import org.ethereum.facade.Ethereum;
7370
import org.ethereum.listener.EthereumListenerAdapter;
7471
import org.ethereum.util.RLP;
@@ -295,9 +292,13 @@ public void onBlock(org.ethereum.core.Block block, List<TransactionReceipt> rece
295292
*/
296293
private boolean isSVPSpendTxReadyToSign(long currentBlockNumber, Map.Entry<Keccak256, BtcTransaction> svpSpendTx) {
297294
try {
295+
BtcTransaction btcTx = svpSpendTx.getValue();
296+
Federation spendingFed = getSpendingFederation(btcTx);
297+
removeSignaturesFromTransaction(btcTx, spendingFed);
298+
298299
int version = signer.getVersionForKeyId(BTC.getKeyId());
299300
ReleaseCreationInformation releaseCreationInformation = releaseCreationInformationGetter.getTxInfoToSign(
300-
version, svpSpendTx.getKey(), svpSpendTx.getValue());
301+
version, svpSpendTx.getKey(), btcTx);
301302

302303
boolean isReadyToSign = Optional.ofNullable(releaseCreationInformation)
303304
.map(ReleaseCreationInformation::getPegoutCreationBlock)

0 commit comments

Comments
 (0)