AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

WIP: trade-bot: add xprv validation method to BTC class and use that for API call /crosschain/tradebot/respond instead of vague byte-length check

Browse Source
This commit is contained in:
catbref 2020-07-29 18:11:47 +01:00
parent e2dc91c1ea
commit d85b746021
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/qortal/api/resource/CrossChainResource.java
View File

@ -1028,15 +1028,8 @@ public class CrossChainResource {
if (atAddress == null || !Crypto.isValidAtAddress(atAddress))
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
final byte[] xprv;
try {
xprv = Base58.decode(tradeBotRespondRequest.xprv58);
if (xprv.length != 4 + 1 + 4 + 4 + 32 + 33 + 4)
if (!BTC.getInstance().isValidXprv(tradeBotRespondRequest.xprv58))
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
} catch (NumberFormatException e) {
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
}
// Extract data from cross-chain trading AT
try (final Repository repository = RepositoryManager.getRepository()) {

9
src/main/java/org/qortal/crosschain/BTC.java
View File

@ -117,6 +117,15 @@ public class BTC {
return format(Coin.valueOf(amount));
}
public boolean isValidXprv(String xprv58) {
try {
DeterministicKey.deserializeB58(null, xprv58, this.params);
return true;
} catch (IllegalArgumentException e) {
return false;
}
}
/** Returns P2PKH Bitcoin address using passed public key hash. */
public String pkhToAddress(byte[] publicKeyHash) {
return LegacyAddress.fromPubKeyHash(this.params, publicKeyHash).toString();