3
0
mirror of https://github.com/Qortal/qortal.git synced 2025-02-14 11:15:49 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
kennycud 2024-10-13 12:35:39 -07:00
commit 0a5ac37815
2 changed files with 3 additions and 5 deletions

View File

@ -326,11 +326,8 @@ public class AddressesResource {
) )
} }
) )
@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.NON_PRODUCTION, ApiError.REPOSITORY_ISSUE}) @ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.REPOSITORY_ISSUE})
public String fromPublicKey(@PathParam("publickey") String publicKey58) { public String fromPublicKey(@PathParam("publickey") String publicKey58) {
if (Settings.getInstance().isApiRestricted())
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NON_PRODUCTION);
// Decode public key // Decode public key
byte[] publicKey; byte[] publicKey;
try { try {

View File

@ -272,7 +272,8 @@ public class Settings {
private String[] bootstrapHosts = new String[] { private String[] bootstrapHosts = new String[] {
"http://bootstrap.qortal.org", "http://bootstrap.qortal.org",
"http://bootstrap2.qortal.org", "http://bootstrap2.qortal.org",
"http://bootstrap3.qortal.org" "http://bootstrap3.qortal.org",
"http://bootstrap4.qortal.org"
}; };
// Auto-update sources // Auto-update sources