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

Reject witness >v0 addresses incorrectly encoded as Bech32

Browse Source 
Reject any custom receiver address which wasn't encoded as Bech32m if
the witness program version is greater than zero. These are currently
accepted by bitcoinj but are now invalid and would fail to parse if our
fork was updated to understand Bech32m, to support sending to P2TR
addresses, which the upstream version appears to. (Thus, the presence of
such malformed receivers would not be an issue at present, but might
cause complications in the future.)
This commit is contained in:
Steven Barclay 2024-07-18 00:14:18 +02:00
parent 99165e7bd9
commit b10ccd2868
No known key found for this signature in database
GPG Key ID: 9FED6BF1176D500B
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java
View File

@ -47,9 +47,9 @@ public final class BtcAddressValidator extends InputValidator {
return new ValidationResult(true);
}
try {
Address.fromString(Config.baseCurrencyNetworkParameters(), input);
Address.fromString(Config.baseCurrencyNetworkParameters(), input).getOutputScriptType();
return new ValidationResult(true);
} catch (AddressFormatException e) {
} catch (AddressFormatException | IllegalStateException e) {
return new ValidationResult(false, Res.get("validation.btc.invalidFormat"));
}
}

12
core/src/test/java/bisq/core/dao/burningman/BurningManServiceTest.java
View File

@ -73,6 +73,9 @@ public class BurningManServiceTest {
private static final String VALID_P2WPKH_ADDRESS = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
private static final String VALID_P2TR_ADDRESS = "bc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqzk5jj0"; // unsupported
private static final String INVALID_ADDRESS = "invalid_address";
// Valid Bech32 encoding of a witness v2 program, which is standard in outputs, but anyone-can-spend (as of 2024).
// Bitcoinj should be upgraded to reject such addresses, as only Bech32m should be used for witness v1 and above.
private static final String BADLY_ENCODED_ADDRESS = "bc1zw508d6qejxtdg4y5r3zarvaryvg6kdaj";
@Test
public void testGetDecayedAmount() {
@ -147,13 +150,15 @@ public class BurningManServiceTest {
compensationIssuanceAndPayload("alice", "0000", 790000, 10000, VALID_P2SH_ADDRESS),
compensationIssuanceAndPayload("bob", "0001", 790000, 10000, VALID_P2WPKH_ADDRESS),
compensationIssuanceAndPayload("carol", "0002", 790000, 10000, VALID_P2TR_ADDRESS),
compensationIssuanceAndPayload("dave", "0003", 790000, 10000, INVALID_ADDRESS)
compensationIssuanceAndPayload("dave", "0003", 790000, 10000, INVALID_ADDRESS),
compensationIssuanceAndPayload("earl", "0004", 790000, 10000, BADLY_ENCODED_ADDRESS)
);
addProofOfBurnTxs(
proofOfBurnTx("alice", "1000", 790000, 10000),
proofOfBurnTx("bob", "1001", 790000, 10000),
proofOfBurnTx("carol", "1002", 790000, 10000),
proofOfBurnTx("dave", "1003", 790000, 10000)
proofOfBurnTx("dave", "1003", 790000, 10000),
proofOfBurnTx("earl", "1004", 790000, 10000)
);
var candidateMap = burningManService.getBurningManCandidatesByName(800000, limitCappingRounds);
@ -161,9 +166,10 @@ public class BurningManServiceTest {
assertEquals(0.11, candidateMap.get("bob").getMaxBoostedCompensationShare());
assertEquals(0.0, candidateMap.get("carol").getMaxBoostedCompensationShare());
assertEquals(0.0, candidateMap.get("dave").getMaxBoostedCompensationShare());
assertEquals(0.0, candidateMap.get("earl").getMaxBoostedCompensationShare());
assertAll(candidateMap.values().stream().map(candidate -> () -> {
assertEquals(0.25, candidate.getBurnAmountShare());
assertEquals(0.2, candidate.getBurnAmountShare());
assertEquals(candidate.getMaxBoostedCompensationShare(), candidate.getCappedBurnAmountShare());
}));
}