mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make special case for irregular tx with segwit BSQ inputs

Browse Source 
Selectively disable pubkey extraction from segwit inputs of a particular
tx at block height 660384 (2020-12-07), which spends spuriously created
segwit BSQ (later burned), to prevent a change in the DAO state hashes
from that point.

(Since a tx with a given ID can only appear on one chain, a fixed global
exclusion list of IDs should not cause any issues on testnet/regtest
versus mainnet. This is simpler than conditioning by block height.)
This commit is contained in:
Steven Barclay 2021-01-08 21:37:55 +00:00
parent 796097abbc
commit a850adadb6
No known key found for this signature in database
GPG Key ID: 9FED6BF1176D500B
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/bisq/core/dao/node/full/RpcService.java
View File

@ -48,6 +48,7 @@ import com.google.common.util.concurrent.MoreExecutors;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -62,6 +63,13 @@ import org.jetbrains.annotations.NotNull;
*/ */
@Slf4j @Slf4j
public class RpcService { public class RpcService {
// The BSQ tx with the following ID has 1 segwit (P2WPKH) BSQ input and 1 segwit (P2WPKH)
// BTC input, but with null pubKey already recorded in the DaoState for both inputs. Thus
// we must make a special case for it, as it was mined prior to the BSQ segwit upgrade.
private static final Set<String> BSQ_TXS_DISALLOWING_SEGWIT_PUB_KEYS = Set.of(
"d1f45e55be6101b1b75e6bf9fc5e5341c6ab420647be7555863bbbddd84e92f3" // in mainnet block 660384, 2020-12-07
);
private final String rpcUser; private final String rpcUser;
private final String rpcPassword; private final String rpcPassword;
private final String rpcHost; private final String rpcHost;
@ -246,8 +254,10 @@ public class RpcService {
// To maintain backwards compatibility when serializing and hashing the DAO state, // To maintain backwards compatibility when serializing and hashing the DAO state,
// segwit pubKeys are only extracted for the first input, as this will always be a // segwit pubKeys are only extracted for the first input, as this will always be a
// BSQ input. Later inputs might be segwit BTC, which would have had a null pubKey // BSQ input. Later inputs might be segwit BTC, which would have had a null pubKey
// recorded in the DAO state prior to the segwit upgrade of the RPC client. // recorded in the DAO state prior to the segwit upgrade of the RPC client. Spurious
String pubKeyAsHex = extractPubKeyAsHex(rawInput, rawInput == rawDtoTx.getVIn().get(0)); // segwit BSQ inputs in txs mined prior to the upgrade also require exclusion.
String pubKeyAsHex = extractPubKeyAsHex(rawInput, rawInput == rawDtoTx.getVIn().get(0) &&
!BSQ_TXS_DISALLOWING_SEGWIT_PUB_KEYS.contains(txId));
if (pubKeyAsHex == null) { if (pubKeyAsHex == null) {
log.debug("pubKeyAsHex is not set as we received a not supported sigScript. " + log.debug("pubKeyAsHex is not set as we received a not supported sigScript. " +
"txId={}, asm={}, txInWitness={}", "txId={}, asm={}, txInWitness={}",