Skip to content

Commit

Permalink
Merge pull request #2692 from rsksmart/add_settle_release_request_method
Browse files Browse the repository at this point in the history 
Create new settleReleaseRequest method to perform common actions when creating pegouts
  • Loading branch information
@marcos-iov
marcos-iov authored Aug 20, 2024
2 parents 897f5ec + 7caf58d commit 2c6380e
Showing 1 changed file with 75 additions and 75 deletions.
150 changes: 75 additions & 75 deletions rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static co.rsk.peg.ReleaseTransactionBuilder.BTC_TX_VERSION_2;
import static co.rsk.peg.bitcoin.UtxoUtils.extractOutpointValues;
import static co.rsk.peg.pegin.RejectedPeginReason.INVALID_AMOUNT;
import static java.util.Objects.isNull;
import static org.ethereum.config.blockchain.upgrades.ConsensusRule.*;

import co.rsk.bitcoinj.core.*;
Expand Down Expand Up @@ -1068,38 +1069,15 @@ private void migrateFunds(
selectedUTXOs.size()
);

// Add the TX to the release set
if (activations.isActive(ConsensusRule.RSKIP146)) {
Coin amountMigrated = selectedUTXOs.stream()
.map(UTXO::getValue)
.reduce(Coin.ZERO, Coin::add);
pegoutsWaitingForConfirmations.add(migrationTransaction, rskExecutionBlock.getNumber(), rskTxHash);
// Log the Release request
logger.debug(
"[migrateFunds] release requested. rskTXHash: {}, btcTxHash: {}, amount: {}",
rskTxHash,
migrationTransaction.getHash(),
amountMigrated
);
eventLogger.logReleaseBtcRequested(rskTxHash.getBytes(), migrationTransaction, amountMigrated);
} else {
pegoutsWaitingForConfirmations.add(migrationTransaction, rskExecutionBlock.getNumber());
}

// Store pegoutTxSigHash to be able to identify the tx type
savePegoutTxSigHash(migrationTransaction);
Coin amountMigrated = selectedUTXOs.stream()
.map(UTXO::getValue)
.reduce(Coin.ZERO, Coin::add);
settleReleaseRequest(pegoutsWaitingForConfirmations, migrationTransaction, rskTxHash, amountMigrated);

// Mark UTXOs as spent
availableUTXOs.removeIf(utxo -> selectedUTXOs.stream().anyMatch(selectedUtxo ->
utxo.getHash().equals(selectedUtxo.getHash()) && utxo.getIndex() == selectedUtxo.getIndex()
));

if (!activations.isActive(RSKIP428)) {
return;
}

List<Coin> outpointValues = extractOutpointValues(migrationTransaction);
eventLogger.logPegoutTransactionCreated(migrationTransaction.getHash(), outpointValues);
}

/**
Expand Down Expand Up @@ -1145,24 +1123,63 @@ private void processPegoutRequests(Transaction rskTx) {
}
}

private void addToPegoutsWaitingForConfirmations(
BtcTransaction generatedTransaction,
PegoutsWaitingForConfirmations pegoutWaitingForConfirmations,
Keccak256 pegoutCreationRskTxHash,
Coin amount
) {
if (activations.isActive(ConsensusRule.RSKIP146)) {
// Add the TX
pegoutWaitingForConfirmations.add(generatedTransaction, rskExecutionBlock.getNumber(), pegoutCreationRskTxHash);
// For a short time period, there could be items in the pegout request queue that don't have the pegoutCreationRskTxHash
// (these are pegouts created right before the consensus rule activation, that weren't processed before its activation)
// We shouldn't generate the event for those pegouts
if (pegoutCreationRskTxHash != null) {
eventLogger.logReleaseBtcRequested(pegoutCreationRskTxHash.getBytes(), generatedTransaction, amount);
}
} else {
pegoutWaitingForConfirmations.add(generatedTransaction, rskExecutionBlock.getNumber());
private void settleReleaseRequest(PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations, BtcTransaction pegoutTransaction, Keccak256 releaseCreationTxHash, Coin requestedAmount) {
addPegoutToPegoutsWaitingForConfirmations(pegoutsWaitingForConfirmations, pegoutTransaction, releaseCreationTxHash);
savePegoutTxSigHash(pegoutTransaction);
logReleaseRequested(releaseCreationTxHash, pegoutTransaction, requestedAmount);
logPegoutTransactionCreated(pegoutTransaction);
}

private void addPegoutToPegoutsWaitingForConfirmations(PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations, BtcTransaction pegoutTransaction, Keccak256 releaseCreationTxHash) {
long rskExecutionBlockNumber = rskExecutionBlock.getNumber();

if (!activations.isActive(RSKIP146)) {
pegoutsWaitingForConfirmations.add(pegoutTransaction, rskExecutionBlockNumber);
return;
}
pegoutsWaitingForConfirmations.add(pegoutTransaction, rskExecutionBlockNumber, releaseCreationTxHash);
}

private void savePegoutTxSigHash(BtcTransaction pegoutTx) {
if (!activations.isActive(ConsensusRule.RSKIP379)){
return;
}
Optional<Sha256Hash> pegoutTxSigHash = BitcoinUtils.getFirstInputSigHash(pegoutTx);
if (!pegoutTxSigHash.isPresent()){
throw new IllegalStateException(String.format("SigHash could not be obtained from btc tx %s", pegoutTx.getHash()));
}
provider.setPegoutTxSigHash(pegoutTxSigHash.get());
}

private void logReleaseRequested(Keccak256 releaseCreationTxHash, BtcTransaction pegoutTransaction, Coin requestedAmount) {
if (!activations.isActive(ConsensusRule.RSKIP146)) {
return;
}
// For a short time period, there could be items in the pegout request queue
// that were created but not processed before the consensus rule activation
// These pegouts won't have the pegoutCreationRskTxHash,
// so we shouldn't generate the event for them
if (isNull(releaseCreationTxHash)) {
return;
}

logger.debug(
"[logReleaseRequested] release requested. rskTXHash: {}, btcTxHash: {}, amount: {}",
releaseCreationTxHash, pegoutTransaction.getHash(), requestedAmount
);

byte[] rskTxHashSerialized = releaseCreationTxHash.getBytes();
eventLogger.logReleaseBtcRequested(rskTxHashSerialized, pegoutTransaction, requestedAmount);
}

private void logPegoutTransactionCreated(BtcTransaction pegoutTransaction) {
if (!activations.isActive(RSKIP428)) {
return;
}

List<Coin> outpointValues = extractOutpointValues(pegoutTransaction);
Sha256Hash pegoutTransactionHash = pegoutTransaction.getHash();
eventLogger.logPegoutTransactionCreated(pegoutTransactionHash, outpointValues);
}

private void processPegoutsIndividually(
Expand Down Expand Up @@ -1192,7 +1209,8 @@ private void processPegoutsIndividually(
}

BtcTransaction generatedTransaction = result.getBtcTx();
addToPegoutsWaitingForConfirmations(generatedTransaction, pegoutsWaitingForConfirmations, pegoutRequest.getRskTxHash(), pegoutRequest.getAmount());
Keccak256 pegoutCreationTxHash = pegoutRequest.getRskTxHash();
settleReleaseRequest(pegoutsWaitingForConfirmations, generatedTransaction, pegoutCreationTxHash, pegoutRequest.getAmount());

// Mark UTXOs as spent
List<UTXO> selectedUTXOs = result.getSelectedUTXOs();
Expand Down Expand Up @@ -1254,9 +1272,9 @@ private void processPegoutsInBatch(
result.getBtcTx().getHash(), result.getResponseCode());

BtcTransaction batchPegoutTransaction = result.getBtcTx();
addToPegoutsWaitingForConfirmations(batchPegoutTransaction,
pegoutsWaitingForConfirmations, rskTx.getHash(), totalPegoutValue);
savePegoutTxSigHash(batchPegoutTransaction);
Keccak256 batchPegoutCreationTxHash = rskTx.getHash();

settleReleaseRequest(pegoutsWaitingForConfirmations, batchPegoutTransaction, batchPegoutCreationTxHash, totalPegoutValue);

// Remove batched requests from the queue after successfully batching pegouts
pegoutRequests.removeEntries(pegoutEntries);
Expand All @@ -1269,11 +1287,6 @@ private void processPegoutsInBatch(
eventLogger.logBatchPegoutCreated(batchPegoutTransaction.getHash(),
pegoutEntries.stream().map(ReleaseRequestQueue.Entry::getRskTxHash).collect(Collectors.toList()));

if (activations.isActive(RSKIP428)) {
List<Coin> outpointValues = extractOutpointValues(batchPegoutTransaction);
eventLogger.logPegoutTransactionCreated(batchPegoutTransaction.getHash(), outpointValues);
}

adjustBalancesIfChangeOutputWasDust(batchPegoutTransaction, totalPegoutValue, wallet);
}

Expand All @@ -1285,17 +1298,6 @@ private void processPegoutsInBatch(
}
}

private void savePegoutTxSigHash(BtcTransaction pegoutTx) {
if (!activations.isActive(ConsensusRule.RSKIP379)){
return;
}
Optional<Sha256Hash> pegoutTxSigHash = BitcoinUtils.getFirstInputSigHash(pegoutTx);
if (!pegoutTxSigHash.isPresent()){
throw new IllegalStateException(String.format("SigHash could not be obtained from btc tx %s", pegoutTx.getHash()));
}
provider.setPegoutTxSigHash(pegoutTxSigHash.get());
}

/**
* Processes pegout waiting for confirmations.
* It basically looks for pegout transactions with enough confirmations
Expand Down Expand Up @@ -2684,24 +2686,22 @@ private void generateRejectionRelease(
}

BtcTransaction refundPegoutTransaction = buildReturnResult.getBtcTx();
if (activations.isActive(ConsensusRule.RSKIP146)) {
provider.getPegoutsWaitingForConfirmations().add(refundPegoutTransaction, rskExecutionBlock.getNumber(), rskTxHash);
eventLogger.logReleaseBtcRequested(rskTxHash.getBytes(), refundPegoutTransaction, totalAmount);
} else {
provider.getPegoutsWaitingForConfirmations().add(refundPegoutTransaction, rskExecutionBlock.getNumber());
}

if (activations.isActive(RSKIP428)) {
List<Coin> outpointValues = extractOutpointValues(refundPegoutTransaction);
eventLogger.logPegoutTransactionCreated(refundPegoutTransaction.getHash(), outpointValues);
}

logger.info(
"[generateRejectionRelease] Rejecting peg-in tx built successfully: Refund to address: {}. RskTxHash: {}. Value {}.",
btcRefundAddress,
rskTxHash,
totalAmount
);

PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = provider.getPegoutsWaitingForConfirmations();
settleReleaseRejection(pegoutsWaitingForConfirmations, refundPegoutTransaction, rskTxHash, totalAmount);
}

private void settleReleaseRejection(PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations, BtcTransaction pegoutTransaction, Keccak256 releaseCreationTxHash, Coin requestedAmount) {
addPegoutToPegoutsWaitingForConfirmations(pegoutsWaitingForConfirmations, pegoutTransaction, releaseCreationTxHash);
logReleaseRequested(releaseCreationTxHash, pegoutTransaction, requestedAmount);
logPegoutTransactionCreated(pegoutTransaction);
}

private void generateRejectionRelease(
Expand Down

0 comments on commit 2c6380e

Please sign in to comment.