Delete messages from cache after 1 hour to reduce memory usage.

This would allow a duplicate message to be send again after an hour, but this is okay as it is only really designed to prevent frequent spamming of the same content.

.github/workflows/pr-testing.yml

@@ -8,16 +8,16 @@ jobs:
   mavenTesting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Cache local Maven repository
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up the Java JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
       with:
         java-version: '11'
         distribution: 'adopt'

.gitignore

@@ -14,6 +14,7 @@
 /.mvn.classpath
 /notes*
 /settings.json
+/testnet*
 /settings*.json
 /testchain*.json
 /run-testnet*.sh
@@ -25,9 +26,3 @@
 /run.pid
 /run.log
 /WindowsInstaller/Install Files/qortal.jar
-/*.7z
-/tmp
-/wallets
-/data*
-/src/test/resources/arbitrary/*/.qortal/cache
-apikey.txt

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "java.compile.nullAnalysis.mode": "automatic"
-}

AutoUpdates.md

@@ -8,7 +8,7 @@
 * Build auto-update download: `tools/build-auto-update.sh` - uploads auto-update file into new git branch
 * Restart local node
 * Publish auto-update transaction using *private key* for **non-admin** member of "dev" group:
-	`tools/publish-auto-update.pl non-admin-dev-member-private-key-in-base58`
+	`tools/publish-auto-update.sh non-admin-dev-member-private-key-in-base58`
 * Wait for auto-update `ARBITRARY` transaction to be confirmed into a block
 * Have "dev" group admins 'approve' auto-update using `tools/approve-auto-update.sh`
 	This tool will prompt for *private key* of **admin** of "dev" group

Dockerfile

@@ -1,26 +0,0 @@
-FROM maven:3-openjdk-11 as builder
-
-WORKDIR /work
-COPY ./ /work/
-RUN mvn clean package
-
-###
-FROM openjdk:11
-
-RUN useradd -r -u 1000 -g users qortal && \
-    mkdir /usr/local/qortal /qortal && \
-    chown 1000:100 /qortal
-
-COPY --from=builder /work/log4j2.properties /usr/local/qortal/
-COPY --from=builder /work/target/qortal*.jar /usr/local/qortal/qortal.jar
-
-USER 1000:100
-
-EXPOSE 12391 12392
-HEALTHCHECK --start-period=5m CMD curl -sf http://127.0.0.1:12391/admin/info || exit 1
-
-WORKDIR /qortal
-VOLUME /qortal
-
-ENTRYPOINT ["java"]
-CMD ["-Djava.net.preferIPv4Stack=false", "-jar", "/usr/local/qortal/qortal.jar"]

Q-Apps.md

@@ -1,919 +0,0 @@
-# Qortal Project - Q-Apps Documentation
-
-## Introduction
-
-Q-Apps are static web apps written in javascript, HTML, CSS, and other static assets. The key difference between a Q-App and a fully static site is its ability to interact with both the logged-in user and on-chain data. This is achieved using the API described in this document.
-
-
-# Section 0: Basic QDN concepts
-
-## Introduction to QDN resources
-Each published item on QDN (Qortal Data Network) is referred to as a "resource". A resource could contain anything from a few characters of text, to a multi-layered directory structure containing thousands of files.
-
-Resources are stored on-chain, however the data payload is generally stored off-chain, and verified using an on-chain SHA-256 hash.
-
-To publish a resource, a user must first register a name, and then include that name when publishing the data. Accounts without a registered name are unable to publish to QDN from a Q-App at this time.
-
-Owning the name grants update privileges to the data. If that name is later sold or transferred, the permission to update that resource is moved to the new owner.
-
-
-## Name, service & identifier
-
-Each QDN resource has 3 important fields:
-- `name` - the registered name of the account that is publishing the data (which will hold update/edit privileges going forwards).<br /><br />
-- `service` - the type of content (e.g. IMAGE or JSON). Different services have different validation rules. See [list of available services](#services).<br /><br />
-- `identifier` - an optional string to allow more than one resource to exist for a given name/service combination. For example, the name `QortalDemo` may wish to publish multiple images. This can be achieved by using a different identifier string for each. The identifier is only unique to the name in question, and so it doesn't matter if another name is using the same service and identifier string.
-
-
-## Shared identifiers
-
-Since an identifier can be used by multiple names, this can be used to the advantage of Q-App developers as it allows for data to be stored in a deterministic location.
-
-An example of this is the user's avatar. This will always be published with service `THUMBNAIL` and identifier `qortal_avatar`, along with the user's name. So, an app can display the avatar of a user just by specifying their name when requesting the data. The same applies when publishing data.
-
-
-## "Default" resources
-
-A "default" resource refers to one without an identifier. For example, when a website is published via the UI, it will use the user's name and the service `WEBSITE`. These do not have an identifier, and are therefore the "default" website for this name. When requesting or publishing data without an identifier, apps can either omit the `identifier` key entirely, or include `"identifier": "default"` to indicate that the resource(s) being queried or published do not have an identifier.
-
-
-<a name="services"></a>
-## Available service types
-
-Here is a list of currently available services that can be used in Q-Apps:
-
-### Public services ###
-The services below are intended to be used for publicly accessible data.
-
-IMAGE,
-THUMBNAIL,
-VIDEO,
-AUDIO,
-PODCAST,
-VOICE,
-ARBITRARY_DATA,
-JSON,
-DOCUMENT,
-LIST,
-PLAYLIST,
-METADATA,
-BLOG,
-BLOG_POST,
-BLOG_COMMENT,
-GIF_REPOSITORY,
-ATTACHMENT,
-FILE,
-FILES,
-CHAIN_DATA,
-STORE,
-PRODUCT,
-OFFER,
-COUPON,
-CODE,
-PLUGIN,
-EXTENSION,
-GAME,
-ITEM,
-NFT,
-DATABASE,
-SNAPSHOT,
-COMMENT,
-CHAIN_COMMENT,
-WEBSITE,
-APP,
-QCHAT_ATTACHMENT,
-QCHAT_IMAGE,
-QCHAT_AUDIO,
-QCHAT_VOICE
-
-### Private services ###
-For the services below, data is encrypted for a single recipient, and can only be decrypted using the private key of the recipient's wallet.
-
-QCHAT_ATTACHMENT_PRIVATE,
-ATTACHMENT_PRIVATE,
-FILE_PRIVATE,
-IMAGE_PRIVATE,
-VIDEO_PRIVATE,
-AUDIO_PRIVATE,
-VOICE_PRIVATE,
-DOCUMENT_PRIVATE,
-MAIL_PRIVATE,
-MESSAGE_PRIVATE
-
-
-## Single vs multi-file resources
-
-Some resources, such as those published with the `IMAGE` or `JSON` service, consist of a single file or piece of data (the image or the JSON string). This is the most common type of QDN resource, especially in the context of Q-Apps. These can be published by supplying a base64-encoded string containing the data.
-
-Other resources, such as those published with the `WEBSITE`, `APP`, or `GIF_REPOSITORY` service, can contain multiple files and directories. Publishing these kinds of files is not yet available for Q-Apps, however it is possible to retrieve multi-file resources that are already published. When retrieving this data (via FETCH_QDN_RESOURCE), a `filepath` must be included to indicate the file that you would like to retrieve. There is no need to specify a filepath for single file resources, as these will automatically return the contents of the single file.
-
-
-## App-specific data
-
-Some apps may want to make all QDN data for a particular service available. However, others may prefer to only deal with data that has been published by their app (if a specific format/schema is being used for instance).
-
-Identifiers can be used to allow app developers to locate data that has been published by their app. The recommended approach for this is to use the app name as a prefix on all identifiers when publishing data.
-
-For instance, an app called `MyApp` could allow users to publish JSON data. The app could choose to prefix all identifiers with the string `myapp_`, and then use a random string for each published resource (resulting in identifiers such as `myapp_qR5ndZ8v`). Then, to locate data that has potentially been published by users of MyApp, it can later search the QDN database for items with `"service": "JSON"` and `"identifier": "myapp_"`. The SEARCH_QDN_RESOURCES action has a `prefix` option in order to match identifiers beginning with the supplied string.
-
-Note that QDN is a permissionless system, and therefore it's not possible to verify that a resource was actually published by the app. It is recommended that apps validate the contents of the resource to ensure it is formatted correctly, instead of making assumptions.
-
-
-## Updating a resource
-
-To update a resource, it can be overwritten by publishing with the same `name`, `service`, and `identifier` combination. Note that the authenticated account must currently own the name in order to publish an update.
-
-
-## Routing
-
-If a non-existent `filepath` is accessed, the default behaviour of QDN is to return a `404: File not found` error. This includes anything published using the `WEBSITE` service.
-
-However, routing is handled differently for anything published using the `APP` service. 
-
-For apps, QDN automatically sends all unhandled requests to the index file (generally index.html). This allows the app to use custom routing, as it is able to listen on any path. If a file exists at a path, the file itself will be served, and so the request won't be sent to the index file.
-
-It's recommended that all apps return a 404 page if a request isn't able to be routed.
-
-
-# Section 1: Simple links and image loading via HTML
-
-## Section 1a: Linking to other QDN websites / resources
-
-The `qortal://` protocol can be used to access QDN data from within Qortal websites and apps. The basic format is as follows:
-```
-<a href="qortal://{service}/{name}/{identifier}/{path}">link text</a>
-```
-
-However, the system will support the omission of the `identifier` and/or `path` components to allow for simpler URL formats.
-
-A simple link to another website can be achieved with this HTML code:
-```
-<a href="qortal://WEBSITE/QortalDemo">link text</a>
-```
-
-To link to a specific page of another website:
-```
-<a href="qortal://WEBSITE/QortalDemo/minting-leveling/index.html">link text</a>
-```
-
-To link to a standalone resource, such as an avatar
-```
-<a href="qortal://THUMBNAIL/QortalDemo/qortal_avatar">avatar</a>
-```
-
-For cases where you would prefer to explicitly include an identifier (to remove ambiguity) you can use the keyword `default` to access a resource that doesn't have an identifier. For instance:
-```
-<a href="qortal://WEBSITE/QortalDemo/default">link to root of website</a>
-<a href="qortal://WEBSITE/QortalDemo/default/minting-leveling/index.html">link to subpage of website</a>
-```
-
-
-## Section 1b: Linking to other QDN images
-
-The same applies for images, such as displaying an avatar:
-```
-<img src="qortal://THUMBNAIL/QortalDemo/qortal_avatar" />
-```
-
-...or even an image from an entirely different website:
-```
-<img src="qortal://WEBSITE/AlphaX/assets/img/logo.png" />
-```
-
-
-# Section 2: Integrating a Javascript app
-
-Javascript apps allow for much more complex integrations with Qortal's blockchain data.
-
-## Section 2a: Direct API calls
-
-The standard [Qortal Core API](http://localhost:12391/api-documentation) is available to websites and apps, and can be called directly using a standard AJAX request, such as:
-```
-async function getNameInfo(name) {
-    const response = await fetch("/names/" + name);
-    const nameData = await response.json();
-    console.log("nameData: " + JSON.stringify(nameData));
-}
-getNameInfo("QortalDemo");
-```
-
-However, this only works for read-only data, such as looking up transactions, names, balances, etc. Also, since the address of the logged in account can't be retrieved from the core, apps can't show personalized data with this approach.
-
-
-## Section 2b: User interaction via qortalRequest()
-
-To take things a step further, the qortalRequest() function can be used to interact with the user, in order to:
-
-- Request address and public key of the logged in account
-- Publish data to QDN
-- Send chat messages
-- Join groups
-- Deploy ATs (smart contracts)
-- Send QORT or any supported foreign coin
-- Add/remove items from lists
-
-In addition to the above, qortalRequest() also supports many read-only functions that are also available via direct core API calls. Using qortalRequest() helps with futureproofing, as the core APIs can be modified without breaking functionality of existing Q-Apps.
-
-
-### Making a request
-
-Qortal core will automatically inject the `qortalRequest()` javascript function to all websites/apps, which returns a Promise. This can be used to fetch data or publish data to the Qortal blockchain. This functionality supports async/await, as well as try/catch error handling.
-
-```
-async function myfunction() {
-    try {
-        let res = await qortalRequest({
-            action: "GET_ACCOUNT_DATA",
-            address: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2"
-        });
-        console.log(JSON.stringify(res)); // Log the response to the console
-    
-    } catch(e) {
-        console.log("Error: " + JSON.stringify(e));
-    }
-}
-myfunction();
-```
-
-### Timeouts
-
-Request timeouts are handled automatically when using qortalRequest(). The timeout value will differ based on the action being used - see `getDefaultTimeout()` in [q-apps.js](src/main/resources/q-apps/q-apps.js) for the current values.
-
-If a request times out it will throw an error - `The request timed out` - which can be handled by the Q-App.
-
-It is also possible to specify a custom timeout using `qortalRequestWithTimeout(request, timeout)`, however this is discouraged. It's more reliable and futureproof to let the core handle the timeout values.
-
-
-# Section 3: qortalRequest Documentation
-
-## Supported actions
-
-Here is a list of currently supported actions:
-- GET_USER_ACCOUNT
-- GET_ACCOUNT_DATA
-- GET_ACCOUNT_NAMES
-- SEARCH_NAMES
-- GET_NAME_DATA
-- LIST_QDN_RESOURCES
-- SEARCH_QDN_RESOURCES
-- GET_QDN_RESOURCE_STATUS
-- GET_QDN_RESOURCE_PROPERTIES
-- GET_QDN_RESOURCE_METADATA
-- GET_QDN_RESOURCE_URL
-- LINK_TO_QDN_RESOURCE
-- FETCH_QDN_RESOURCE
-- PUBLISH_QDN_RESOURCE
-- PUBLISH_MULTIPLE_QDN_RESOURCES
-- DECRYPT_DATA
-- SAVE_FILE
-- GET_WALLET_BALANCE
-- GET_BALANCE
-- SEND_COIN
-- SEARCH_CHAT_MESSAGES
-- SEND_CHAT_MESSAGE
-- LIST_GROUPS
-- JOIN_GROUP
-- DEPLOY_AT
-- GET_AT
-- GET_AT_DATA
-- LIST_ATS
-- FETCH_BLOCK
-- FETCH_BLOCK_RANGE
-- SEARCH_TRANSACTIONS
-- GET_PRICE
-- GET_LIST_ITEMS
-- ADD_LIST_ITEMS
-- DELETE_LIST_ITEM
-
-More functionality will be added in the future.
-
-## Example Requests
-
-Here are some example requests for each of the above:
-
-### Get address of logged in account
-_Will likely require user approval_
-```
-let account = await qortalRequest({
-     action: "GET_USER_ACCOUNT"
-});
-let address = account.address;
-```
-
-### Get public key of logged in account
-_Will likely require user approval_
-```
-let pubkey = await qortalRequest({
-     action: "GET_USER_ACCOUNT"
-});
-let publicKey = account.publicKey;
-```
-
-### Get account data
-```
-let res = await qortalRequest({
-    action: "GET_ACCOUNT_DATA",
-    address: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2"
-});
-```
-
-### Get names owned by account
-```
-let res = await qortalRequest({
-    action: "GET_ACCOUNT_NAMES",
-    address: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2"
-});
-```
-
-### Search names
-```
-let res = await qortalRequest({
-    action: "SEARCH_NAMES",
-    query: "search query goes here",
-    prefix: false, // Optional - if true, only the beginning of the name is matched
-    limit: 100,
-    offset: 0,
-    reverse: false
-});
-```
-
-### Get name data
-```
-let res = await qortalRequest({
-    action: "GET_NAME_DATA",
-    name: "QortalDemo"
-});
-```
-
-
-### List QDN resources
-```
-let res = await qortalRequest({
-    action: "LIST_QDN_RESOURCES",
-    service: "THUMBNAIL",
-    name: "QortalDemo", // Optional (exact match)
-    identifier: "qortal_avatar", // Optional (exact match)
-    default: true, // Optional
-    includeStatus: false, // Optional - will take time to respond, so only request if necessary
-    includeMetadata: false, // Optional - will take time to respond, so only request if necessary
-    followedOnly: false, // Optional - include followed names only
-    excludeBlocked: false, // Optional - exclude blocked content
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Search QDN resources
-```
-let res = await qortalRequest({
-    action: "SEARCH_QDN_RESOURCES",
-    service: "THUMBNAIL",
-    query: "search query goes here", // Optional - searches both "identifier" and "name" fields
-    identifier: "search query goes here", // Optional - searches only the "identifier" field
-    name: "search query goes here", // Optional - searches only the "name" field
-    prefix: false, // Optional - if true, only the beginning of fields are matched in all of the above filters
-    exactMatchNames: true, // Optional - if true, partial name matches are excluded
-    default: false, // Optional - if true, only resources without identifiers are returned
-    mode: "LATEST", // Optional - whether to return all resources or just the latest for a name/service combination. Possible values: ALL,LATEST. Default: LATEST
-    minLevel: 1, // Optional - whether to filter results by minimum account level
-    includeStatus: false, // Optional - will take time to respond, so only request if necessary
-    includeMetadata: false, // Optional - will take time to respond, so only request if necessary
-    nameListFilter: "QApp1234Subscriptions", // Optional - will only return results if they are from a name included in supplied list
-    followedOnly: false, // Optional - include followed names only
-    excludeBlocked: false, // Optional - exclude blocked content
-    // before: 1683546000000, // Optional - limit to resources created before timestamp
-    // after: 1683546000000, // Optional - limit to resources created after timestamp
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Search QDN resources (multiple names)
-```
-let res = await qortalRequest({
-    action: "SEARCH_QDN_RESOURCES",
-    service: "THUMBNAIL",
-    query: "search query goes here", // Optional - searches both "identifier" and "name" fields
-    identifier: "search query goes here", // Optional - searches only the "identifier" field
-    names: ["QortalDemo", "crowetic", "AlphaX"], // Optional - searches only the "name" field for any of the supplied names
-    prefix: false, // Optional - if true, only the beginning of fields are matched in all of the above filters
-    exactMatchNames: true, // Optional - if true, partial name matches are excluded
-    default: false, // Optional - if true, only resources without identifiers are returned
-    mode: "LATEST", // Optional - whether to return all resources or just the latest for a name/service combination. Possible values: ALL,LATEST. Default: LATEST
-    includeStatus: false, // Optional - will take time to respond, so only request if necessary
-    includeMetadata: false, // Optional - will take time to respond, so only request if necessary
-    nameListFilter: "QApp1234Subscriptions", // Optional - will only return results if they are from a name included in supplied list
-    followedOnly: false, // Optional - include followed names only
-    excludeBlocked: false, // Optional - exclude blocked content
-    // before: 1683546000000, // Optional - limit to resources created before timestamp
-    // after: 1683546000000, // Optional - limit to resources created after timestamp
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Fetch QDN single file resource
-```
-let res = await qortalRequest({
-    action: "FETCH_QDN_RESOURCE",
-    name: "QortalDemo",
-    service: "THUMBNAIL",
-    identifier: "qortal_avatar", // Optional. If omitted, the default resource is returned, or you can alternatively use the keyword "default"
-    encoding: "base64", // Optional. If omitted, data is returned in raw form
-    rebuild: false
-});
-```
-
-### Fetch file from multi file QDN resource
-Data is returned in the base64 format
-```
-let res = await qortalRequest({
-    action: "FETCH_QDN_RESOURCE",
-    name: "QortalDemo",
-    service: "WEBSITE",
-    identifier: "default", // Optional. If omitted, the default resource is returned, or you can alternatively request that using the keyword "default", as shown here
-    filepath: "index.html", // Required only for resources containing more than one file
-    rebuild: false
-});
-```
-
-### Get QDN resource status
-```
-let res = await qortalRequest({
-    action: "GET_QDN_RESOURCE_STATUS",
-    name: "QortalDemo",
-    service: "THUMBNAIL",
-    identifier: "qortal_avatar", // Optional
-    build: true // Optional - request that the resource is fetched & built in the background
-});
-```
-
-### Get QDN resource properties
-```
-let res = await qortalRequest({
-    action: "GET_QDN_RESOURCE_PROPERTIES",
-    name: "QortalDemo",
-    service: "THUMBNAIL",
-    identifier: "qortal_avatar" // Optional
-});
-// Returns: filename, size, mimeType (where available)
-```
-
-### Get QDN resource metadata
-```
-let res = await qortalRequest({
-    action: "GET_QDN_RESOURCE_METADATA",
-    name: "QortalDemo",
-    service: "THUMBNAIL",
-    identifier: "qortal_avatar" // Optional
-});
-```
-
-### Publish a single file to QDN
-_Requires user approval_.<br />
-Note: this publishes a single, base64-encoded file. Multi-file resource publishing (such as a WEBSITE or GIF_REPOSITORY) is not yet supported via a Q-App. It will be added in a future update.
-```
-let res = await qortalRequest({
-    action: "PUBLISH_QDN_RESOURCE",
-    name: "Demo", // Publisher must own the registered name - use GET_ACCOUNT_NAMES for a list
-    service: "IMAGE",
-    identifier: "myapp-image1234" // Optional
-    data64: "base64_encoded_data",
-    // filename: "image.jpg", // Optional - to help apps determine the file's type
-    // title: "Title", // Optional
-    // description: "Description", // Optional
-    // category: "TECHNOLOGY", // Optional
-    // tag1: "any", // Optional
-    // tag2: "strings", // Optional
-    // tag3: "can", // Optional
-    // tag4: "go", // Optional
-    // tag5: "here", // Optional
-    // encrypt: true, // Optional - to be used with a private service
-    // recipientPublicKey: "publickeygoeshere" // Only required if `encrypt` is set to true
-});
-```
-
-### Publish multiple resources at once to QDN
-_Requires user approval_.<br />
-Note: each resource being published consists of a single, base64-encoded file, each in its own transaction. Useful for publishing two or more related things, such as a video and a video thumbnail.
-```
-let res = await qortalRequest({
-    action: "PUBLISH_MULTIPLE_QDN_RESOURCES",
-    resources: [
-        name: "Demo", // Publisher must own the registered name - use GET_ACCOUNT_NAMES for a list
-        service: "IMAGE",
-        identifier: "myapp-image1234" // Optional
-        data64: "base64_encoded_data",
-        // filename: "image.jpg", // Optional - to help apps determine the file's type
-        // title: "Title", // Optional
-        // description: "Description", // Optional
-        // category: "TECHNOLOGY", // Optional
-        // tag1: "any", // Optional
-        // tag2: "strings", // Optional
-        // tag3: "can", // Optional
-        // tag4: "go", // Optional
-        // tag5: "here", // Optional
-        // encrypt: true, // Optional - to be used with a private service
-        // recipientPublicKey: "publickeygoeshere" // Only required if `encrypt` is set to true
-    ],
-    [
-        ... more resources here if needed ...
-    ]
-});
-```
-
-### Decrypt encrypted/private data
-```
-let res = await qortalRequest({
-    action: "DECRYPT_DATA",
-    encryptedData: 'qortalEncryptedDatabMx4fELNTV+ifJxmv4+GcuOIJOTo+3qAvbWKNY2L1r',
-    publicKey: 'publickeygoeshere'
-});
-// Returns base64 encoded string of plaintext data
-```
-
-### Prompt user to save a file to disk
-Note: mimeType not required but recommended. If not specified, saving will fail if the mimeType is unable to be derived from the Blob.
-```
-let res = await qortalRequest({
-    action: "SAVE_FILE",
-    blob: dataBlob,
-    filename: "myfile.pdf",
-    mimeType: "application/pdf" // Optional but recommended
-});
-```
-
-
-### Get wallet balance (QORT)
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "GET_WALLET_BALANCE",
-    coin: "QORT"
-});
-```
-
-
-### Get address or asset balance
-```
-let res = await qortalRequest({
-    action: "GET_BALANCE",
-    address: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2"
-});
-```
-```
-let res = await qortalRequest({
-    action: "GET_BALANCE",
-    assetId: 1,
-    address: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2"
-});
-```
-
-### Send QORT to address
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "SEND_COIN",
-    coin: "QORT",
-    destinationAddress: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2",
-    amount: 1.00000000 // 1 QORT
-});
-```
-
-### Send foreign coin to address
-_Requires user approval_<br />
-Note: default fees can be found [here](https://github.com/Qortal/qortal-ui/blob/master/plugins/plugins/core/qdn/browser/browser.src.js#L205-L209).
-```
-let res = await qortalRequest({
-    action: "SEND_COIN",
-    coin: "LTC",
-    destinationAddress: "LSdTvMHRm8sScqwCi6x9wzYQae8JeZhx6y",
-    amount: 1.00000000, // 1 LTC
-    fee: 0.00000020 // Optional fee per byte (default fee used if omitted, recommended) - not used for QORT or ARRR
-});
-```
-
-### Search or list chat messages
-```
-let res = await qortalRequest({
-    action: "SEARCH_CHAT_MESSAGES",
-    before: 999999999999999,
-    after: 0,
-    txGroupId: 0, // Optional (must specify either txGroupId or two involving addresses)
-    // involving: ["QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2", "QSefrppsDCsZebcwrqiM1gNbWq7YMDXtG2"], // Optional (must specify either txGroupId or two involving addresses)
-    // reference: "reference", // Optional
-    // chatReference: "chatreference", // Optional
-    // hasChatReference: true, // Optional
-    encoding: "BASE64", // Optional (defaults to BASE58 if omitted)
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Send a group chat message
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "SEND_CHAT_MESSAGE",
-    groupId: 0,
-    message: "Test"
-});
-```
-
-### Send a private chat message
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "SEND_CHAT_MESSAGE",
-    destinationAddress: "QZLJV7wbaFyxaoZQsjm6rb9MWMiDzWsqM2",
-    message: "Test"
-});
-```
-
-### List groups
-```
-let res = await qortalRequest({
-    action: "LIST_GROUPS",
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Join a group
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "JOIN_GROUP",
-    groupId: 100
-});
-```
-
-
-### Deploy an AT
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "DEPLOY_AT",
-    creationBytes: "12345", // Must be Base58 encoded
-    name: "test name",
-    description: "test description",
-    type: "test type",
-    tags: "test tags",
-    amount: 1.00000000, // 1 QORT
-    assetId: 0,
-    // fee: 0.002 // optional - will use default fee if excluded
-});
-```
-
-### Get AT info
-```
-let res = await qortalRequest({
-    action: "GET_AT",
-    atAddress: "ASRUsCjk6fa5bujv3oWYmWaVqNtvxydpPH"
-});
-```
-
-### Get AT data bytes (base58 encoded)
-```
-let res = await qortalRequest({
-    action: "GET_AT_DATA",
-    atAddress: "ASRUsCjk6fa5bujv3oWYmWaVqNtvxydpPH"
-});
-```
-
-### List ATs by functionality
-```
-let res = await qortalRequest({
-    action: "LIST_ATS",
-    codeHash58: "4KdJETRAdymE7dodDmJbf5d9L1bp4g5Nxky8m47TBkvA",
-    isExecutable: true,
-    limit: 100,
-    offset: 0,
-    reverse: true
-});
-```
-
-### Fetch block by signature
-```
-let res = await qortalRequest({
-    action: "FETCH_BLOCK",
-    signature: "875yGFUy1zHV2hmxNWzrhtn9S1zkeD7SQppwdXFysvTXrankCHCz4iyAUgCBM3GjvibbnyRQpriuy1cyu953U1u5uQdzuH3QjQivi9UVwz86z1Akn17MGd5Z5STjpDT7248K6vzMamuqDei57Znonr8GGgn8yyyABn35CbZUCeAuXju"
-});
-```
-
-### Fetch block by height
-```
-let res = await qortalRequest({
-    action: "FETCH_BLOCK",
-    height: "1139850"
-});
-```
-
-### Fetch a range of blocks
-```
-let res = await qortalRequest({
-    action: "FETCH_BLOCK_RANGE",
-    height: "1139800",
-    count: 20,
-    reverse: false
-});
-```
-
-### Search transactions
-```
-let res = await qortalRequest({
-    action: "SEARCH_TRANSACTIONS",
-    // startBlock: 1139000,
-    // blockLimit: 1000,
-    txGroupId: 0,
-    txType: [
-        "PAYMENT",
-        "REWARD_SHARE"
-    ],
-    confirmationStatus: "CONFIRMED",
-    limit: 10,
-    offset: 0,
-    reverse: false
-});
-```
-
-### Get an estimate of the QORT price
-```
-let res = await qortalRequest({
-    action: "GET_PRICE",
-    blockchain: "LITECOIN",
-    // maxtrades: 10,
-    inverse: true
-});
-```
-
-### Get URL to load a QDN resource
-Note: this returns a "Resource does not exist" error if a non-existent resource is requested.
-```
-let url = await qortalRequest({
-    action: "GET_QDN_RESOURCE_URL",
-    service: "THUMBNAIL",
-    name: "QortalDemo",
-    identifier: "qortal_avatar"
-    // path: "filename.jpg" // optional - not needed if resource contains only one file
-});
-```
-
-### Get URL to load a QDN website
-Note: this returns a "Resource does not exist" error if a non-existent resource is requested.
-```
-let url = await qortalRequest({
-    action: "GET_QDN_RESOURCE_URL",
-    service: "WEBSITE",
-    name: "QortalDemo",
-});
-```
-
-### Get URL to load a specific file from a QDN website
-Note: this returns a "Resource does not exist" error if a non-existent resource is requested.
-```
-let url = await qortalRequest({
-    action: "GET_QDN_RESOURCE_URL",
-    service: "WEBSITE",
-    name: "AlphaX",
-    path: "/assets/img/logo.png"
-});
-```
-
-### Link/redirect to another QDN website
-Note: an alternate method is to include `<a href="qortal://WEBSITE/QortalDemo">link text</a>` within your HTML code.
-```
-let res = await qortalRequest({
-    action: "LINK_TO_QDN_RESOURCE",
-    service: "WEBSITE",
-    name: "QortalDemo",
-});
-```
-
-### Link/redirect to a specific path of another QDN website
-Note: an alternate method is to include `<a href="qortal://WEBSITE/QortalDemo/minting-leveling/index.html">link text</a>` within your HTML code.
-```
-let res = await qortalRequest({
-    action: "LINK_TO_QDN_RESOURCE",
-    service: "WEBSITE",
-    name: "QortalDemo",
-    path: "/minting-leveling/index.html"
-});
-```
-
-### Get the contents of a list
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "GET_LIST_ITEMS",
-    list_name: "followedNames"
-});
-```
-
-### Add one or more items to a list
-_Requires user approval_
-```
-let res = await qortalRequest({
-    action: "ADD_LIST_ITEMS",
-    list_name: "blockedNames",
-    items: ["QortalDemo"]
-});
-```
-
-### Delete a single item from a list
-_Requires user approval_.
-Items must be deleted one at a time.
-```
-let res = await qortalRequest({
-    action: "DELETE_LIST_ITEM",
-    list_name: "blockedNames",
-    item: "QortalDemo"
-});
-```
-
-
-# Section 4: Examples
-
-Some example projects can be found [here](https://github.com/Qortal/Q-Apps). These can be cloned and modified, or used as a reference when creating a new app.
-
-
-## Sample App
-
-Here is a sample application to display the logged-in user's avatar:
-```
-<html>
-<head>
-    <script>
-        async function showAvatar() {
-            try {
-                // Get QORT address of logged in account
-                let account = await qortalRequest({
-                    action: "GET_USER_ACCOUNT"
-                });
-                let address = account.address;
-                console.log("address: " + address);
-            
-                // Get names owned by this account
-                let names = await qortalRequest({
-                    action: "GET_ACCOUNT_NAMES",
-                    address: address
-                });
-                console.log("names: " + JSON.stringify(names));
-            
-                if (names.length == 0) {
-                    console.log("User has no registered names");
-                    return;
-                }
-            
-                // Download base64-encoded avatar of the first registered name
-                let avatar = await qortalRequest({
-                    action: "FETCH_QDN_RESOURCE",
-                    name: names[0].name,
-                    service: "THUMBNAIL",
-                    identifier: "qortal_avatar",
-                    encoding: "base64"
-                });
-                console.log("Avatar size: " + avatar.length + " bytes");
-            
-                // Display the avatar image on the screen
-                document.getElementById("avatar").src = "data:image/png;base64," + avatar;
-                
-            } catch(e) {
-                console.log("Error: " + JSON.stringify(e));
-            }
-        }
-    </script>
-</head>
-<body onload="showAvatar()">
-    <img width="500" id="avatar" />
-</body>
-</html>
-```
-
-
-# Section 5: Testing and Development
-
-Publishing an in-development app to mainnet isn't recommended. There are several options for developing and testing a Q-app before publishing to mainnet:
-
-### Preview mode
-
-Select "Preview" in the UI after choosing the zip. This allows for full Q-App testing without the need to publish any data.
-
-
-### Testnets
-
-For an end-to-end test of Q-App publishing, you can use the official testnet, or set up a single node testnet of your own (often referred to as devnet) on your local machine. See [Single Node Testnet Quick Start Guide](testnet/README.md#quick-start).
-
-
-### Debugging
-
-It is recommended that you develop and test in a web browser, to allow access to the javascript console. To do this:
-1. Open the UI app, then minimise it.
-2. In a Chromium-based web browser, visit: http://localhost:12388/
-3. Log in to your account and then preview your app/website.
-4. Go to `View > Developer > JavaScript Console`. Here you can monitor console logs, errors, and network requests from your app, in the same way as any other web-app.

README.md

@@ -1,19 +1,4 @@
-# Qortal Project - Qortal Core - Primary Repository
-The Qortal Core is the blockchain and node component of the overall project. It contains the primary API, and ability to make calls to create transactions, and interact with the Qortal Blockchain Network. 
-
-In order to run the Qortal Core, a machine with java 11+ installed is required. Minimum RAM specs will vary depending on settings, but as low as 4GB of RAM should be acceptable in most scenarios. 
-
-Qortal is a complete infrastructure platform with a blockchain backend, it is capable of indefinite web and application hosting with no continual fees, replacement of DNS and centralized name systems and communications systems, and is the foundation of the next generation digital infrastructure of the world. Qortal is unique in nearly every way, and was written from scratch to address as many concerns from both the existing 'blockchain space' and the 'typical internet' as possible, while maintaining a system that is easy to use and able to run on 'any' computer. 
-
-Qortal contains extensive functionality geared toward complete decentralization of the digital world. Removal of 'middlemen' of any kind from all transactions, and ability to publish websites and applications that require no continual fees, on a name that is truly owned by the account that registered it, or purchased it from another. A single name on Qortal is capable of being both a namespace and a 'username'. That single name can have an application, website, public and private data, communications, authentication, the namespace itself and more, which can subsequently be sold to anyone else without the need to change any type of 'hosting' or DNS entries that do not exist, email that doesn't exist, etc. Maintaining the same functionality as those replaced features of web 2.0. 
-
-Over time Qortal has progressed into a fully featured environment catering to any and all types of people and organizations, and will continue to advance as time goes on. Brining more features, capability, device support, and availale replacements for web2.0. Ultimately building a new, completely user-controlled digital world without limits. 
-
-Qortal has no owner, no company on top of it, and is completely community built, run, and funded. A community-established and run group of developers known as the 'dev-group' or Qortal Development Group, make group_approval based decisions for the project's future. If you are a developer interested in assisting with the project, you meay reach out to the Qortal Development Group in any of the available Qortal community locations. Either on the Qortal network itself, or on one of the temporary centralized social media locations. 
-
-Building the future one block at a time. Welcome to Qortal. 
-
-# Building the Qortal Core from Source
+# Qortal Project - Official Repo
 
 ## Build / run
 
@@ -25,21 +10,3 @@ Building the future one block at a time. Welcome to Qortal.
 - Run JAR in same working directory as *settings.json*: `java -jar target/qortal-1.0.jar`
 - Wrap in shell script, add JVM flags, redirection, backgrounding, etc. as necessary.
 - Or use supplied example shell script: *start.sh*
-
-# Using a pre-built Qortal 'jar' binary
-
-If you would prefer to utilize a released version of Qortal, you may do so by downloading one of the available releases from the releases page, that are also linked on https://qortal.org and https://qortal.dev. 
-
-# Learning Q-App Development
-
-https://qortal.dev contains dev documentation for building JS/React (and other client-side languages) applications or 'Q-Apps' on Qortal. Q-Apps are published on Registered Qortal Names, and aside from a single Name Registration fee, and a fraction of QORT for a publish transaction, require zero continual costs. These applications get more redundant with each new access from a new Qortal Node, making your application faster for the next user to download, and stronger as time goes on. Q-Apps live indefinitely in the history of the blockchain-secured Qortal Data Network (QDN).
-
-# How to learn more
-
-If the project interests you, you may learn more from the various web2 and QDN based websites focused on introductory information. 
-
-https://qortal.org - primary internet presence 
-https://qortal.dev - secondary and development focused website with links to many new developments and documentation
-https://wiki.qortal.org - community built and managed wiki with detailed information regarding the project
-
-links to telegram and discord communities are at the top of https://qortal.org as well. 

TestNets.md

@@ -0,0 +1,69 @@
+# How to build a testnet
+
+## Create testnet blockchain config
+
+- You can begin by copying the mainnet blockchain config `src/main/resources/blockchain.json`
+- Insert `"isTestChain": true,` after the opening `{`
+- Modify testnet genesis block
+
+### Testnet genesis block
+
+- Set `timestamp` to a nearby future value, e.g. 15 mins from 'now'
+	This is to give yourself enough time to set up other testnet nodes
+- Retain the initial `ISSUE_ASSET` transactions!
+- Add `ACCOUNT_FLAGS` transactions with `"andMask": -1, "orMask": 1, "xorMask": 0` to create founders
+- Add at least one `REWARD_SHARE` transaction otherwise no-one can mint initial blocks!
+	You will need to calculate `rewardSharePublicKey` (and private key),
+	or make a new account on mainnet and use self-share key values
+- Add `ACCOUNT_LEVEL` transactions to set initial level of accounts as needed
+- Add `GENESIS` transactions to add QORT/LEGACY_QORA funds to accounts as needed
+
+## Testnet `settings.json`
+
+- Create a new `settings-test.json`
+- Make sure to add `"isTestNet": true,`
+- Make sure to reference testnet blockchain config file: `"blockchainConfig": "testchain.json",`
+- It is a good idea to use a separate database: `"repositoryPath": "db-testnet",`
+- You might also need to add `"bitcoinNet": "TEST3",` and `"litecoinNet": "TEST3",`
+
+## Other nodes
+
+- Copy `testchain.json` and `settings-test.json` to other nodes
+- Alternatively, you can run multiple nodes on the same machine by:
+	* Copying `settings-test.json` to `settings-test-1.json`
+	* Configure different `repositoryPath`
+	* Configure use of different ports:
+		+ `"apiPort": 22391,`
+		+ `"listenPort": 22392,`
+
+## Starting-up
+
+- Start up at least as many nodes as `minBlockchainPeers` (or adjust this value instead)
+- Probably best to perform API call `DELETE /peers/known`
+- Add other nodes via API call `POST /peers <peer-hostname-or-IP>`
+- Add minting private key to node(s) via API call `POST /admin/mintingaccounts <minting-private-key>`
+	This key must have corresponding `REWARD_SHARE` transaction in testnet genesis block
+- Wait for genesis block timestamp to pass
+- A node should mint block 2 approximately 60 seconds after genesis block timestamp
+- Other testnet nodes will sync *as long as there is at least `minBlockchainPeers` peers with an "up-to-date" chain`
+- You can also use API call `POST /admin/forcesync <connected-peer-IP-and-port>` on stuck nodes
+
+## Dealing with stuck chain
+
+Maybe your nodes have been offline and no-one has minted a recent testnet block.
+Your options are:
+
+- Start a new testnet from scratch
+- Fire up your testnet node(s)
+- Force one of your nodes to mint by:
+	+ Set a debugger breakpoint on Settings.getMinBlockchainPeers()
+	+ When breakpoint is hit, change `this.minBlockchainPeers` to zero, then continue
+- Once one of your nodes has minted blocks up to 'now', you can use "forcesync" on the other nodes
+
+## Tools
+
+- `qort` tool, but use `-t` option for default testnet API port (62391)
+- `qort` tool, but first set shell variable: `export BASE_URL=some-node-hostname-or-ip:port`
+- `qort` tool, but prepend with one-time shell variable: `BASE_URL=some-node-hostname-or-ip:port qort ......`
+- `peer-heights`, but use `-t` option, or `BASE_URL` shell variable as above
+

WindowsInstaller/Install Files/AppData/settings.json

@@ -1,4 +1,3 @@
 {
-  "apiDocumentationEnabled": true,
-  "apiWhitelistEnabled": false
+  "apiDocumentationEnabled": true
 }

WindowsInstaller/Install Files/log4j2.properties

@@ -1,7 +1,7 @@
 rootLogger.level = info
 # On Windows, uncomment next line to set dirname:
 # property.dirname = ${sys:user.home}\\AppData\\Local\\qortal\\
-# property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
+property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
 
 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE
@@ -59,14 +59,11 @@ appender.console.filter.threshold.level = error
 
 appender.rolling.type = RollingFile
 appender.rolling.name = FILE
-appender.rolling.fileName = qortal.log
-appender.rolling.filePattern = qortal.%d{dd-MMM}.log.gz
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+appender.rolling.filePattern = ${dirname:-}${filename}.%i
 appender.rolling.policy.type = SizeBasedTriggeringPolicy
-appender.rolling.policy.size = 10MB
-appender.rolling.strategy.type = DefaultRolloverStrategy
-appender.rolling.strategy.max = 7
+appender.rolling.policy.size = 4MB
 # Set the immediate flush to true (default)
 # appender.rolling.immediateFlush = true
 # Set the append to true (default), should not overwrite

WindowsInstaller/README.md

@@ -2,29 +2,23 @@
 
 ## Prerequisites
 
-* AdvancedInstaller v19.4 or better, and enterprise licence. 
-* Qortal has an open source license, however it currently (as of December 2024) only supports up to version 19. (We may need to reach out to Advanced Installer again to obtain a new license at some point, if needed. 
-* Reach out to @crowetic for links to the installer install files, and license. 
-* Installed AdoptOpenJDK v17 64bit, full JDK *not* JRE
+* AdvancedInstaller v16 or better, and enterprise licence if translations are required
+* Installed AdoptOpenJDK v11 64bit, full JDK *not* JRE
 
 ## General build instructions
 
 If this is your first time opening the `qortal.aip` file then you might need to adjust
 configured paths, or create a dummy `D:` drive with the expected layout.
 
-Opening the aip file from within a clone of the qortal repo also works, if you have a separate windows machine setup to do the build. 
-
-You May need to change the location of the 'jre64' files inside Advanced Installer, if it is set to a path that your build machine doesn't have. 
-
-The Java Memory Arguments can be set manually, but as of December 2024 they have been reset back to system defaults. This should include G1GC Garbage Collector.
-
 Typical build procedure:
 
 * Place the `qortal.jar` file in `Install-Files\`
 * Open AdvancedInstaller with qortal.aip file
 * If releasing a new version, change version number in:
+	+ "Product Information" side menu
 	+ "Product Details" side menu entry
 	+ "Product Details" tab in "Product Details" pane
+	+ "Product Version" entry box
 * Click away to a different side menu entry, e.g. "Resources" -> "Files and Folders"
 * You should be prompted whether to generate a new product key, click "Generate New"
 * Click "Build" button

lib/com/dosse/WaifUPnP/1.1/WaifUPnP-1.1.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dosse</groupId>
-  <artifactId>WaifUPnP</artifactId>
-  <version>1.1</version>
-  <description>POM was created from install:install-file</description>
-</project>

lib/com/dosse/WaifUPnP/1.2/WaifUPnP-1.2.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dosse</groupId>
-  <artifactId>WaifUPnP</artifactId>
-  <version>1.2</version>
-  <description>POM was created from install:install-file</description>
-</project>

lib/com/dosse/WaifUPnP/maven-metadata-local.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dosse</groupId>
-  <artifactId>WaifUPnP</artifactId>
-  <versioning>
-    <release>1.2</release>
-    <versions>
-      <version>1.1</version>
-      <version>1.2</version>
-    </versions>
-    <lastUpdated>20231026200127</lastUpdated>
-  </versioning>
-</metadata>

lib/org/ciyam/AT/1.4.0/AT-1.4.0.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ciyam</groupId>
-  <artifactId>AT</artifactId>
-  <version>1.4.0</version>
-  <description>POM was created from install:install-file</description>
-</project>

lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom

@@ -1,123 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ciyam</groupId>
-	<artifactId>AT</artifactId>
-	<version>1.4.1</version>
-	<packaging>jar</packaging>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<skipTests>false</skipTests>
-		<bouncycastle.version>1.69</bouncycastle.version>
-		<junit.version>4.13.2</junit.version>
-		<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-		<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
-	</properties>
-
-	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<testSourceDirectory>src/test/java</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>11</source>
-					<target>11</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<skipTests>${skipTests}</skipTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>${maven-source-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>attach-javadoc</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<version>${maven-compiler-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-surefire-plugin</artifactId>
-			<version>${maven-surefire-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-source-plugin</artifactId>
-			<version>${maven-source-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-javadoc-plugin</artifactId>
-			<version>${maven-javadoc-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-jar-plugin</artifactId>
-			<version>${maven-jar-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${bouncycastle.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

lib/org/ciyam/AT/1.4.2/AT-1.4.2.pom

@@ -1,123 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.ciyam</groupId>
-	<artifactId>AT</artifactId>
-	<version>1.4.2</version>
-	<packaging>jar</packaging>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<skipTests>false</skipTests>
-		<bouncycastle.version>1.70</bouncycastle.version>
-		<junit.version>4.13.2</junit.version>
-		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-		<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
-	</properties>
-
-	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<testSourceDirectory>src/test/java</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>11</source>
-					<target>11</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<skipTests>${skipTests}</skipTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>${maven-source-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>attach-javadoc</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<version>${maven-compiler-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-surefire-plugin</artifactId>
-			<version>${maven-surefire-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-source-plugin</artifactId>
-			<version>${maven-source-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-javadoc-plugin</artifactId>
-			<version>${maven-javadoc-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-jar-plugin</artifactId>
-			<version>${maven-jar-plugin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${bouncycastle.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

lib/org/ciyam/AT/maven-metadata-local.xml

@@ -3,14 +3,14 @@
   <groupId>org.ciyam</groupId>
   <artifactId>AT</artifactId>
   <versioning>
-    <release>1.4.2</release>
+    <release>1.3.8</release>
     <versions>
+      <version>1.3.4</version>
+      <version>1.3.5</version>
+      <version>1.3.6</version>
       <version>1.3.7</version>
       <version>1.3.8</version>
-      <version>1.4.0</version>
-      <version>1.4.1</version>
-      <version>1.4.2</version>
     </versions>
-    <lastUpdated>20240426084210</lastUpdated>
+    <lastUpdated>20200925114415</lastUpdated>
   </versioning>
 </metadata>

log4j2.properties

@@ -1,7 +1,7 @@
 rootLogger.level = info
 # On Windows, uncomment next line to set dirname:
 # property.dirname = ${sys:user.home}\\AppData\\Local\\qortal\\
-# property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
+property.filename = ${sys:log4j2.filenameTemplate:-log.txt}
 
 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE
@@ -59,14 +59,11 @@ appender.console.filter.threshold.level = error
 
 appender.rolling.type = RollingFile
 appender.rolling.name = FILE
-appender.rolling.fileName = qortal.log
-appender.rolling.filePattern = qortal.%d{dd-MMM}.log.gz
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+appender.rolling.filePattern = ${dirname:-}${filename}.%i
 appender.rolling.policy.type = SizeBasedTriggeringPolicy
-appender.rolling.policy.size = 10MB
-appender.rolling.strategy.type = DefaultRolloverStrategy
-appender.rolling.strategy.max = 7
+appender.rolling.policy.size = 4MB
 # Set the immediate flush to true (default)
 # appender.rolling.immediateFlush = true
 # Set the append to true (default), should not overwrite

pom.xml

@@ -3,61 +3,28 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>4.7.0</version>
+	<version>1.6.0</version>
 	<packaging>jar</packaging>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<skipTests>true</skipTests>
-
-		<altcoinj.version>7dc8c6f</altcoinj.version>
+		<altcoinj.version>bf9fb80</altcoinj.version>
 		<bitcoinj.version>0.15.10</bitcoinj.version>
-		<bouncycastle.version>1.70</bouncycastle.version>
+		<bouncycastle.version>1.64</bouncycastle.version>
 		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-		<ciyam-at.version>1.4.2</ciyam-at.version>
-		<commons-net.version>3.8.0</commons-net.version>
-		<commons-text.version>1.12.0</commons-text.version>
-		<commons-io.version>2.18.0</commons-io.version>
-		<commons-compress.version>1.27.1</commons-compress.version>
-		<commons-lang3.version>3.17.0</commons-lang3.version>
+		<ciyam-at.version>1.3.8</ciyam-at.version>
+		<commons-net.version>3.6</commons-net.version>
+		<commons-text.version>1.8</commons-text.version>
 		<dagger.version>1.2.2</dagger.version>
-		<extendedset.version>0.12.3</extendedset.version>
-		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-		<grpc.version>1.68.1</grpc.version>
-		<guava.version>33.3.1-jre</guava.version>
-		<hamcrest-library.version>2.2</hamcrest-library.version>
-		<homoglyph.version>1.2.1</homoglyph.version>
-		<hsqldb.version>2.7.4</hsqldb.version>
-		<icu4j.version>76.1</icu4j.version>
-		<java-diff-utils.version>4.15</java-diff-utils.version>
-		<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-		<jaxb-runtime.version>2.3.9</jaxb-runtime.version>
-		<jersey.version>2.42</jersey.version>
-		<jetty.version>9.4.56.v20240826</jetty.version>
-		<json-simple.version>1.1.1</json-simple.version>
-		<json.version>20240303</json.version>
-		<jsoup.version>1.18.1</jsoup.version>
-		<junit-jupiter-engine.version>5.11.0-M2</junit-jupiter-engine.version>
-		<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-		<log4j.version>2.23.1</log4j.version>
-		<mail.version>1.5.0-b01</mail.version>
-		<maven-build-helper-plugin.version>3.6.0</maven-build-helper-plugin.version>
-		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-		<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
-		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-		<maven-package-info-plugin.version>1.1.0</maven-package-info-plugin.version>
-		<maven-plugin.version>2.18.0</maven-plugin.version>
-		<maven-reproducible-build-plugin.version>0.17</maven-reproducible-build-plugin.version>
-		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-		<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
-		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
-		<protobuf.version>3.25.3</protobuf.version>
-		<replacer.version>1.5.3</replacer.version>
-		<simplemagic.version>1.17</simplemagic.version>
-		<slf4j.version>1.7.36</slf4j.version>
-		<swagger-api.version>2.0.10</swagger-api.version>
-		<swagger-ui.version>5.18.2</swagger-ui.version>
-		<upnp.version>1.2</upnp.version>
-		<xz.version>1.10</xz.version>
+		<guava.version>28.1-jre</guava.version>
+		<hsqldb.version>2.5.1</hsqldb.version>
+		<jersey.version>2.29.1</jersey.version>
+		<jetty.version>9.4.29.v20200521</jetty.version>
+		<log4j.version>2.12.1</log4j.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<slf4j.version>1.7.12</slf4j.version>
+		<swagger-api.version>2.0.9</swagger-api.version>
+		<swagger-ui.version>3.23.8</swagger-ui.version>
+		<package-info-maven-plugin.version>1.1.0</package-info-maven-plugin.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -72,14 +39,14 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>${maven-plugin.version}</version>
+				<version>2.5</version>
 				<configuration>
 					<generateBackupPoms>false</generateBackupPoms>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
+				<version>3.8.0</version>
 				<configuration>
 					<release>11</release>
 				</configuration>
@@ -110,7 +77,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>${git-commit-id-plugin.version}</version>
+				<version>4.0.0</version>
 				<executions>
 					<execution>
 						<id>get-the-git-infos</id>
@@ -142,7 +109,7 @@
 			<plugin>
 				<groupId>com.google.code.maven-replacer-plugin</groupId>
 				<artifactId>replacer</artifactId>
-				<version>${replacer.version}</version>
+				<version>1.5.3</version>
 				<executions>
 					<execution>
 						<id>replace-swagger-ui</id>
@@ -153,35 +120,22 @@
 						<inherited>false</inherited>
 						<configuration>
 							<file>${project.build.directory}/swagger-ui.unpacked/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html</file>
-							<replacements>
-								<replacement>
-									<token>Swagger UI</token>
-									<value>Qortal API Documentation</value>
-								</replacement>
-							</replacements>
-						</configuration>
-					</execution>
-					<execution>
-						<id>replace-swagger-ui-json</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-						<inherited>false</inherited>
-						<configuration>
-							<file>${project.build.directory}/swagger-ui.unpacked/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/swagger-initializer.js</file>
 							<replacements>
 								<replacement>
 									<token>https://petstore.swagger.io/v2/swagger.json</token>
 									<value>/openapi.json</value>
 								</replacement>
+								<replacement>
+									<token>Swagger UI</token>
+									<value>API Documentation</value>
+								</replacement>
 								<replacement>
 									<token>deepLinking: true,</token>
 									<value>
 										deepLinking: true,
 										tagsSorter: "alpha",
-										operationsSorter: "alpha",
-										validatorUrl: false,
+										operationsSorter:
+										"alpha",
 									</value>
 								</replacement>
 							</replacements>
@@ -197,13 +151,11 @@
 						<configuration>
 							<file>${project.build.outputDirectory}/git.properties</file>
 							<regex>true</regex>
-							<regexFlags>
-								<regexFlag>MULTILINE</regexFlag>
-							</regexFlags>
+							<regexFlags><regexFlag>MULTILINE</regexFlag></regexFlags>
 							<replacements>
 								<replacement>
 									<token>^(#.*$[\n\r]*)</token>
-									<value/>
+									<value></value>
 								</replacement>
 							</replacements>
 						</configuration>
@@ -213,10 +165,7 @@
 			<!-- add swagger-ui as resource to output package -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven-resources-plugin.version}</version>
-				<configuration>
-					<propertiesEncoding>ISO-8859-1</propertiesEncoding>
-				</configuration>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -240,7 +189,7 @@
 			<plugin>
 				<groupId>com.github.bohnman</groupId>
 				<artifactId>package-info-maven-plugin</artifactId>
-				<version>${maven-package-info-plugin.version}</version>
+				<version>${package-info-maven-plugin.version}</version>
 				<configuration>
 					<packages>
 						<package>
@@ -270,7 +219,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${maven-build-helper-plugin.version}</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -288,7 +237,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
+				<version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -306,12 +255,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>${maven-shade-plugin.version}</version>
+				<version>2.4.3</version>
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<artifactSet>
 						<excludes>
-							<!-- Don't include original swagger-UI as we're including our own modified version -->
+							<!-- Don't include original swagger-UI as we're including our own 
+								modified version -->
 							<exclude>org.webjars:swagger-ui</exclude>
 							<!-- Don't include JUnit as it's for testing only! -->
 							<exclude>junit:junit</exclude>
@@ -343,7 +293,6 @@
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>org.qortal.controller.Controller</mainClass>
 									<manifestEntries>
-										<Multi-Release>true</Multi-Release>
 										<Class-Path>. ..</Class-Path>
 									</manifestEntries>
 								</transformer>
@@ -355,7 +304,7 @@
 			<plugin>
 				<groupId>io.github.zlika</groupId>
 				<artifactId>reproducible-build-maven-plugin</artifactId>
-				<version>${maven-reproducible-build-plugin.version}</version>
+				<version>0.11</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -372,7 +321,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
+				<version>2.22.2</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 				</configuration>
@@ -384,34 +333,46 @@
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
-					<version>${lifecycle-mapping.version}</version>
+					<version>1.0.0</version>
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<version>${maven-dependency-plugin.version}</version>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>
+											[2.8,)
+										</versionRange>
 										<goals>
 											<goal>unpack</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<execute/>
+										<execute></execute>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>com.google.code.maven-replacer-plugin</groupId>
-										<artifactId>replacer</artifactId>
-										<version>${replacer.version}</version>
+										<groupId>
+											com.google.code.maven-replacer-plugin
+										</groupId>
+										<artifactId>
+											replacer
+										</artifactId>
+										<versionRange>
+											[1.5.3,)
+										</versionRange>
 										<goals>
 											<goal>replace</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<execute/>
+										<execute></execute>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -438,17 +399,15 @@
 		<dependency>
 			<groupId>org.codehaus.mojo</groupId>
 			<artifactId>build-helper-maven-plugin</artifactId>
-			<version>${maven-build-helper-plugin.version}</version>
-			<scope>provided</scope>
-			<!-- needed for build, not for runtime -->
+			<version>3.0.0</version>
+			<scope>provided</scope><!-- needed for build, not for runtime -->
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.github.bohnman/package-info-maven-plugin -->
 		<dependency>
 			<groupId>com.github.bohnman</groupId>
 			<artifactId>package-info-maven-plugin</artifactId>
-			<version>${maven-package-info-plugin.version}</version>
-			<scope>provided</scope>
-			<!-- needed for build, not for runtime -->
+			<version>${package-info-maven-plugin.version}</version>
+			<scope>provided</scope><!-- needed for build, not for runtime -->
 		</dependency>
 		<!-- HSQLDB for repository -->
 		<dependency>
@@ -462,12 +421,6 @@
 			<artifactId>AT</artifactId>
 			<version>${ciyam-at.version}</version>
 		</dependency>
-		<!-- UPnP support -->
-		<dependency>
-			<groupId>com.dosse</groupId>
-			<artifactId>WaifUPnP</artifactId>
-			<version>${upnp.version}</version>
-		</dependency>
 		<!-- Bitcoin support -->
 		<dependency>
 			<groupId>org.bitcoinj</groupId>
@@ -476,7 +429,7 @@
 		</dependency>
 		<!-- For Litecoin, etc. support, requires bitcoinj -->
 		<dependency>
-			<groupId>com.github.qortal</groupId>
+			<groupId>com.github.jjos2372</groupId>
 			<artifactId>altcoinj</artifactId>
 			<version>${altcoinj.version}</version>
 		</dependency>
@@ -484,43 +437,23 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>${json-simple.version}</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>${json.version}</version>
+			<version>20210307</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
 			<version>${commons-text.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<version>${commons-compress.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.tukaani</groupId>
-			<artifactId>xz</artifactId>
-			<version>${xz.version}</version>
-		</dependency>
 		<!--  For bitset/bitmap compression -->
 		<dependency>
 			<groupId>io.druid</groupId>
 			<artifactId>extendedset</artifactId>
-			<version>${extendedset.version}</version>
+			<version>0.12.3</version>
 			<exclusions>
 				<!-- exclude old versions of jackson-annotations / jackson-core -->
 				<exclusion>
@@ -591,29 +524,18 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>${javax.servlet-api.version}</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
-			<version>${mail.version}</version>
+			<version>1.5.0-b01</version>
 		</dependency>
 		<!-- Unicode homoglyph utilities -->
 		<dependency>
 			<groupId>net.codebox</groupId>
 			<artifactId>homoglyph</artifactId>
-			<version>${homoglyph.version}</version>
-		</dependency>
-		<!-- Unicode support -->
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>icu4j</artifactId>
-			<version>${icu4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>icu4j-charset</artifactId>
-			<version>${icu4j.version}</version>
+			<version>1.2.0</version>
 		</dependency>
 		<!-- Jetty -->
 		<dependency>
@@ -665,8 +587,7 @@
 			<artifactId>jersey-hk2</artifactId>
 			<version>${jersey.version}</version>
 			<exclusions>
-				<exclusion>
-					<!-- exclude javax.inject-1.jar because other jersey modules include javax.inject v2+ -->
+				<exclusion><!-- exclude javax.inject-1.jar because other jersey modules include javax.inject v2+ -->
 					<groupId>javax.inject</groupId>
 					<artifactId>javax.inject</artifactId>
 				</exclusion>
@@ -693,8 +614,7 @@
 			<artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
 			<version>${swagger-api.version}</version>
 			<exclusions>
-				<exclusion>
-					<!-- excluded because included in swagger-jaxrs2-servlet-initializer -->
+				<exclusion><!-- excluded because included in swagger-jaxrs2-servlet-initializer -->
 					<groupId>io.swagger.core.v3</groupId>
 					<artifactId>swagger-integration</artifactId>
 				</exclusion>
@@ -710,12 +630,12 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit-jupiter-engine.version}</version>
+			<version>5.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>${hamcrest-library.version}</version>
+			<version>1.3</version>
 		</dependency>
 		-->
 		<!-- BouncyCastle for crypto, including TLS secure networking -->
@@ -729,46 +649,5 @@
 			<artifactId>bctls-jdk15on</artifactId>
 			<version>${bouncycastle.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>${jsoup.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.github.java-diff-utils</groupId>
-			<artifactId>java-diff-utils</artifactId>
-			<version>${java-diff-utils.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.grpc</groupId>
-			<artifactId>grpc-netty</artifactId>
-			<version>${grpc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.grpc</groupId>
-			<artifactId>grpc-protobuf</artifactId>
-			<version>${grpc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.grpc</groupId>
-			<artifactId>grpc-stub</artifactId>
-			<version>${grpc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java</artifactId>
-			<version>${protobuf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.j256.simplemagic</groupId>
-			<artifactId>simplemagic</artifactId>
-			<version>${simplemagic.version}</version>
-		</dependency>
-		<!-- JAXB runtime for WADL support -->
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>${jaxb-runtime.version}</version>
-		</dependency>
 	</dependencies>
 </project>

src/main/java/com/rust/litewalletjni/LiteWalletJni.java

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * LiteWalletJni code based on https://github.com/PirateNetwork/cordova-plugin-litewallet
- *
- * MIT License
- *
- * Copyright (c) 2020 Zero Currency Coin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.rust.litewalletjni;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.qortal.controller.PirateChainWalletController;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class LiteWalletJni {
-
-    protected static final Logger LOGGER = LogManager.getLogger(LiteWalletJni.class);
-
-    public static native String initlogging();
-    public static native String initnew(final String serveruri, final String params, final String saplingOutputb64, final String saplingSpendb64);
-    public static native String initfromseed(final String serveruri, final String params, final String seed, final String birthday, final String saplingOutputb64, final String saplingSpendb64);
-    public static native String initfromb64(final String serveruri, final String params, final String datab64, final String saplingOutputb64, final String saplingSpendb64);
-    public static native String save();
-
-    public static native String execute(final String cmd, final String args);
-    public static native String getseedphrase();
-    public static native String getseedphrasefromentropyb64(final String entropy64);
-    public static native String checkseedphrase(final String input);
-
-
-    private static boolean loaded = false;
-
-    public static void loadLibrary() {
-        if (loaded) {
-            return;
-        }
-        String osName = System.getProperty("os.name");
-        String osArchitecture = System.getProperty("os.arch");
-
-        LOGGER.info("OS Name: {}", osName);
-        LOGGER.info("OS Architecture: {}", osArchitecture);
-
-        try {
-            String libFileName = PirateChainWalletController.getRustLibFilename();
-            if (libFileName == null) {
-                LOGGER.info("Library not found for OS: {}, arch: {}", osName, osArchitecture);
-                return;
-            }
-
-            Path libPath = Paths.get(PirateChainWalletController.getRustLibOuterDirectory().toString(), libFileName);
-            System.load(libPath.toAbsolutePath().toString());
-            loaded = true;
-        }
-        catch (UnsatisfiedLinkError e) {
-            LOGGER.info("Unable to load library");
-        }
-    }
-
-    public static boolean isLoaded() {
-        return loaded;
-    }
-
-}

src/main/java/org/hsqldb/jdbc/HSQLDBPool.java

@@ -1,10 +1,10 @@
 package org.hsqldb.jdbc;
 
-import org.hsqldb.jdbc.pool.JDBCPooledConnection;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import org.hsqldb.jdbc.pool.JDBCPooledConnection;
+
 public class HSQLDBPool extends JDBCPool {
 
 	public HSQLDBPool(int poolSize) {

src/main/java/org/hsqldb/jdbc/HSQLDBPoolMonitored.java

@@ -1,173 +0,0 @@
-package org.hsqldb.jdbc;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.hsqldb.jdbc.pool.JDBCPooledConnection;
-import org.qortal.data.system.DbConnectionInfo;
-import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
-
-import javax.sql.ConnectionEvent;
-import javax.sql.PooledConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-/**
- * Class HSQLDBPoolMonitored
- *
- * This class uses the same logic as HSQLDBPool. The only difference is it monitors the state of every connection
- * to the database. This is used for debugging purposes only.
- */
-public class HSQLDBPoolMonitored extends HSQLDBPool {
-
-	private static final Logger LOGGER = LogManager.getLogger(HSQLDBRepositoryFactory.class);
-
-	private static final String EMPTY = "Empty";
-	private static final String AVAILABLE = "Available";
-	private static final String ALLOCATED = "Allocated";
-
-	private ConcurrentHashMap<Integer, DbConnectionInfo> infoByIndex;
-
-	public HSQLDBPoolMonitored(int poolSize) {
-		super(poolSize);
-
-		this.infoByIndex = new ConcurrentHashMap<>(poolSize);
-	}
-
-	/**
-	 * Tries to retrieve a new connection using the properties that have already been
-	 * set.
-	 *
-	 * @return  a connection to the data source, or null if no spare connections in pool
-	 * @exception SQLException if a database access error occurs
-	 */
-	public Connection tryConnection() throws SQLException {
-		for (int i = 0; i < states.length(); i++) {
-			if (states.compareAndSet(i, RefState.available, RefState.allocated)) {
-				JDBCPooledConnection pooledConnection = connections[i];
-
-				if (pooledConnection == null)
-					// Probably shutdown situation
-					return null;
-
-				infoByIndex.put(i, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), ALLOCATED));
-
-				return pooledConnection.getConnection();
-			}
-
-			if (states.compareAndSet(i, RefState.empty, RefState.allocated)) {
-				try {
-					JDBCPooledConnection pooledConnection = (JDBCPooledConnection) source.getPooledConnection();
-
-					if (pooledConnection == null)
-						// Probably shutdown situation
-						return null;
-
-					pooledConnection.addConnectionEventListener(this);
-					pooledConnection.addStatementEventListener(this);
-					connections[i] = pooledConnection;
-
-					infoByIndex.put(i, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), ALLOCATED));
-
-					return pooledConnection.getConnection();
-				} catch (SQLException e) {
-					states.set(i, RefState.empty);
-					infoByIndex.put(i, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), EMPTY));
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public Connection getConnection() throws SQLException {
-		int var1 = 300;
-		if (this.source.loginTimeout != 0) {
-			var1 = this.source.loginTimeout * 10;
-		}
-
-		if (this.closed) {
-			throw new SQLException("connection pool is closed");
-		} else {
-			for(int var2 = 0; var2 < var1; ++var2) {
-				for(int var3 = 0; var3 < this.states.length(); ++var3) {
-					if (this.states.compareAndSet(var3, 1, 2)) {
-						infoByIndex.put(var3, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), ALLOCATED));
-						return this.connections[var3].getConnection();
-					}
-
-					if (this.states.compareAndSet(var3, 0, 2)) {
-						try {
-							JDBCPooledConnection var4 = (JDBCPooledConnection)this.source.getPooledConnection();
-							var4.addConnectionEventListener(this);
-							var4.addStatementEventListener(this);
-							this.connections[var3] = var4;
-
-							infoByIndex.put(var3, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), ALLOCATED));
-
-							return this.connections[var3].getConnection();
-						} catch (SQLException var6) {
-							this.states.set(var3, 0);
-							infoByIndex.put(var3, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), EMPTY));
-						}
-					}
-				}
-
-				try {
-					Thread.sleep(100L);
-				} catch (InterruptedException var5) {
-				}
-			}
-
-			throw JDBCUtil.invalidArgument();
-		}
-	}
-
-	public void connectionClosed(ConnectionEvent event) {
-		PooledConnection connection = (PooledConnection) event.getSource();
-
-		for (int i = 0; i < connections.length; i++) {
-			if (connections[i] == connection) {
-				states.set(i, RefState.available);
-				infoByIndex.put(i, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), AVAILABLE));
-				break;
-			}
-		}
-	}
-
-	public void connectionErrorOccurred(ConnectionEvent event) {
-		PooledConnection connection = (PooledConnection) event.getSource();
-
-		for (int i = 0; i < connections.length; i++) {
-			if (connections[i] == connection) {
-				states.set(i, RefState.allocated);
-				connections[i] = null;
-				states.set(i, RefState.empty);
-				infoByIndex.put(i, new DbConnectionInfo(System.currentTimeMillis(), Thread.currentThread().getName(), EMPTY));
-				break;
-			}
-		}
-	}
-
-	public List<DbConnectionInfo> getDbConnectionsStates() {
-
-		return infoByIndex.values().stream()
-			.sorted(Comparator.comparingLong(DbConnectionInfo::getUpdated))
-			.collect(Collectors.toList());
-	}
-
-	private int findConnectionIndex(ConnectionEvent connectionEvent) {
-		PooledConnection pooledConnection = (PooledConnection) connectionEvent.getSource();
-
-		for(int i = 0; i < this.connections.length; ++i) {
-			if (this.connections[i] == pooledConnection) {
-				return i;
-			}
-		}
-
-		return -1;
-	}
-}

src/main/java/org/qortal/ApplyBootstrap.java

@@ -1,227 +0,0 @@
-package org.qortal;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
-import org.qortal.api.ApiKey;
-import org.qortal.api.ApiRequest;
-import org.qortal.controller.BootstrapNode;
-import org.qortal.settings.Settings;
-
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.security.Security;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.qortal.controller.BootstrapNode.AGENTLIB_JVM_HOLDER_ARG;
-
-public class ApplyBootstrap {
-
-	static {
-		// This static block will be called before others if using ApplyBootstrap.main()
-
-		// Log into different files for bootstrap - this has to be before LogManger.getLogger() calls
-		System.setProperty("log4j2.filenameTemplate", "log-apply-bootstrap.txt");
-
-		// This must go before any calls to LogManager/Logger
-		System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
-	}
-
-	private static final Logger LOGGER = LogManager.getLogger(ApplyBootstrap.class);
-	private static final String JAR_FILENAME = BootstrapNode.JAR_FILENAME;
-	private static final String WINDOWS_EXE_LAUNCHER = "qortal.exe";
-	private static final String JAVA_TOOL_OPTIONS_NAME = "JAVA_TOOL_OPTIONS";
-	private static final String JAVA_TOOL_OPTIONS_VALUE = "";
-
-	private static final long CHECK_INTERVAL = 15 * 1000L; // ms
-	private static final int MAX_ATTEMPTS = 20;
-
-	public static void main(String[] args) {
-		Security.insertProviderAt(new BouncyCastleProvider(), 0);
-		Security.insertProviderAt(new BouncyCastleJsseProvider(), 1);
-
-		// Load/check settings, which potentially sets up blockchain config, etc.
-		if (args.length > 0)
-			Settings.fileInstance(args[0]);
-		else
-			Settings.getInstance();
-
-		LOGGER.info("Applying bootstrap...");
-
-		// Shutdown node using API
-		if (!shutdownNode())
-			return;
-
-		// Delete db
-		deleteDB();
-
-		// Restart node
-		restartNode(args);
-
-		LOGGER.info("Bootstrapping...");
-	}
-
-	private static boolean shutdownNode() {
-		String baseUri = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
-		LOGGER.info(() -> String.format("Shutting down node using API via %s", baseUri));
-
-		// The /admin/stop endpoint requires an API key, which may or may not be already generated
-		boolean apiKeyNewlyGenerated = false;
-		ApiKey apiKey = null;
-		try {
-			apiKey = new ApiKey();
-			if (!apiKey.generated()) {
-				apiKey.generate();
-				apiKeyNewlyGenerated = true;
-				LOGGER.info("Generated API key");
-			}
-		} catch (IOException e) {
-			LOGGER.info("Error loading API key: {}", e.getMessage());
-		}
-
-		// Create GET params
-		Map<String, String> params = new HashMap<>();
-		if (apiKey != null) {
-			params.put("apiKey", apiKey.toString());
-		}
-
-		// Attempt to stop the node
-		int attempt;
-		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-			final int attemptForLogging = attempt;
-			LOGGER.info(() -> String.format("Attempt #%d out of %d to shutdown node", attemptForLogging + 1, MAX_ATTEMPTS));
-			String response = ApiRequest.perform(baseUri + "admin/stop", params);
-			if (response == null) {
-				// No response - consider node shut down
-				if (apiKeyNewlyGenerated) {
-					// API key was newly generated for bootstrapping node, so we need to remove it
-					ApplyBootstrap.removeGeneratedApiKey();
-				}
-				return true;
-			}
-
-			LOGGER.info(() -> String.format("Response from API: %s", response));
-
-			try {
-				Thread.sleep(CHECK_INTERVAL);
-			} catch (InterruptedException e) {
-				// We still need to check...
-				break;
-			}
-		}
-
-		if (apiKeyNewlyGenerated) {
-			// API key was newly generated for bootstrapping node, so we need to remove it
-			ApplyBootstrap.removeGeneratedApiKey();
-		}
-
-		if (attempt == MAX_ATTEMPTS) {
-			LOGGER.error("Failed to shutdown node - giving up");
-			return false;
-		}
-
-		return true;
-	}
-
-	private static void removeGeneratedApiKey() {
-		try {
-			LOGGER.info("Removing newly generated API key...");
-
-			// Delete the API key since it was only generated for bootstrapping node
-			ApiKey apiKey = new ApiKey();
-			apiKey.delete();
-
-		} catch (IOException e) {
-			LOGGER.info("Error loading or deleting API key: {}", e.getMessage());
-		}
-	}
-
-	private static void deleteDB() {
-		// Get the repository path from settings
-		String repositoryPath = Settings.getInstance().getRepositoryPath();
-		LOGGER.debug(String.format("Repository path: %s", repositoryPath));
-
-		try {
-			Path directory = Paths.get(repositoryPath);
-			Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
-				@Override
-				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-					Files.delete(file);
-					return FileVisitResult.CONTINUE;
-				}
-
-				@Override
-				public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-					Files.delete(dir);
-					return FileVisitResult.CONTINUE;
-				}
-			});
-		} catch (IOException e) {
-			LOGGER.error("Error deleting DB: {}", e.getMessage());
-		}
-	}
-
-	private static void restartNode(String[] args) {
-		String javaHome = System.getProperty("java.home");
-		LOGGER.debug(() -> String.format("Java home: %s", javaHome));
-
-		Path javaBinary = Paths.get(javaHome, "bin", "java");
-		LOGGER.debug(() -> String.format("Java binary: %s", javaBinary));
-
-		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
-		LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher));
-
-		List<String> javaCmd;
-		if (Files.exists(exeLauncher)) {
-			javaCmd = Arrays.asList(exeLauncher.toString());
-		} else {
-			javaCmd = new ArrayList<>();
-			// Java runtime binary itself
-			javaCmd.add(javaBinary.toString());
-
-			// JVM arguments
-			javaCmd.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments());
-
-			// Reapply any retained, but disabled, -agentlib JVM arg
-			javaCmd = javaCmd.stream()
-					.map(arg -> arg.replace(AGENTLIB_JVM_HOLDER_ARG, "-agentlib"))
-					.collect(Collectors.toList());
-
-			// Call mainClass in JAR
-			javaCmd.addAll(Arrays.asList("-jar", JAR_FILENAME));
-
-			// Add saved command-line args
-			javaCmd.addAll(Arrays.asList(args));
-		}
-
-		try {
-			LOGGER.info(String.format("Restarting node with: %s", String.join(" ", javaCmd)));
-
-			ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
-
-			if (Files.exists(exeLauncher)) {
-				LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
-				processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
-			}
-
-			// New process will inherit our stdout and stderr
-			processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-			processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
-
-			Process process = processBuilder.start();
-
-			// Nothing to pipe to new process, so close output stream (process's stdin)
-			process.getOutputStream().close();
-		} catch (Exception e) {
-			LOGGER.error(String.format("Failed to restart node (BAD): %s", e.getMessage()));
-		}
-	}
-}

src/main/java/org/qortal/ApplyRestart.java

@@ -1,241 +0,0 @@
-package org.qortal;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
-import org.qortal.api.ApiKey;
-import org.qortal.api.ApiRequest;
-import org.qortal.controller.Controller;
-import org.qortal.controller.RestartNode;
-import org.qortal.settings.Settings;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.Security;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
-
-import static org.qortal.controller.RestartNode.AGENTLIB_JVM_HOLDER_ARG;
-
-public class ApplyRestart {
-
-	static {
-		// This static block will be called before others if using ApplyRestart.main()
-
-		// Log into different files for restart node - this has to be before LogManger.getLogger() calls
-		System.setProperty("log4j2.filenameTemplate", "log-apply-restart.txt");
-
-		// This must go before any calls to LogManager/Logger
-		System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
-	}
-
-	private static final Logger LOGGER = LogManager.getLogger(ApplyRestart.class);
-	private static final String JAR_FILENAME = RestartNode.JAR_FILENAME;
-	private static final String WINDOWS_EXE_LAUNCHER = "qortal.exe";
-	private static final String JAVA_TOOL_OPTIONS_NAME = "JAVA_TOOL_OPTIONS";
-	private static final String JAVA_TOOL_OPTIONS_VALUE = "";
-
-	private static final long CHECK_INTERVAL = 30 * 1000L; // ms
-	private static final int MAX_ATTEMPTS = 12;
-
-	public static void main(String[] args) {
-		Security.insertProviderAt(new BouncyCastleProvider(), 0);
-		Security.insertProviderAt(new BouncyCastleJsseProvider(), 1);
-
-		// Load/check settings, which potentially sets up blockchain config, etc.
-		if (args.length > 0)
-			Settings.fileInstance(args[0]);
-		else
-			Settings.getInstance();
-
-		LOGGER.info("Applying restart this can take up to 5 minutes...");
-
-		// Shutdown node using API
-		if (!shutdownNode())
-			return;
-
-		try {
-			// Give some time for shutdown
-			TimeUnit.SECONDS.sleep(60);
-
-			// Remove blockchain lock if exist
-			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-			if (blockchainLock.isLocked())
-				blockchainLock.unlock();
-
-			// Remove blockchain lock file if still exist
-			TimeUnit.SECONDS.sleep(60);
-			deleteLock();
-
-			// Restart node
-			TimeUnit.SECONDS.sleep(15);
-			restartNode(args);
-
-			LOGGER.info("Restarting...");
-		} catch (InterruptedException e) {
-			LOGGER.error("Unable to restart", e);
-		}
-	}
-
-	private static boolean shutdownNode() {
-		String baseUri = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
-		LOGGER.debug(() -> String.format("Shutting down node using API via %s", baseUri));
-
-		// The /admin/stop endpoint requires an API key, which may or may not be already generated
-		boolean apiKeyNewlyGenerated = false;
-		ApiKey apiKey = null;
-		try {
-			apiKey = new ApiKey();
-			if (!apiKey.generated()) {
-				apiKey.generate();
-				apiKeyNewlyGenerated = true;
-				LOGGER.info("Generated API key");
-			}
-		} catch (IOException e) {
-			LOGGER.info("Error loading API key: {}", e.getMessage());
-		}
-
-		// Create GET params
-		Map<String, String> params = new HashMap<>();
-		if (apiKey != null) {
-			params.put("apiKey", apiKey.toString());
-		}
-
-		// Attempt to stop the node
-		int attempt;
-		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-			final int attemptForLogging = attempt;
-			LOGGER.info(() -> String.format("Attempt #%d out of %d to shutdown node", attemptForLogging + 1, MAX_ATTEMPTS));
-			String response = ApiRequest.perform(baseUri + "admin/stop", params);
-			if (response == null) {
-				// No response - consider node shut down
-				try {
-					TimeUnit.SECONDS.sleep(30);
-				} catch (InterruptedException e) {
-					throw new RuntimeException(e);
-				}
-
-				if (apiKeyNewlyGenerated) {
-					// API key was newly generated for restarting node, so we need to remove it
-					ApplyRestart.removeGeneratedApiKey();
-				}
-
-				return true;
-			}
-
-			LOGGER.info(() -> String.format("Response from API: %s", response));
-
-			try {
-				Thread.sleep(CHECK_INTERVAL);
-			} catch (InterruptedException e) {
-				// We still need to check...
-				break;
-			}
-		}
-
-		if (apiKeyNewlyGenerated) {
-			// API key was newly generated for restarting node, so we need to remove it
-			ApplyRestart.removeGeneratedApiKey();
-		}
-
-		if (attempt == MAX_ATTEMPTS) {
-			LOGGER.error("Failed to shutdown node - giving up");
-			return false;
-		}
-
-		return true;
-	}
-
-	private static void removeGeneratedApiKey() {
-		try {
-			LOGGER.info("Removing newly generated API key...");
-
-			// Delete the API key since it was only generated for restarting node
-			ApiKey apiKey = new ApiKey();
-			apiKey.delete();
-
-		} catch (IOException e) {
-			LOGGER.error("Error loading or deleting API key: {}", e.getMessage());
-		}
-	}
-
-	private static void deleteLock() {
-		// Get the repository path from settings
-		String repositoryPath = Settings.getInstance().getRepositoryPath();
-		LOGGER.debug(String.format("Repository path is: %s", repositoryPath));
-
-		try {
-			Path root = Paths.get(repositoryPath);
-			File lockFile = new File(root.resolve("blockchain.lck").toUri());
-			LOGGER.debug("Lockfile is: {}", lockFile);
-			FileUtils.forceDelete(FileUtils.getFile(lockFile));
-		} catch (IOException e) {
-			LOGGER.debug("Error deleting blockchain lock file: {}", e.getMessage());
-		}
-	}
-
-	private static void restartNode(String[] args) {
-		String javaHome = System.getProperty("java.home");
-		LOGGER.debug(() -> String.format("Java home: %s", javaHome));
-
-		Path javaBinary = Paths.get(javaHome, "bin", "java");
-		LOGGER.debug(() -> String.format("Java binary: %s", javaBinary));
-
-		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
-		LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher));
-
-		List<String> javaCmd;
-		if (Files.exists(exeLauncher)) {
-			javaCmd = List.of(exeLauncher.toString());
-		} else {
-			javaCmd = new ArrayList<>();
-
-			// Java runtime binary itself
-			javaCmd.add(javaBinary.toString());
-
-			// JVM arguments
-			javaCmd.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments());
-
-			// Reapply any retained, but disabled, -agentlib JVM arg
-			javaCmd = javaCmd.stream()
-					.map(arg -> arg.replace(AGENTLIB_JVM_HOLDER_ARG, "-agentlib"))
-					.collect(Collectors.toList());
-
-			// Call mainClass in JAR
-			javaCmd.addAll(Arrays.asList("-jar", JAR_FILENAME));
-
-			// Add saved command-line args
-			javaCmd.addAll(Arrays.asList(args));
-		}
-
-		try {
-			LOGGER.debug(String.format("Restarting node with: %s", String.join(" ", javaCmd)));
-
-			ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
-
-			if (Files.exists(exeLauncher)) {
-				LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
-				processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
-			}
-
-			// New process will inherit our stdout and stderr
-			processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-			processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
-
-			Process process = processBuilder.start();
-
-			// Nothing to pipe to new process, so close output stream (process's stdin)
-			process.getOutputStream().close();
-		} catch (Exception e) {
-			LOGGER.error(String.format("Failed to restart node (BAD): %s", e.getMessage()));
-		}
-	}
-}

src/main/java/org/qortal/ApplyUpdate.java

@@ -1,14 +1,5 @@
 package org.qortal;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
-import org.qortal.api.ApiKey;
-import org.qortal.api.ApiRequest;
-import org.qortal.controller.AutoUpdate;
-import org.qortal.settings.Settings;
-
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
@@ -16,10 +7,17 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.security.Security;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
-import static org.qortal.controller.AutoUpdate.AGENTLIB_JVM_HOLDER_ARG;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
+import org.qortal.api.ApiRequest;
+import org.qortal.controller.AutoUpdate;
+import org.qortal.settings.Settings;
 
 public class ApplyUpdate {
 
@@ -38,9 +36,9 @@ public class ApplyUpdate {
 	private static final String NEW_JAR_FILENAME = AutoUpdate.NEW_JAR_FILENAME;
 	private static final String WINDOWS_EXE_LAUNCHER = "qortal.exe";
 	private static final String JAVA_TOOL_OPTIONS_NAME = "JAVA_TOOL_OPTIONS";
-	private static final String JAVA_TOOL_OPTIONS_VALUE = "";
+	private static final String JAVA_TOOL_OPTIONS_VALUE = "-XX:MaxRAMFraction=4";
 
-	private static final long CHECK_INTERVAL = 30 * 1000L; // ms
+	private static final long CHECK_INTERVAL = 10 * 1000L; // ms
 	private static final int MAX_ATTEMPTS = 12;
 
 	public static void main(String[] args) {
@@ -72,40 +70,14 @@ public class ApplyUpdate {
 		String baseUri = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
 		LOGGER.info(() -> String.format("Shutting down node using API via %s", baseUri));
 
-		// The /admin/stop endpoint requires an API key, which may or may not be already generated
-		boolean apiKeyNewlyGenerated = false;
-		ApiKey apiKey = null;
-		try {
-			apiKey = new ApiKey();
-			if (!apiKey.generated()) {
-				apiKey.generate();
-				apiKeyNewlyGenerated = true;
-				LOGGER.info("Generated API key");
-			}
-		} catch (IOException e) {
-			LOGGER.info("Error loading API key: {}", e.getMessage());
-		}
-
-		// Create GET params
-		Map<String, String> params = new HashMap<>();
-		if (apiKey != null) {
-			params.put("apiKey", apiKey.toString());
-		}
-
-		// Attempt to stop the node
 		int attempt;
 		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
 			final int attemptForLogging = attempt;
 			LOGGER.info(() -> String.format("Attempt #%d out of %d to shutdown node", attemptForLogging + 1, MAX_ATTEMPTS));
-			String response = ApiRequest.perform(baseUri + "admin/stop", params);
-			if (response == null) {
+			String response = ApiRequest.perform(baseUri + "admin/stop", null);
+			if (response == null)
 				// No response - consider node shut down
-				if (apiKeyNewlyGenerated) {
-					// API key was newly generated for this auto update, so we need to remove it
-					ApplyUpdate.removeGeneratedApiKey();
-				}
 				return true;
-			}
 
 			LOGGER.info(() -> String.format("Response from API: %s", response));
 
@@ -117,11 +89,6 @@ public class ApplyUpdate {
 			}
 		}
 
-		if (apiKeyNewlyGenerated) {
-			// API key was newly generated for this auto update, so we need to remove it
-			ApplyUpdate.removeGeneratedApiKey();
-		}
-
 		if (attempt == MAX_ATTEMPTS) {
 			LOGGER.error("Failed to shutdown node - giving up");
 			return false;
@@ -130,19 +97,6 @@ public class ApplyUpdate {
 		return true;
 	}
 
-	private static void removeGeneratedApiKey() {
-		try {
-			LOGGER.info("Removing newly generated API key...");
-
-			// Delete the API key since it was only generated for this auto update
-			ApiKey apiKey = new ApiKey();
-			apiKey.delete();
-
-		} catch (IOException e) {
-			LOGGER.error("Error loading or deleting API key: {}", e.getMessage());
-		}
-	}
-
 	private static void replaceJar() {
 		// Assuming current working directory contains the JAR files
 		Path realJar = Paths.get(JAR_FILENAME);
@@ -181,13 +135,13 @@ public class ApplyUpdate {
 
 	private static void restartNode(String[] args) {
 		String javaHome = System.getProperty("java.home");
-		LOGGER.debug(() -> String.format("Java home: %s", javaHome));
+		LOGGER.info(() -> String.format("Java home: %s", javaHome));
 
 		Path javaBinary = Paths.get(javaHome, "bin", "java");
-		LOGGER.debug(() -> String.format("Java binary: %s", javaBinary));
+		LOGGER.info(() -> String.format("Java binary: %s", javaBinary));
 
 		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
-		LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher));
+		LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher));
 
 		List<String> javaCmd;
 		if (Files.exists(exeLauncher)) {
@@ -200,11 +154,6 @@ public class ApplyUpdate {
 			// JVM arguments
 			javaCmd.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments());
 
-			// Reapply any retained, but disabled, -agentlib JVM arg
-			javaCmd = javaCmd.stream()
-					.map(arg -> arg.replace(AGENTLIB_JVM_HOLDER_ARG, "-agentlib"))
-					.collect(Collectors.toList());
-
 			// Call mainClass in JAR
 			javaCmd.addAll(Arrays.asList("-jar", JAR_FILENAME));
 
@@ -213,24 +162,17 @@ public class ApplyUpdate {
 		}
 
 		try {
-			LOGGER.debug(String.format("Restarting node with: %s", String.join(" ", javaCmd)));
+			LOGGER.info(() -> String.format("Restarting node with: %s", String.join(" ", javaCmd)));
 
 			ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
 
 			if (Files.exists(exeLauncher)) {
-				LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
+				LOGGER.info(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE));
 				processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
 			}
 
-			// New process will inherit our stdout and stderr
-			processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-			processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
-
-			Process process = processBuilder.start();
-
-			// Nothing to pipe to new process, so close output stream (process's stdin)
-			process.getOutputStream().close();
-		} catch (Exception e) {
+			processBuilder.start();
+		} catch (IOException e) {
 			LOGGER.error(String.format("Failed to restart node (BAD): %s", e.getMessage()));
 		}
 	}

src/main/java/org/qortal/RepositoryMaintenance.java

@@ -1,5 +1,7 @@
 package org.qortal;
 
+import java.security.Security;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -12,9 +14,6 @@ import org.qortal.repository.RepositoryManager;
 import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
 import org.qortal.settings.Settings;
 
-import java.security.Security;
-import java.util.concurrent.TimeoutException;
-
 public class RepositoryMaintenance {
 
 	static {
@@ -58,10 +57,10 @@ public class RepositoryMaintenance {
 
 		LOGGER.info("Starting repository periodic maintenance. This can take a while...");
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			repository.performPeriodicMaintenance(null);
+			repository.performPeriodicMaintenance();
 
 			LOGGER.info("Repository periodic maintenance completed");
-		} catch (DataException | TimeoutException e) {
+		} catch (DataException e) {
 			LOGGER.error("Repository periodic maintenance failed", e);
 		}
 

src/main/java/org/qortal/XorUpdate.java

@@ -1,7 +1,5 @@
 package org.qortal;
 
-import org.qortal.controller.AutoUpdate;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -9,6 +7,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.qortal.controller.AutoUpdate;
+
 public class XorUpdate {
 
 	private static final byte XOR_VALUE = AutoUpdate.XOR_VALUE;

src/main/java/org/qortal/account/Account.java

@@ -1,26 +1,19 @@
 package org.qortal.account;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.qortal.block.BlockChain;
-import org.qortal.controller.LiteNode;
-import org.qortal.data.account.AccountBalanceData;
-import org.qortal.data.account.AccountData;
-import org.qortal.data.account.RewardShareData;
-import org.qortal.data.naming.NameData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.GroupRepository;
-import org.qortal.repository.NameRepository;
-import org.qortal.repository.Repository;
-import org.qortal.settings.Settings;
-import org.qortal.utils.Base58;
+import static org.qortal.utils.Amounts.prettyAmount;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import java.util.List;
-
-import static org.qortal.utils.Amounts.prettyAmount;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.qortal.block.BlockChain;
+import org.qortal.data.account.AccountBalanceData;
+import org.qortal.data.account.AccountData;
+import org.qortal.data.account.RewardShareData;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+import org.qortal.utils.Base58;
 
 @XmlAccessorType(XmlAccessType.NONE) // Stops JAX-RS errors when unmarshalling blockchain config
 public class Account {
@@ -66,17 +59,7 @@ public class Account {
 	// Balance manipulations - assetId is 0 for QORT
 
 	public long getConfirmedBalance(long assetId) throws DataException {
-		AccountBalanceData accountBalanceData;
-
-		if (Settings.getInstance().isLite()) {
-			// Lite nodes request data from peers instead of the local db
-			accountBalanceData = LiteNode.getInstance().fetchAccountBalance(this.address, assetId);
-		}
-		else {
-			// All other node types fetch from the local db
-			accountBalanceData = this.repository.getAccountRepository().getBalance(this.address, assetId);
-		}
-
+		AccountBalanceData accountBalanceData = this.repository.getAccountRepository().getBalance(this.address, assetId);
 		if (accountBalanceData == null)
 			return 0;
 
@@ -198,99 +181,30 @@ public class Account {
 
 	/** Returns whether account can be considered a "minting account".
 	 * <p>
-	 * To be considered a "minting account", the account needs to pass some of these tests:<br>
+	 * To be considered a "minting account", the account needs to pass at least one of these tests:<br>
 	 * <ul>
 	 * <li>account's level is at least <tt>minAccountLevelToMint</tt> from blockchain config</li>
-	 * <li>account's address has registered a name</li>
-	 * <li>account's address is a member of the minter group</li>
+	 * <li>account has 'founder' flag set</li>
 	 * </ul>
-	 *
-	 * @param isGroupValidated true if this account has already been validated for MINTER Group membership
+	 * 
 	 * @return true if account can be considered "minting account"
 	 * @throws DataException
 	 */
-	public boolean canMint(boolean isGroupValidated) throws DataException {
+	public boolean canMint() throws DataException {
 		AccountData accountData = this.repository.getAccountRepository().getAccount(this.address);
-		NameRepository nameRepository = this.repository.getNameRepository();
-		GroupRepository groupRepository = this.repository.getGroupRepository();
-		String myAddress = accountData.getAddress();
+		if (accountData == null)
+			return false;
 
-		int blockchainHeight = this.repository.getBlockRepository().getBlockchainHeight();
+		Integer level = accountData.getLevel();
+		if (level != null && level >= BlockChain.getInstance().getMinAccountLevelToMint())
+			return true;
 
-		int levelToMint;
-
-		if( blockchainHeight >= BlockChain.getInstance().getIgnoreLevelForRewardShareHeight() ) {
-			levelToMint = 0;
-		}
-		else {
-			levelToMint = BlockChain.getInstance().getMinAccountLevelToMint();
-		}
-
-		int level = accountData.getLevel();
-		int groupIdToMint = BlockChain.getInstance().getMintingGroupId();
-		int nameCheckHeight = BlockChain.getInstance().getOnlyMintWithNameHeight();
-		int groupCheckHeight = BlockChain.getInstance().getGroupMemberCheckHeight();
-		int removeNameCheckHeight = BlockChain.getInstance().getRemoveOnlyMintWithNameHeight();
-
-		// Can only mint if:
-		// Account's level is at least minAccountLevelToMint from blockchain config
-		if (blockchainHeight < nameCheckHeight) {
-			if (Account.isFounder(accountData.getFlags())) {
-				return accountData.getBlocksMintedPenalty() == 0;
-			} else {
-				return level >= levelToMint;
-			}
-		}
-
-		// Can only mint on onlyMintWithNameHeight from blockchain config if:
-		// Account's level is at least minAccountLevelToMint from blockchain config
-		// Account's address has registered a name
-		if (blockchainHeight >= nameCheckHeight && blockchainHeight < groupCheckHeight) {
-			List<NameData> myName = nameRepository.getNamesByOwner(myAddress);
-			if (Account.isFounder(accountData.getFlags())) {
-				return accountData.getBlocksMintedPenalty() == 0 && !myName.isEmpty();
-			} else {
-				return level >= levelToMint && !myName.isEmpty();
-			}
-		}
-
-		// Can only mint on groupMemberCheckHeight from blockchain config if:
-		// Account's level is at least minAccountLevelToMint from blockchain config
-		// Account's address has registered a name
-		// Account's address is a member of the minter group
-		if (blockchainHeight >= groupCheckHeight && blockchainHeight < removeNameCheckHeight) {
-			List<NameData> myName = nameRepository.getNamesByOwner(myAddress);
-			if (Account.isFounder(accountData.getFlags())) {
-				return accountData.getBlocksMintedPenalty() == 0 && !myName.isEmpty() && (isGroupValidated || groupRepository.memberExists(groupIdToMint, myAddress));
-			} else {
-				return level >= levelToMint && !myName.isEmpty() && (isGroupValidated || groupRepository.memberExists(groupIdToMint, myAddress));
-			}
-		}
-
-		// Can only mint on removeOnlyMintWithNameHeight from blockchain config if:
-		// Account's level is at least minAccountLevelToMint from blockchain config
-		// Account's address is a member of the minter group
-		if (blockchainHeight >= removeNameCheckHeight) {
-			if (Account.isFounder(accountData.getFlags())) {
-				return accountData.getBlocksMintedPenalty() == 0 && (isGroupValidated || groupRepository.memberExists(groupIdToMint, myAddress));
-			} else {
-				return level >= levelToMint && (isGroupValidated || groupRepository.memberExists(groupIdToMint, myAddress));
-			}
-		}
+		if (Account.isFounder(accountData.getFlags()))
+			return true;
 
 		return false;
 	}
 
-	/** Returns account's blockMinted (0+) or null if account not found in repository. */
-	public Integer getBlocksMinted() throws DataException {
-		return this.repository.getAccountRepository().getMintedBlockCount(this.address);
-	}
-
-	/** Returns account's blockMintedPenalty or null if account not found in repository. */
-	public Integer getBlocksMintedPenalty() throws DataException {
-		return this.repository.getAccountRepository().getBlocksMintedPenaltyCount(this.address);
-	}
-
 	/** Returns whether account can build reward-shares.
 	 * <p>
 	 * To be able to create reward-shares, the account needs to pass at least one of these tests:<br>
@@ -304,7 +218,6 @@ public class Account {
 	 */
 	public boolean canRewardShare() throws DataException {
 		AccountData accountData = this.repository.getAccountRepository().getAccount(this.address);
-
 		if (accountData == null)
 			return false;
 
@@ -312,10 +225,7 @@ public class Account {
 		if (level != null && level >= BlockChain.getInstance().getMinAccountLevelToRewardShare())
 			return true;
 
-		if (Account.isFounder(accountData.getFlags()) && accountData.getBlocksMintedPenalty() == 0)
-			return true;
-
-		if( this.repository.getBlockRepository().getBlockchainHeight() >= BlockChain.getInstance().getIgnoreLevelForRewardShareHeight() )
+		if (Account.isFounder(accountData.getFlags()))
 			return true;
 
 		return false;
@@ -343,7 +253,7 @@ public class Account {
 	/**
 	 * Returns 'effective' minting level, or zero if account does not exist/cannot mint.
 	 * <p>
-	 * For founder accounts with no penalty, this returns "founderEffectiveMintingLevel" from blockchain config.
+	 * For founder accounts, this returns "founderEffectiveMintingLevel" from blockchain config.
 	 * 
 	 * @return 0+
 	 * @throws DataException
@@ -353,34 +263,17 @@ public class Account {
 		if (accountData == null)
 			return 0;
 
-		// Founders are assigned a different effective minting level, as long as they have no penalty
-		if (Account.isFounder(accountData.getFlags()) && accountData.getBlocksMintedPenalty() == 0)
+		if (Account.isFounder(accountData.getFlags()))
 			return BlockChain.getInstance().getFounderEffectiveMintingLevel();
 
 		return accountData.getLevel();
 	}
 
-	/**
-	 * Returns reward-share minting address, or unknown if reward-share does not exist.
-	 * 
-	 * @param repository
-	 * @param rewardSharePublicKey
-	 * @return address or unknown
-	 * @throws DataException
-	 */
-	public static String getRewardShareMintingAddress(Repository repository, byte[] rewardSharePublicKey) throws DataException {
-		// Find actual minter address
-		RewardShareData rewardShareData = repository.getAccountRepository().getRewardShare(rewardSharePublicKey);
-
-		if (rewardShareData == null)
-			return "Unknown";
-
-		return rewardShareData.getMinter();
-	}
-
 	/**
 	 * Returns 'effective' minting level, or zero if reward-share does not exist.
-	 *
+	 * <p>
+	 * For founder accounts, this returns "founderEffectiveMintingLevel" from blockchain config.
+	 * 
 	 * @param repository
 	 * @param rewardSharePublicKey
 	 * @return 0+
@@ -396,26 +289,4 @@ public class Account {
 		return rewardShareMinter.getEffectiveMintingLevel();
 	}
 
-	/**
-	 * Returns 'effective' minting level, with a fix for the zero level.
-	 * <p>
-	 * For founder accounts with no penalty, this returns "founderEffectiveMintingLevel" from blockchain config.
-	 *
-	 * @param repository
-	 * @param rewardSharePublicKey
-	 * @return 0+
-	 * @throws DataException
-	 */
-	public static int getRewardShareEffectiveMintingLevelIncludingLevelZero(Repository repository, byte[] rewardSharePublicKey) throws DataException {
-		// Find actual minter and get their effective minting level
-		RewardShareData rewardShareData = repository.getAccountRepository().getRewardShare(rewardSharePublicKey);
-		if (rewardShareData == null)
-			return 0;
-
-		else if (!rewardShareData.getMinter().equals(rewardShareData.getRecipient())) // Sponsorship reward share
-			return 0;
-
-		Account rewardShareMinter = new Account(repository, rewardShareData.getMinter());
-		return rewardShareMinter.getEffectiveMintingLevel();
-	}
 }

src/main/java/org/qortal/account/AccountRefCache.java

@@ -1,15 +1,15 @@
 package org.qortal.account;
 
-import org.qortal.data.account.AccountData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.utils.Pair;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.BinaryOperator;
 
+import org.qortal.data.account.AccountData;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+import org.qortal.utils.Pair;
+
 /**
  * Account lastReference caching
  * <p>

src/main/java/org/qortal/account/PrivateKeyAccount.java

@@ -11,15 +11,15 @@ public class PrivateKeyAccount extends PublicKeyAccount {
 	private final Ed25519PrivateKeyParameters edPrivateKeyParams;
 
 	/**
-	 * Create PrivateKeyAccount using byte[32] private key.
+	 * Create PrivateKeyAccount using byte[32] seed.
 	 * 
-	 * @param privateKey
+	 * @param seed
 	 *            byte[32] used to create private/public key pair
 	 * @throws IllegalArgumentException
-	 *             if passed invalid privateKey
+	 *             if passed invalid seed
 	 */
-	public PrivateKeyAccount(Repository repository, byte[] privateKey) {
-		this(repository, new Ed25519PrivateKeyParameters(privateKey, 0));
+	public PrivateKeyAccount(Repository repository, byte[] seed) {
+		this(repository, new Ed25519PrivateKeyParameters(seed, 0));
 	}
 
 	private PrivateKeyAccount(Repository repository, Ed25519PrivateKeyParameters edPrivateKeyParams) {
@@ -37,6 +37,10 @@ public class PrivateKeyAccount extends PublicKeyAccount {
 		return this.privateKey;
 	}
 
+	public static byte[] toPublicKey(byte[] seed) {
+		return new Ed25519PrivateKeyParameters(seed, 0).generatePublicKey().getEncoded();
+	}
+
 	public byte[] sign(byte[] message) {
 		return Crypto.sign(this.edPrivateKeyParams, message);
 	}

src/main/java/org/qortal/account/SelfSponsorshipAlgoV1.java

@@ -1,366 +0,0 @@
-package org.qortal.account;
-
-import org.qortal.api.resource.TransactionsResource;
-import org.qortal.asset.Asset;
-import org.qortal.data.account.AccountData;
-import org.qortal.data.naming.NameData;
-import org.qortal.data.transaction.*;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.transaction.Transaction.TransactionType;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class SelfSponsorshipAlgoV1 {
-
-    private final Repository repository;
-    private final String address;
-    private final AccountData accountData;
-    private final long snapshotTimestamp;
-    private final boolean override;
-
-    private int registeredNameCount = 0;
-    private int suspiciousCount = 0;
-    private int suspiciousPercent = 0;
-    private int consolidationCount = 0;
-    private int bulkIssuanceCount = 0;
-    private int recentSponsorshipCount = 0;
-
-    private List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-    private final Map<String, List<TransactionData>> paymentsByAddress = new HashMap<>();
-    private final Set<String> sponsees = new LinkedHashSet<>();
-    private Set<String> consolidatedAddresses = new LinkedHashSet<>();
-    private final Set<String> zeroTransactionAddreses = new LinkedHashSet<>();
-    private final Set<String> penaltyAddresses = new LinkedHashSet<>();
-
-    public SelfSponsorshipAlgoV1(Repository repository, String address, long snapshotTimestamp, boolean override) throws DataException {
-        this.repository = repository;
-        this.address = address;
-        this.accountData = this.repository.getAccountRepository().getAccount(this.address);
-        this.snapshotTimestamp = snapshotTimestamp;
-        this.override = override;
-    }
-
-    public String getAddress() {
-        return this.address;
-    }
-
-    public Set<String> getPenaltyAddresses() {
-        return this.penaltyAddresses;
-    }
-
-
-    public void run() throws DataException {
-        if (this.accountData == null) {
-            // Nothing to do
-            return;
-        }
-
-        this.fetchSponsorshipRewardShares();
-        if (this.sponsorshipRewardShares.isEmpty()) {
-            // Nothing to do
-            return;
-        }
-
-        this.findConsolidatedRewards();
-        this.findBulkIssuance();
-        this.findRegisteredNameCount();
-        this.findRecentSponsorshipCount();
-
-        int score = this.calculateScore();
-        if (score <= 0 && !override) {
-            return;
-        }
-
-        String newAddress = this.getDestinationAccount(this.address);
-        while (newAddress != null) {
-            // Found destination account
-            this.penaltyAddresses.add(newAddress);
-
-            // Run algo for this address, but in "override" mode because it has already been flagged
-            SelfSponsorshipAlgoV1 algoV1 = new SelfSponsorshipAlgoV1(this.repository, newAddress, this.snapshotTimestamp, true);
-            algoV1.run();
-            this.penaltyAddresses.addAll(algoV1.getPenaltyAddresses());
-
-            newAddress = this.getDestinationAccount(newAddress);
-        }
-
-        this.penaltyAddresses.add(this.address);
-
-        if (this.override || this.recentSponsorshipCount < 20) {
-            this.penaltyAddresses.addAll(this.consolidatedAddresses);
-            this.penaltyAddresses.addAll(this.zeroTransactionAddreses);
-        }
-        else {
-            this.penaltyAddresses.addAll(this.sponsees);
-        }
-    }
-
-    private String getDestinationAccount(String address) throws DataException {
-        List<TransactionData> transferPrivsTransactions = fetchTransferPrivsForAddress(address);
-        if (transferPrivsTransactions.isEmpty()) {
-            // No TRANSFER_PRIVS transactions for this address
-            return null;
-        }
-
-        AccountData accountData = this.repository.getAccountRepository().getAccount(address);
-        if (accountData == null) {
-            return null;
-        }
-
-        for (TransactionData transactionData : transferPrivsTransactions) {
-            TransferPrivsTransactionData transferPrivsTransactionData = (TransferPrivsTransactionData) transactionData;
-            if (Arrays.equals(transferPrivsTransactionData.getSenderPublicKey(), accountData.getPublicKey())) {
-                return transferPrivsTransactionData.getRecipient();
-            }
-        }
-
-        return null;
-    }
-
-    private void findConsolidatedRewards() throws DataException {
-        List<String> sponseesThatSentRewards = new ArrayList<>();
-        Map<String, Integer> paymentRecipients = new HashMap<>();
-
-        // Collect outgoing payments of each sponsee
-        for (String sponseeAddress : this.sponsees) {
-
-            // Firstly fetch all payments for address, since the functions below depend on this data
-            this.fetchPaymentsForAddress(sponseeAddress);
-
-            // Check if the address has zero relevant transactions
-            if (this.hasZeroTransactions(sponseeAddress)) {
-                this.zeroTransactionAddreses.add(sponseeAddress);
-            }
-
-            // Get payment recipients
-            List<String> allPaymentRecipients = this.fetchOutgoingPaymentRecipientsForAddress(sponseeAddress);
-            if (allPaymentRecipients.isEmpty()) {
-                continue;
-            }
-            sponseesThatSentRewards.add(sponseeAddress);
-
-            List<String> addressesPaidByThisSponsee = new ArrayList<>();
-            for (String paymentRecipient : allPaymentRecipients) {
-                if (addressesPaidByThisSponsee.contains(paymentRecipient)) {
-                    // We already tracked this association - don't allow multiple to stack up
-                    continue;
-                }
-                addressesPaidByThisSponsee.add(paymentRecipient);
-
-                // Increment count for this recipient, or initialize to 1 if not present
-                if (paymentRecipients.computeIfPresent(paymentRecipient, (k, v) -> v + 1) == null) {
-                    paymentRecipients.put(paymentRecipient, 1);
-                }
-            }
-
-        }
-
-        // Exclude addresses with a low number of payments
-        Map<String, Integer> filteredPaymentRecipients = paymentRecipients.entrySet().stream()
-                .filter(p -> p.getValue() != null && p.getValue() >= 10)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        // Now check how many sponsees have sent to this subset of addresses
-        Map<String, Integer> sponseesThatConsolidatedRewards = new HashMap<>();
-        for (String sponseeAddress : sponseesThatSentRewards) {
-            List<String> allPaymentRecipients = this.fetchOutgoingPaymentRecipientsForAddress(sponseeAddress);
-            // Remove any that aren't to one of the flagged recipients (i.e. consolidation)
-            allPaymentRecipients.removeIf(r -> !filteredPaymentRecipients.containsKey(r));
-
-            int count = allPaymentRecipients.size();
-            if (count == 0) {
-                continue;
-            }
-            if (sponseesThatConsolidatedRewards.computeIfPresent(sponseeAddress, (k, v) -> v + count) == null) {
-                sponseesThatConsolidatedRewards.put(sponseeAddress, count);
-            }
-        }
-
-        // Remove sponsees that have only sent a low number of payments to the filtered addresses
-        Map<String, Integer> filteredSponseesThatConsolidatedRewards = sponseesThatConsolidatedRewards.entrySet().stream()
-                .filter(p -> p.getValue() != null && p.getValue() >= 2)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        this.consolidationCount = sponseesThatConsolidatedRewards.size();
-        this.consolidatedAddresses = new LinkedHashSet<>(filteredSponseesThatConsolidatedRewards.keySet());
-        this.suspiciousCount = this.consolidationCount + this.zeroTransactionAddreses.size();
-        this.suspiciousPercent = (int)(this.suspiciousCount / (float) this.sponsees.size() * 100);
-    }
-
-    private void findBulkIssuance() {
-        Long lastTimestamp = null;
-        for (RewardShareTransactionData rewardShareTransactionData : sponsorshipRewardShares) {
-            long timestamp = rewardShareTransactionData.getTimestamp();
-            if (timestamp >= this.snapshotTimestamp) {
-                continue;
-            }
-
-            if (lastTimestamp != null) {
-                if (timestamp - lastTimestamp < 3*60*1000L) {
-                    this.bulkIssuanceCount++;
-                }
-            }
-            lastTimestamp = timestamp;
-        }
-    }
-
-    private void findRegisteredNameCount() throws DataException {
-        int registeredNameCount = 0;
-        for (String sponseeAddress : sponsees) {
-            List<NameData> names = repository.getNameRepository().getNamesByOwner(sponseeAddress);
-            for (NameData name : names) {
-                if (name.getRegistered() < this.snapshotTimestamp) {
-                    registeredNameCount++;
-                    break;
-                }
-            }
-        }
-        this.registeredNameCount = registeredNameCount;
-    }
-
-    private void findRecentSponsorshipCount() {
-        final long referenceTimestamp = this.snapshotTimestamp - (365 * 24 * 60 * 60 * 1000L);
-        int recentSponsorshipCount = 0;
-        for (RewardShareTransactionData rewardShare : sponsorshipRewardShares) {
-            if (rewardShare.getTimestamp() >= referenceTimestamp) {
-                recentSponsorshipCount++;
-            }
-        }
-        this.recentSponsorshipCount = recentSponsorshipCount;
-    }
-
-    private int calculateScore() {
-        final int suspiciousMultiplier = (this.suspiciousCount >= 100) ? this.suspiciousPercent : 1;
-        final int nameMultiplier = (this.sponsees.size() >= 50 && this.registeredNameCount == 0) ? 2 : 1;
-        final int consolidationMultiplier = Math.max(this.consolidationCount, 1);
-        final int bulkIssuanceMultiplier = Math.max(this.bulkIssuanceCount / 2, 1);
-        final int offset = 9;
-        return suspiciousMultiplier * nameMultiplier * consolidationMultiplier * bulkIssuanceMultiplier - offset;
-    }
-
-    private void fetchSponsorshipRewardShares() throws DataException {
-        List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-
-        // Define relevant transactions
-        List<TransactionType> txTypes = List.of(TransactionType.REWARD_SHARE);
-        List<TransactionData> transactionDataList = fetchTransactions(repository, txTypes, this.address, false);
-
-        for (TransactionData transactionData : transactionDataList) {
-            if (transactionData.getType() != TransactionType.REWARD_SHARE) {
-                continue;
-            }
-
-            RewardShareTransactionData rewardShareTransactionData = (RewardShareTransactionData) transactionData;
-
-            // Skip removals
-            if (rewardShareTransactionData.getSharePercent() < 0) {
-                continue;
-            }
-
-            // Skip if not sponsored by this account
-            if (!Arrays.equals(rewardShareTransactionData.getCreatorPublicKey(), accountData.getPublicKey())) {
-                continue;
-            }
-
-            // Skip self shares
-            if (Objects.equals(rewardShareTransactionData.getRecipient(), this.address)) {
-                continue;
-            }
-
-            boolean duplicateFound = false;
-            for (RewardShareTransactionData existingRewardShare : sponsorshipRewardShares) {
-                if (Objects.equals(existingRewardShare.getRecipient(), rewardShareTransactionData.getRecipient())) {
-                    // Duplicate
-                    duplicateFound = true;
-                    break;
-                }
-            }
-            if (!duplicateFound) {
-                sponsorshipRewardShares.add(rewardShareTransactionData);
-                this.sponsees.add(rewardShareTransactionData.getRecipient());
-            }
-        }
-
-        this.sponsorshipRewardShares = sponsorshipRewardShares;
-    }
-
-    private List<TransactionData> fetchTransferPrivsForAddress(String address) throws DataException {
-        return fetchTransactions(repository,
-                List.of(TransactionType.TRANSFER_PRIVS),
-                address, true);
-    }
-
-    private void fetchPaymentsForAddress(String address) throws DataException {
-        List<TransactionData> payments = fetchTransactions(repository,
-                Arrays.asList(TransactionType.PAYMENT, TransactionType.TRANSFER_ASSET),
-                address, false);
-        this.paymentsByAddress.put(address, payments);
-    }
-
-    private List<String> fetchOutgoingPaymentRecipientsForAddress(String address) {
-        List<String> outgoingPaymentRecipients = new ArrayList<>();
-
-        List<TransactionData> transactionDataList = this.paymentsByAddress.get(address);
-        if (transactionDataList == null) transactionDataList = new ArrayList<>();
-        transactionDataList.removeIf(t -> t.getTimestamp() >= this.snapshotTimestamp);
-        for (TransactionData transactionData : transactionDataList) {
-            switch (transactionData.getType()) {
-
-                case PAYMENT:
-                    PaymentTransactionData paymentTransactionData = (PaymentTransactionData) transactionData;
-                    if (!Objects.equals(paymentTransactionData.getRecipient(), address)) {
-                        // Outgoing payment from this account
-                        outgoingPaymentRecipients.add(paymentTransactionData.getRecipient());
-                    }
-                    break;
-
-                case TRANSFER_ASSET:
-                    TransferAssetTransactionData transferAssetTransactionData = (TransferAssetTransactionData) transactionData;
-                    if (transferAssetTransactionData.getAssetId() == Asset.QORT) {
-                        if (!Objects.equals(transferAssetTransactionData.getRecipient(), address)) {
-                            // Outgoing payment from this account
-                            outgoingPaymentRecipients.add(transferAssetTransactionData.getRecipient());
-                        }
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return outgoingPaymentRecipients;
-    }
-
-    private boolean hasZeroTransactions(String address) {
-        List<TransactionData> transactionDataList = this.paymentsByAddress.get(address);
-        if (transactionDataList == null) {
-            return true;
-        }
-        transactionDataList.removeIf(t -> t.getTimestamp() >= this.snapshotTimestamp);
-        return transactionDataList.isEmpty();
-    }
-
-    private static List<TransactionData> fetchTransactions(Repository repository, List<TransactionType> txTypes, String address, boolean reverse) throws DataException {
-        // Fetch all relevant transactions for this account
-        List<byte[]> signatures = repository.getTransactionRepository()
-                .getSignaturesMatchingCriteria(null, null, null, txTypes,
-                        null, null, address, TransactionsResource.ConfirmationStatus.CONFIRMED,
-                        null, null, reverse);
-
-        List<TransactionData> transactionDataList = new ArrayList<>();
-
-        for (byte[] signature : signatures) {
-            // Fetch transaction data
-            TransactionData transactionData = repository.getTransactionRepository().fromSignature(signature);
-            if (transactionData == null) {
-                continue;
-            }
-            transactionDataList.add(transactionData);
-        }
-
-        return transactionDataList;
-    }
-}

src/main/java/org/qortal/account/SelfSponsorshipAlgoV2.java

@@ -1,249 +0,0 @@
-package org.qortal.account;
-
-import org.qortal.api.resource.TransactionsResource;
-import org.qortal.asset.Asset;
-import org.qortal.block.BlockChain;
-import org.qortal.data.account.AccountData;
-import org.qortal.data.transaction.*;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.transaction.Transaction.TransactionType;
-
-import java.util.*;
-
-public class SelfSponsorshipAlgoV2 {
-
-    private final long snapshotTimestampV1 = BlockChain.getInstance().getSelfSponsorshipAlgoV1SnapshotTimestamp();
-    private final long snapshotTimestampV2 = BlockChain.getInstance().getSelfSponsorshipAlgoV2SnapshotTimestamp();
-    private final long referenceTimestamp = BlockChain.getInstance().getReferenceTimestampBlock();
-
-    private final boolean override;
-    private final Repository repository;
-    private final String address;
-
-    private int recentAssetSendCount  = 0;
-    private int recentSponsorshipCount = 0;
-
-    private final Set<String> assetAddresses = new LinkedHashSet<>();
-    private final Set<String> penaltyAddresses = new LinkedHashSet<>();
-    private final Set<String> sponsorAddresses = new LinkedHashSet<>();
-
-    private List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-    private List<TransferAssetTransactionData> transferAssetForAddress = new ArrayList<>();
-
-    public SelfSponsorshipAlgoV2(Repository repository, String address, boolean override) {
-        this.repository = repository;
-        this.address = address;
-        this.override = override;
-    }
-
-    public String getAddress() {
-        return this.address;
-    }
-
-    public Set<String> getPenaltyAddresses() {
-        return this.penaltyAddresses;
-    }
-
-    public void run() throws DataException {
-        if (!override) {
-            this.getAccountPrivs(this.address);
-        }
-
-        if (override) {
-            this.fetchTransferAssetForAddress(this.address);
-            this.findRecentAssetSendCount();
-
-            if (this.recentAssetSendCount >= 6) {
-                this.penaltyAddresses.add(this.address);
-                this.penaltyAddresses.addAll(this.assetAddresses);
-            }
-        }
-    }
-
-    private void getAccountPrivs(String address) throws DataException {
-        AccountData accountData = this.repository.getAccountRepository().getAccount(address);
-        List<TransactionData> transferPrivsTransactions = fetchTransferPrivsForAddress(address);
-        transferPrivsTransactions.removeIf(t -> t.getTimestamp() > this.referenceTimestamp || accountData.getAddress().equals(t.getRecipient()));
-
-        if (transferPrivsTransactions.isEmpty()) {
-            // Nothing to do
-            return;
-        }
-
-        for (TransactionData transactionData : transferPrivsTransactions) {
-            TransferPrivsTransactionData transferPrivsTransactionData = (TransferPrivsTransactionData) transactionData;
-            this.penaltyAddresses.add(transferPrivsTransactionData.getRecipient());
-            this.fetchSponsorshipRewardShares(transferPrivsTransactionData.getRecipient());
-            this.findRecentSponsorshipCount();
-
-            if (this.recentSponsorshipCount >= 1) {
-                this.penaltyAddresses.addAll(this.sponsorAddresses);
-            }
-
-            String newAddress = this.getDestinationAccount(transferPrivsTransactionData.getRecipient());
-
-            while (newAddress != null) {
-                // Found destination account
-                this.penaltyAddresses.add(newAddress);
-                this.fetchSponsorshipRewardShares(newAddress);
-                this.findRecentSponsorshipCount();
-
-                if (this.recentSponsorshipCount >= 1) {
-                    this.penaltyAddresses.addAll(this.sponsorAddresses);
-                }
-
-                newAddress = this.getDestinationAccount(newAddress);
-            }
-        }
-    }
-
-    private String getDestinationAccount(String address) throws DataException {
-        AccountData accountData = this.repository.getAccountRepository().getAccount(address);
-        List<TransactionData> transferPrivsTransactions = fetchTransferPrivsForAddress(address);
-        transferPrivsTransactions.removeIf(t -> t.getTimestamp() > this.referenceTimestamp || accountData.getAddress().equals(t.getRecipient()));
-
-        if (transferPrivsTransactions.isEmpty()) {
-            return null;
-        }
-
-        if (accountData == null) {
-            return null;
-        }
-
-        for (TransactionData transactionData : transferPrivsTransactions) {
-            TransferPrivsTransactionData transferPrivsTransactionData = (TransferPrivsTransactionData) transactionData;
-            if (Arrays.equals(transferPrivsTransactionData.getSenderPublicKey(), accountData.getPublicKey())) {
-                return transferPrivsTransactionData.getRecipient();
-            }
-        }
-
-        return null;
-    }
-
-    private void fetchSponsorshipRewardShares(String address) throws DataException {
-        AccountData accountDataRs = this.repository.getAccountRepository().getAccount(address);
-        List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-
-        // Define relevant transactions
-        List<TransactionType> txTypes = List.of(TransactionType.REWARD_SHARE);
-        List<TransactionData> transactionDataList = fetchTransactions(repository, txTypes, address, false);
-
-        for (TransactionData transactionData : transactionDataList) {
-            if (transactionData.getType() != TransactionType.REWARD_SHARE) {
-                continue;
-            }
-
-            RewardShareTransactionData rewardShareTransactionData = (RewardShareTransactionData) transactionData;
-
-            // Skip removals
-            if (rewardShareTransactionData.getSharePercent() < 0) {
-                continue;
-            }
-
-            // Skip if not sponsored by this account
-            if (!Arrays.equals(rewardShareTransactionData.getCreatorPublicKey(), accountDataRs.getPublicKey())) {
-                continue;
-            }
-
-            // Skip self shares
-            if (Objects.equals(rewardShareTransactionData.getRecipient(), address)) {
-                continue;
-            }
-
-            boolean duplicateFound = false;
-            for (RewardShareTransactionData existingRewardShare : sponsorshipRewardShares) {
-                if (Objects.equals(existingRewardShare.getRecipient(), rewardShareTransactionData.getRecipient())) {
-                    // Duplicate
-                    duplicateFound = true;
-                    break;
-                }
-            }
-
-            if (!duplicateFound) {
-                sponsorshipRewardShares.add(rewardShareTransactionData);
-                this.sponsorAddresses.add(rewardShareTransactionData.getRecipient());
-            }
-        }
-
-        this.sponsorshipRewardShares = sponsorshipRewardShares;
-    }
-
-    private void fetchTransferAssetForAddress(String address) throws DataException {
-        List<TransferAssetTransactionData> transferAssetForAddress = new ArrayList<>();
-
-        // Define relevant transactions
-        List<TransactionType> txTypes = List.of(TransactionType.TRANSFER_ASSET);
-        List<TransactionData> transactionDataList = fetchTransactions(repository, txTypes, address, false);
-        transactionDataList.removeIf(t -> t.getTimestamp() <= this.snapshotTimestampV1 || t.getTimestamp() >= this.snapshotTimestampV2);
-
-        for (TransactionData transactionData : transactionDataList) {
-            if (transactionData.getType() != TransactionType.TRANSFER_ASSET) {
-                continue;
-            }
-
-            TransferAssetTransactionData transferAssetTransactionData = (TransferAssetTransactionData) transactionData;
-
-            if (transferAssetTransactionData.getAssetId() == Asset.QORT) {
-                if (!Objects.equals(transferAssetTransactionData.getRecipient(), address)) {
-                    // Outgoing transfer asset for this account
-                    transferAssetForAddress.add(transferAssetTransactionData);
-                    this.assetAddresses.add(transferAssetTransactionData.getRecipient());
-                }
-            }
-        }
-
-        this.transferAssetForAddress = transferAssetForAddress;
-    }
-
-    private void findRecentSponsorshipCount() {
-        int recentSponsorshipCount = 0;
-
-        for (RewardShareTransactionData rewardShare : sponsorshipRewardShares) {
-            if (rewardShare.getTimestamp() >= this.snapshotTimestampV1) {
-                recentSponsorshipCount++;
-            }
-        }
-
-        this.recentSponsorshipCount = recentSponsorshipCount;
-    }
-
-    private void findRecentAssetSendCount() {
-        int recentAssetSendCount = 0;
-
-        for (TransferAssetTransactionData assetSend : transferAssetForAddress) {
-            if (assetSend.getTimestamp() >= this.snapshotTimestampV1) {
-                recentAssetSendCount++;
-            }
-        }
-
-        this.recentAssetSendCount = recentAssetSendCount;
-    }
-
-    private List<TransactionData> fetchTransferPrivsForAddress(String address) throws DataException {
-        return fetchTransactions(repository,
-                List.of(TransactionType.TRANSFER_PRIVS),
-                address, true);
-    }
-
-    private static List<TransactionData> fetchTransactions(Repository repository, List<TransactionType> txTypes, String address, boolean reverse) throws DataException {
-        // Fetch all relevant transactions for this account
-        List<byte[]> signatures = repository.getTransactionRepository()
-                .getSignaturesMatchingCriteria(null, null, null, txTypes,
-                        null, null, address, TransactionsResource.ConfirmationStatus.CONFIRMED,
-                        null, null, reverse);
-
-        List<TransactionData> transactionDataList = new ArrayList<>();
-
-        for (byte[] signature : signatures) {
-            // Fetch transaction data
-            TransactionData transactionData = repository.getTransactionRepository().fromSignature(signature);
-            if (transactionData == null) {
-                continue;
-            }
-            transactionDataList.add(transactionData);
-        }
-
-        return transactionDataList;
-    }
-}

src/main/java/org/qortal/account/SelfSponsorshipAlgoV3.java

@@ -1,370 +0,0 @@
-package org.qortal.account;
-
-import org.qortal.api.resource.TransactionsResource;
-import org.qortal.asset.Asset;
-import org.qortal.data.account.AccountData;
-import org.qortal.data.naming.NameData;
-import org.qortal.data.transaction.*;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.transaction.Transaction.TransactionType;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class SelfSponsorshipAlgoV3 {
-
-    private final Repository repository;
-    private final String address;
-    private final AccountData accountData;
-    private final long snapshotTimestampV1;
-    private final long snapshotTimestampV3;
-    private final boolean override;
-
-    private int registeredNameCount = 0;
-    private int suspiciousCount = 0;
-    private int suspiciousPercent = 0;
-    private int consolidationCount = 0;
-    private int bulkIssuanceCount = 0;
-    private int recentSponsorshipCount = 0;
-
-    private List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-    private final Map<String, List<TransactionData>> paymentsByAddress = new HashMap<>();
-    private final Set<String> sponsees = new LinkedHashSet<>();
-    private Set<String> consolidatedAddresses = new LinkedHashSet<>();
-    private final Set<String> zeroTransactionAddreses = new LinkedHashSet<>();
-    private final Set<String> penaltyAddresses = new LinkedHashSet<>();
-
-    public SelfSponsorshipAlgoV3(Repository repository, String address, long snapshotTimestampV1, long snapshotTimestampV3, boolean override) throws DataException {
-        this.repository = repository;
-        this.address = address;
-        this.accountData = this.repository.getAccountRepository().getAccount(this.address);
-        this.snapshotTimestampV1 = snapshotTimestampV1;
-        this.snapshotTimestampV3 = snapshotTimestampV3;
-        this.override = override;
-    }
-
-    public String getAddress() {
-        return this.address;
-    }
-
-    public Set<String> getPenaltyAddresses() {
-        return this.penaltyAddresses;
-    }
-
-
-    public void run() throws DataException {
-        if (this.accountData == null) {
-            // Nothing to do
-            return;
-        }
-
-        this.fetchSponsorshipRewardShares();
-        if (this.sponsorshipRewardShares.isEmpty()) {
-            // Nothing to do
-            return;
-        }
-
-        this.findConsolidatedRewards();
-        this.findBulkIssuance();
-        this.findRegisteredNameCount();
-        this.findRecentSponsorshipCount();
-
-        int score = this.calculateScore();
-        if (score <= 0 && !override) {
-            return;
-        }
-
-        String newAddress = this.getDestinationAccount(this.address);
-        while (newAddress != null) {
-            // Found destination account
-            this.penaltyAddresses.add(newAddress);
-
-            // Run algo for this address, but in "override" mode because it has already been flagged
-            SelfSponsorshipAlgoV3 algoV3 = new SelfSponsorshipAlgoV3(this.repository, newAddress, this.snapshotTimestampV1, this.snapshotTimestampV3, true);
-            algoV3.run();
-            this.penaltyAddresses.addAll(algoV3.getPenaltyAddresses());
-
-            newAddress = this.getDestinationAccount(newAddress);
-        }
-
-        this.penaltyAddresses.add(this.address);
-
-        if (this.override || this.recentSponsorshipCount < 20) {
-            this.penaltyAddresses.addAll(this.consolidatedAddresses);
-            this.penaltyAddresses.addAll(this.zeroTransactionAddreses);
-        }
-        else {
-            this.penaltyAddresses.addAll(this.sponsees);
-        }
-    }
-
-    private String getDestinationAccount(String address) throws DataException {
-        List<TransactionData> transferPrivsTransactions = fetchTransferPrivsForAddress(address);
-        if (transferPrivsTransactions.isEmpty()) {
-            // No TRANSFER_PRIVS transactions for this address
-            return null;
-        }
-
-        AccountData accountData = this.repository.getAccountRepository().getAccount(address);
-        if (accountData == null) {
-            return null;
-        }
-
-        for (TransactionData transactionData : transferPrivsTransactions) {
-            TransferPrivsTransactionData transferPrivsTransactionData = (TransferPrivsTransactionData) transactionData;
-            if (Arrays.equals(transferPrivsTransactionData.getSenderPublicKey(), accountData.getPublicKey())) {
-                return transferPrivsTransactionData.getRecipient();
-            }
-        }
-
-        return null;
-    }
-
-    private void findConsolidatedRewards() throws DataException {
-        List<String> sponseesThatSentRewards = new ArrayList<>();
-        Map<String, Integer> paymentRecipients = new HashMap<>();
-
-        // Collect outgoing payments of each sponsee
-        for (String sponseeAddress : this.sponsees) {
-
-            // Firstly fetch all payments for address, since the functions below depend on this data
-            this.fetchPaymentsForAddress(sponseeAddress);
-
-            // Check if the address has zero relevant transactions
-            if (this.hasZeroTransactions(sponseeAddress)) {
-                this.zeroTransactionAddreses.add(sponseeAddress);
-            }
-
-            // Get payment recipients
-            List<String> allPaymentRecipients = this.fetchOutgoingPaymentRecipientsForAddress(sponseeAddress);
-            if (allPaymentRecipients.isEmpty()) {
-                continue;
-            }
-            sponseesThatSentRewards.add(sponseeAddress);
-
-            List<String> addressesPaidByThisSponsee = new ArrayList<>();
-            for (String paymentRecipient : allPaymentRecipients) {
-                if (addressesPaidByThisSponsee.contains(paymentRecipient)) {
-                    // We already tracked this association - don't allow multiple to stack up
-                    continue;
-                }
-                addressesPaidByThisSponsee.add(paymentRecipient);
-
-                // Increment count for this recipient, or initialize to 1 if not present
-                if (paymentRecipients.computeIfPresent(paymentRecipient, (k, v) -> v + 1) == null) {
-                    paymentRecipients.put(paymentRecipient, 1);
-                }
-            }
-
-        }
-
-        // Exclude addresses with a low number of payments
-        Map<String, Integer> filteredPaymentRecipients = paymentRecipients.entrySet().stream()
-                .filter(p -> p.getValue() != null && p.getValue() >= 10)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        // Now check how many sponsees have sent to this subset of addresses
-        Map<String, Integer> sponseesThatConsolidatedRewards = new HashMap<>();
-        for (String sponseeAddress : sponseesThatSentRewards) {
-            List<String> allPaymentRecipients = this.fetchOutgoingPaymentRecipientsForAddress(sponseeAddress);
-            // Remove any that aren't to one of the flagged recipients (i.e. consolidation)
-            allPaymentRecipients.removeIf(r -> !filteredPaymentRecipients.containsKey(r));
-
-            int count = allPaymentRecipients.size();
-            if (count == 0) {
-                continue;
-            }
-            if (sponseesThatConsolidatedRewards.computeIfPresent(sponseeAddress, (k, v) -> v + count) == null) {
-                sponseesThatConsolidatedRewards.put(sponseeAddress, count);
-            }
-        }
-
-        // Remove sponsees that have only sent a low number of payments to the filtered addresses
-        Map<String, Integer> filteredSponseesThatConsolidatedRewards = sponseesThatConsolidatedRewards.entrySet().stream()
-                .filter(p -> p.getValue() != null && p.getValue() >= 2)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        this.consolidationCount = sponseesThatConsolidatedRewards.size();
-        this.consolidatedAddresses = new LinkedHashSet<>(filteredSponseesThatConsolidatedRewards.keySet());
-        this.suspiciousCount = this.consolidationCount + this.zeroTransactionAddreses.size();
-        this.suspiciousPercent = (int)(this.suspiciousCount / (float) this.sponsees.size() * 100);
-    }
-
-    private void findBulkIssuance() {
-        Long lastTimestamp = null;
-        for (RewardShareTransactionData rewardShareTransactionData : sponsorshipRewardShares) {
-            long timestamp = rewardShareTransactionData.getTimestamp();
-            if (timestamp >= this.snapshotTimestampV3) {
-                continue;
-            }
-
-            if (lastTimestamp != null) {
-                if (timestamp - lastTimestamp < 3*60*1000L) {
-                    this.bulkIssuanceCount++;
-                }
-            }
-            lastTimestamp = timestamp;
-        }
-    }
-
-    private void findRegisteredNameCount() throws DataException {
-        int registeredNameCount = 0;
-        for (String sponseeAddress : sponsees) {
-            List<NameData> names = repository.getNameRepository().getNamesByOwner(sponseeAddress);
-            for (NameData name : names) {
-                if (name.getRegistered() < this.snapshotTimestampV3) {
-                    registeredNameCount++;
-                    break;
-                }
-            }
-        }
-        this.registeredNameCount = registeredNameCount;
-    }
-
-    private void findRecentSponsorshipCount() {
-        int recentSponsorshipCount = 0;
-        for (RewardShareTransactionData rewardShare : sponsorshipRewardShares) {
-            if (rewardShare.getTimestamp() >= this.snapshotTimestampV1) {
-                recentSponsorshipCount++;
-            }
-        }
-        this.recentSponsorshipCount = recentSponsorshipCount;
-    }
-
-    private int calculateScore() {
-        final int suspiciousMultiplier = (this.suspiciousCount >= 100) ? this.suspiciousPercent : 1;
-        final int nameMultiplier = (this.sponsees.size() >= 25 && this.registeredNameCount <= 1) ? 21 :
-            (this.sponsees.size() >= 15 && this.registeredNameCount <= 1) ? 11 :
-                (this.sponsees.size() >= 5 && this.registeredNameCount <= 1) ? 5 : 1;
-        final int consolidationMultiplier = Math.max(this.consolidationCount, 1);
-        final int bulkIssuanceMultiplier = Math.max(this.bulkIssuanceCount / 2, 1);
-        final int offset = 20;
-        return suspiciousMultiplier * nameMultiplier * consolidationMultiplier * bulkIssuanceMultiplier - offset;
-    }
-
-    private void fetchSponsorshipRewardShares() throws DataException {
-        List<RewardShareTransactionData> sponsorshipRewardShares = new ArrayList<>();
-
-        // Define relevant transactions
-        List<TransactionType> txTypes = List.of(TransactionType.REWARD_SHARE);
-        List<TransactionData> transactionDataList = fetchTransactions(repository, txTypes, this.address, false);
-        transactionDataList.removeIf(t -> t.getTimestamp() <= this.snapshotTimestampV1 || t.getTimestamp() >= this.snapshotTimestampV3);
-
-        for (TransactionData transactionData : transactionDataList) {
-            if (transactionData.getType() != TransactionType.REWARD_SHARE) {
-                continue;
-            }
-
-            RewardShareTransactionData rewardShareTransactionData = (RewardShareTransactionData) transactionData;
-
-            // Skip removals
-            if (rewardShareTransactionData.getSharePercent() < 0) {
-                continue;
-            }
-
-            // Skip if not sponsored by this account
-            if (!Arrays.equals(rewardShareTransactionData.getCreatorPublicKey(), accountData.getPublicKey())) {
-                continue;
-            }
-
-            // Skip self shares
-            if (Objects.equals(rewardShareTransactionData.getRecipient(), this.address)) {
-                continue;
-            }
-
-            boolean duplicateFound = false;
-            for (RewardShareTransactionData existingRewardShare : sponsorshipRewardShares) {
-                if (Objects.equals(existingRewardShare.getRecipient(), rewardShareTransactionData.getRecipient())) {
-                    // Duplicate
-                    duplicateFound = true;
-                    break;
-                }
-            }
-            if (!duplicateFound) {
-                sponsorshipRewardShares.add(rewardShareTransactionData);
-                this.sponsees.add(rewardShareTransactionData.getRecipient());
-            }
-        }
-
-        this.sponsorshipRewardShares = sponsorshipRewardShares;
-    }
-
-    private List<TransactionData> fetchTransferPrivsForAddress(String address) throws DataException {
-        return fetchTransactions(repository,
-                List.of(TransactionType.TRANSFER_PRIVS),
-                address, true);
-    }
-
-    private void fetchPaymentsForAddress(String address) throws DataException {
-        List<TransactionData> payments = fetchTransactions(repository,
-                Arrays.asList(TransactionType.PAYMENT, TransactionType.TRANSFER_ASSET),
-                address, false);
-        this.paymentsByAddress.put(address, payments);
-    }
-
-    private List<String> fetchOutgoingPaymentRecipientsForAddress(String address) {
-        List<String> outgoingPaymentRecipients = new ArrayList<>();
-
-        List<TransactionData> transactionDataList = this.paymentsByAddress.get(address);
-        if (transactionDataList == null) transactionDataList = new ArrayList<>();
-        transactionDataList.removeIf(t -> t.getTimestamp() <= this.snapshotTimestampV1 || t.getTimestamp() >= this.snapshotTimestampV3);
-        for (TransactionData transactionData : transactionDataList) {
-            switch (transactionData.getType()) {
-
-                case PAYMENT:
-                    PaymentTransactionData paymentTransactionData = (PaymentTransactionData) transactionData;
-                    if (!Objects.equals(paymentTransactionData.getRecipient(), address)) {
-                        // Outgoing payment from this account
-                        outgoingPaymentRecipients.add(paymentTransactionData.getRecipient());
-                    }
-                    break;
-
-                case TRANSFER_ASSET:
-                    TransferAssetTransactionData transferAssetTransactionData = (TransferAssetTransactionData) transactionData;
-                    if (transferAssetTransactionData.getAssetId() == Asset.QORT) {
-                        if (!Objects.equals(transferAssetTransactionData.getRecipient(), address)) {
-                            // Outgoing payment from this account
-                            outgoingPaymentRecipients.add(transferAssetTransactionData.getRecipient());
-                        }
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return outgoingPaymentRecipients;
-    }
-
-    private boolean hasZeroTransactions(String address) {
-        List<TransactionData> transactionDataList = this.paymentsByAddress.get(address);
-        if (transactionDataList == null) {
-            return true;
-        }
-        transactionDataList.removeIf(t -> t.getTimestamp() <= this.snapshotTimestampV1 || t.getTimestamp() >= this.snapshotTimestampV3);
-        return transactionDataList.isEmpty();
-    }
-
-    private static List<TransactionData> fetchTransactions(Repository repository, List<TransactionType> txTypes, String address, boolean reverse) throws DataException {
-        // Fetch all relevant transactions for this account
-        List<byte[]> signatures = repository.getTransactionRepository()
-                .getSignaturesMatchingCriteria(null, null, null, txTypes,
-                        null, null, address, TransactionsResource.ConfirmationStatus.CONFIRMED,
-                        null, null, reverse);
-
-        List<TransactionData> transactionDataList = new ArrayList<>();
-
-        for (byte[] signature : signatures) {
-            // Fetch transaction data
-            TransactionData transactionData = repository.getTransactionRepository().fromSignature(signature);
-            if (transactionData == null) {
-                continue;
-            }
-            transactionDataList.add(transactionData);
-        }
-
-        return transactionDataList;
-    }
-}

src/main/java/org/qortal/api/AmountTypeAdapter.java

@@ -1,9 +1,10 @@
 package org.qortal.api;
 
-import org.qortal.utils.Amounts;
+import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.math.BigDecimal;
+
+import org.qortal.utils.Amounts;
 
 public class AmountTypeAdapter extends XmlAdapter<String, Long> {
 

src/main/java/org/qortal/api/ApiError.java

@@ -1,12 +1,13 @@
 package org.qortal.api;
 
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Map;
-
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toMap;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlRootElement
@@ -78,7 +79,7 @@ public enum ApiError {
 	// BUYER_ALREADY_OWNER(411, 422),
 
 	// POLLS
-	POLL_NO_EXISTS(501, 404),
+	// POLL_NO_EXISTS(501, 404),
 	// POLL_ALREADY_EXISTS(502, 422),
 	// DUPLICATE_OPTION(503, 422),
 	// POLL_OPTION_NO_EXISTS(504, 404),
@@ -131,11 +132,7 @@ public enum ApiError {
 	FOREIGN_BLOCKCHAIN_TOO_SOON(1203, 408),
 
 	// Trade portal
-	ORDER_SIZE_TOO_SMALL(1300, 402),
-
-	// Data
-	FILE_NOT_FOUND(1401, 404),
-	NO_REPLY(1402, 404);
+	ORDER_SIZE_TOO_SMALL(1300, 402);
 
 	private static final Map<Integer, ApiError> map = stream(ApiError.values()).collect(toMap(apiError -> apiError.code, apiError -> apiError));
 

src/main/java/org/qortal/api/ApiErrorHandler.java

@@ -1,17 +1,18 @@
 package org.qortal.api;
 
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.qortal.settings.Settings;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
 public class ApiErrorHandler extends ErrorHandler {
 
 	private static final Logger LOGGER = LogManager.getLogger(ApiErrorHandler.class);

src/main/java/org/qortal/api/ApiExceptionFactory.java

@@ -1,9 +1,9 @@
 package org.qortal.api;
 
-import org.qortal.globalization.Translator;
-
 import javax.servlet.http.HttpServletRequest;
 
+import org.qortal.globalization.Translator;
+
 public enum ApiExceptionFactory {
 	INSTANCE;
 
@@ -16,8 +16,4 @@ public enum ApiExceptionFactory {
 		return createException(request, apiError, null);
 	}
 
-	public ApiException createCustomException(HttpServletRequest request, ApiError apiError, String message) {
-		return new ApiException(apiError.getStatus(), apiError.getCode(), message, null);
-	}
-
 }

src/main/java/org/qortal/api/ApiKey.java

@@ -1,107 +0,0 @@
-package org.qortal.api;
-
-import org.qortal.settings.Settings;
-import org.qortal.utils.Base58;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.SecureRandom;
-
-public class ApiKey {
-
-    private String apiKey;
-
-    public ApiKey() throws IOException {
-        this.load();
-    }
-
-    public void generate() throws IOException {
-        byte[] apiKey = new byte[16];
-        new SecureRandom().nextBytes(apiKey);
-        this.apiKey = Base58.encode(apiKey);
-
-        this.save();
-    }
-
-
-    /* Filesystem */
-
-    private Path getFilePath() {
-        return Paths.get(Settings.getInstance().getApiKeyPath(), "apikey.txt");
-    }
-
-    private boolean load() throws IOException {
-        Path path = this.getFilePath();
-        File apiKeyFile = new File(path.toString());
-        if (!apiKeyFile.exists()) {
-            // Try settings - to allow legacy API keys to be supported
-            return this.loadLegacyApiKey();
-        }
-
-        try {
-            this.apiKey = new String(Files.readAllBytes(path));
-
-        } catch (IOException e) {
-            throw new IOException(String.format("Couldn't read contents from file %s", path.toString()));
-        }
-
-        return true;
-    }
-
-    private boolean loadLegacyApiKey() {
-        String legacyApiKey = Settings.getInstance().getApiKey();
-        if (legacyApiKey != null && !legacyApiKey.isEmpty()) {
-            this.apiKey = Settings.getInstance().getApiKey();
-
-            try {
-                // Save it to the apikey file
-                this.save();
-            } catch (IOException e) {
-                // Ignore failures as it will be reloaded from settings next time
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public void save() throws IOException {
-        if (this.apiKey == null || this.apiKey.isEmpty()) {
-            throw new IllegalStateException("Unable to save a blank API key");
-        }
-
-        Path filePath = this.getFilePath();
-
-        BufferedWriter writer = new BufferedWriter(new FileWriter(filePath.toString()));
-        writer.write(this.apiKey);
-        writer.close();
-    }
-
-    public void delete() throws IOException {
-        this.apiKey = null;
-
-        Path filePath = this.getFilePath();
-        if (Files.exists(filePath)) {
-            Files.delete(filePath);
-        }
-    }
-
-
-    public boolean generated() {
-        return (this.apiKey != null);
-    }
-
-    public boolean exists() {
-        return this.getFilePath().toFile().exists();
-    }
-
-    @Override
-    public String toString() {
-        return this.apiKey;
-    }
-
-}

src/main/java/org/qortal/api/ApiRequest.java

@@ -1,24 +1,35 @@
 package org.qortal.api;
 
-import org.eclipse.persistence.exceptions.XMLMarshalException;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
-
-import javax.net.ssl.*;
-import javax.xml.bind.*;
-import javax.xml.transform.stream.StreamSource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSocket;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.UnmarshalException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.stream.StreamSource;
+
+import org.eclipse.persistence.exceptions.XMLMarshalException;
+import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+
 public class ApiRequest {
 
 	private static final Pattern proxyUrlPattern = Pattern.compile("(https://)([^@:/]+)@([0-9.]{7,15})(/.*)");
@@ -96,36 +107,6 @@ public class ApiRequest {
 		}
 	}
 
-	private static Marshaller createMarshaller(Class<?> objectClass) {
-		try {
-			// Create JAXB context aware of object's class
-			JAXBContext jc = JAXBContextFactory.createContext(new Class[] { objectClass }, null);
-
-			// Create marshaller
-			Marshaller marshaller = jc.createMarshaller();
-
-			// Set the marshaller media type to JSON
-			marshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
-
-			// Tell marshaller not to include JSON root element in the output
-			marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
-
-			return marshaller;
-		} catch (JAXBException e) {
-			throw new RuntimeException("Unable to create API marshaller", e);
-		}
-	}
-
-	public static void marshall(Writer writer, Object object) throws IOException {
-		Marshaller marshaller = createMarshaller(object.getClass());
-
-		try {
-			marshaller.marshal(object, writer);
-		} catch (JAXBException e) {
-			throw new IOException("Unable to create marshall object for API", e);
-		}
-	}
-
 	public static String getParamsString(Map<String, String> params) {
 		StringBuilder result = new StringBuilder();
 
@@ -141,7 +122,7 @@ public class ApiRequest {
 		}
 
 		String resultString = result.toString();
-		return !resultString.isEmpty() ? resultString.substring(0, resultString.length() - 1) : resultString;
+		return resultString.length() > 0 ? resultString.substring(0, resultString.length() - 1) : resultString;
 	}
 
 	/**

src/main/java/org/qortal/api/ApiService.java

@@ -1,10 +1,32 @@
 package org.qortal.api;
 
 import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
+
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.rewrite.handler.RedirectPatternRule;
 import org.eclipse.jetty.rewrite.handler.RewriteHandler;
-import org.eclipse.jetty.server.*;
+import org.eclipse.jetty.server.CustomRequestLog;
+import org.eclipse.jetty.server.DetectorConnectionFactory;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.RequestLogWriter;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.server.handler.InetAccessHandler;
 import org.eclipse.jetty.servlet.DefaultServlet;
@@ -17,35 +39,25 @@ import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.qortal.api.resource.AnnotationPostProcessor;
 import org.qortal.api.resource.ApiDefinition;
-import org.qortal.api.websocket.*;
-import org.qortal.network.Network;
+import org.qortal.api.websocket.ActiveChatsWebSocket;
+import org.qortal.api.websocket.AdminStatusWebSocket;
+import org.qortal.api.websocket.BlocksWebSocket;
+import org.qortal.api.websocket.ChatMessagesWebSocket;
+import org.qortal.api.websocket.PresenceWebSocket;
+import org.qortal.api.websocket.TradeBotWebSocket;
+import org.qortal.api.websocket.TradeOffersWebSocket;
 import org.qortal.settings.Settings;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.servlet.http.HttpServletRequest;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-
 public class ApiService {
 
 	private static ApiService instance;
 
 	private final ResourceConfig config;
 	private Server server;
-	private ApiKey apiKey;
-
-	public static final String API_VERSION_HEADER = "X-API-VERSION";
 
 	private ApiService() {
 		this.config = new ResourceConfig();
-		this.config.packages("org.qortal.api.resource", "org.qortal.api.restricted.resource");
+		this.config.packages("org.qortal.api.resource");
 		this.config.register(OpenApiResource.class);
 		this.config.register(ApiDefinition.class);
 		this.config.register(AnnotationPostProcessor.class);
@@ -62,15 +74,6 @@ public class ApiService {
 		return this.config.getClasses();
 	}
 
-	public void setApiKey(ApiKey apiKey) {
-		this.apiKey = apiKey;
-	}
-
-	public ApiKey getApiKey() {
-		return this.apiKey;
-	}
-
-
 	public void start() {
 		try {
 			// Create API server
@@ -85,7 +88,7 @@ public class ApiService {
 					throw new RuntimeException("Failed to start SSL API due to broken keystore");
 
 				// BouncyCastle-specific SSLContext build
-				SSLContext sslContext = SSLContext.getInstance("TLSv1.3", "BCJSSE");
+				SSLContext sslContext = SSLContext.getInstance("TLS", "BCJSSE");
 				KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX", "BCJSSE");
 
 				KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType(), "BC");
@@ -115,13 +118,13 @@ public class ApiService {
 				ServerConnector portUnifiedConnector = new ServerConnector(this.server,
 						new DetectorConnectionFactory(sslConnectionFactory),
 						httpConnectionFactory);
-				portUnifiedConnector.setHost(Network.getInstance().getBindAddress());
+				portUnifiedConnector.setHost(Settings.getInstance().getBindAddress());
 				portUnifiedConnector.setPort(Settings.getInstance().getApiPort());
 
 				this.server.addConnector(portUnifiedConnector);
 			} else {
 				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Network.getInstance().getBindAddress());
+				InetAddress bindAddr = InetAddress.getByName(Settings.getInstance().getBindAddress());
 				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getApiPort());
 				this.server = new Server(endpoint);
 			}
@@ -198,9 +201,6 @@ public class ApiService {
 			context.addServlet(ChatMessagesWebSocket.class, "/websockets/chat/messages");
 			context.addServlet(TradeOffersWebSocket.class, "/websockets/crosschain/tradeoffers");
 			context.addServlet(TradeBotWebSocket.class, "/websockets/crosschain/tradebot");
-			context.addServlet(TradePresenceWebSocket.class, "/websockets/crosschain/tradepresence");
-
-			// Deprecated
 			context.addServlet(PresenceWebSocket.class, "/websockets/presence");
 
 			// Start server
@@ -222,19 +222,4 @@ public class ApiService {
 		this.server = null;
 	}
 
-	public static int getApiVersion(HttpServletRequest request) {
-		// Get API version
-		String apiVersionString = request.getHeader(API_VERSION_HEADER);
-		if (apiVersionString == null) {
-			// Try query string - this is needed to avoid a CORS preflight. See: https://stackoverflow.com/a/43881141
-			apiVersionString = request.getParameter("apiVersion");
-		}
-
-		int apiVersion = 1;
-		if (apiVersionString != null) {
-			apiVersion = Integer.parseInt(apiVersionString);
-		}
-		return apiVersion;
-	}
-
 }

src/main/java/org/qortal/api/Base58TypeAdapter.java

@@ -1,9 +1,9 @@
 package org.qortal.api;
 
-import org.qortal.utils.Base58;
-
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
+import org.qortal.utils.Base58;
+
 public class Base58TypeAdapter extends XmlAdapter<String, byte[]> {
 
 	@Override

src/main/java/org/qortal/api/BigDecimalTypeAdapter.java

@@ -1,8 +1,9 @@
 package org.qortal.api;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.math.BigDecimal;
 
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 public class BigDecimalTypeAdapter extends XmlAdapter<String, BigDecimal> {
 
 	@Override

src/main/java/org/qortal/api/Constants.java

@@ -4,10 +4,8 @@ import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.responses.ApiResponse;
-
-import java.util.List;
-
 import static java.util.Arrays.asList;
+import java.util.List;
 
 class Constants {
 	public static final String APIERROR_CONTEXT_PATH = "/Api";

src/main/java/org/qortal/api/DevProxyService.java

@@ -1,173 +0,0 @@
-package org.qortal.api;
-
-import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.rewrite.handler.RewriteHandler;
-import org.eclipse.jetty.server.*;
-import org.eclipse.jetty.server.handler.ErrorHandler;
-import org.eclipse.jetty.server.handler.InetAccessHandler;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.qortal.api.resource.AnnotationPostProcessor;
-import org.qortal.api.resource.ApiDefinition;
-import org.qortal.network.Network;
-import org.qortal.repository.DataException;
-import org.qortal.settings.Settings;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-
-public class DevProxyService {
-
-	private static DevProxyService instance;
-
-	private final ResourceConfig config;
-	private Server server;
-
-	private DevProxyService() {
-		this.config = new ResourceConfig();
-		this.config.packages("org.qortal.api.proxy.resource", "org.qortal.api.resource");
-		this.config.register(OpenApiResource.class);
-		this.config.register(ApiDefinition.class);
-		this.config.register(AnnotationPostProcessor.class);
-	}
-
-	public static DevProxyService getInstance() {
-		if (instance == null)
-			instance = new DevProxyService();
-
-		return instance;
-	}
-
-	public Iterable<Class<?>> getResources() {
-		return this.config.getClasses();
-	}
-
-	public void start() throws DataException {
-		try {
-			// Create API server
-
-			// SSL support if requested
-			String keystorePathname = Settings.getInstance().getSslKeystorePathname();
-			String keystorePassword = Settings.getInstance().getSslKeystorePassword();
-
-			if (keystorePathname != null && keystorePassword != null) {
-				// SSL version
-				if (!Files.isReadable(Path.of(keystorePathname)))
-					throw new RuntimeException("Failed to start SSL API due to broken keystore");
-
-				// BouncyCastle-specific SSLContext build
-				SSLContext sslContext = SSLContext.getInstance("TLS", "BCJSSE");
-				KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX", "BCJSSE");
-
-				KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType(), "BC");
-
-				try (InputStream keystoreStream = Files.newInputStream(Paths.get(keystorePathname))) {
-					keyStore.load(keystoreStream, keystorePassword.toCharArray());
-				}
-
-				keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
-				sslContext.init(keyManagerFactory.getKeyManagers(), null, new SecureRandom());
-
-				SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
-				sslContextFactory.setSslContext(sslContext);
-
-				this.server = new Server();
-
-				HttpConfiguration httpConfig = new HttpConfiguration();
-				httpConfig.setSecureScheme("https");
-				httpConfig.setSecurePort(Settings.getInstance().getDevProxyPort());
-
-				SecureRequestCustomizer src = new SecureRequestCustomizer();
-				httpConfig.addCustomizer(src);
-
-				HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(httpConfig);
-				SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString());
-
-				ServerConnector portUnifiedConnector = new ServerConnector(this.server,
-						new DetectorConnectionFactory(sslConnectionFactory),
-						httpConnectionFactory);
-				portUnifiedConnector.setHost(Network.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getDevProxyPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Network.getInstance().getBindAddress());
-				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getDevProxyPort());
-				this.server = new Server(endpoint);
-			}
-
-			// Error handler
-			ErrorHandler errorHandler = new ApiErrorHandler();
-			this.server.setErrorHandler(errorHandler);
-
-			// Request logging
-			if (Settings.getInstance().isDevProxyLoggingEnabled()) {
-				RequestLogWriter logWriter = new RequestLogWriter("devproxy-requests.log");
-				logWriter.setAppend(true);
-				logWriter.setTimeZone("UTC");
-				RequestLog requestLog = new CustomRequestLog(logWriter, CustomRequestLog.EXTENDED_NCSA_FORMAT);
-				this.server.setRequestLog(requestLog);
-			}
-
-			// Access handler (currently no whitelist is used)
-			InetAccessHandler accessHandler = new InetAccessHandler();
-			this.server.setHandler(accessHandler);
-
-			// URL rewriting
-			RewriteHandler rewriteHandler = new RewriteHandler();
-			accessHandler.setHandler(rewriteHandler);
-
-			// Context
-			ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-			context.setContextPath("/");
-			rewriteHandler.setHandler(context);
-
-			// Cross-origin resource sharing
-			FilterHolder corsFilterHolder = new FilterHolder(CrossOriginFilter.class);
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_ORIGINS_PARAM, "*");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_METHODS_PARAM, "GET, POST, DELETE");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.CHAIN_PREFLIGHT_PARAM, "false");
-			context.addFilter(corsFilterHolder, "/*", null);
-
-			// API servlet
-			ServletContainer container = new ServletContainer(this.config);
-			ServletHolder apiServlet = new ServletHolder(container);
-			apiServlet.setInitOrder(1);
-			context.addServlet(apiServlet, "/*");
-
-			// Start server
-			this.server.start();
-		} catch (Exception e) {
-			// Failed to start
-			throw new DataException("Failed to start developer proxy", e);
-		}
-	}
-
-	public void stop() {
-		try {
-			// Stop server
-			this.server.stop();
-		} catch (Exception e) {
-			// Failed to stop
-		}
-
-		this.server = null;
-		instance = null;
-	}
-
-}

src/main/java/org/qortal/api/DomainMapService.java

@@ -1,171 +0,0 @@
-package org.qortal.api;
-
-import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.rewrite.handler.RewriteHandler;
-import org.eclipse.jetty.server.*;
-import org.eclipse.jetty.server.handler.ErrorHandler;
-import org.eclipse.jetty.server.handler.InetAccessHandler;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.qortal.api.resource.AnnotationPostProcessor;
-import org.qortal.api.resource.ApiDefinition;
-import org.qortal.network.Network;
-import org.qortal.settings.Settings;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-
-public class DomainMapService {
-
-	private static DomainMapService instance;
-
-	private final ResourceConfig config;
-	private Server server;
-
-	private DomainMapService() {
-		this.config = new ResourceConfig();
-		this.config.packages("org.qortal.api.resource", "org.qortal.api.domainmap.resource");
-		this.config.register(OpenApiResource.class);
-		this.config.register(ApiDefinition.class);
-		this.config.register(AnnotationPostProcessor.class);
-	}
-
-	public static DomainMapService getInstance() {
-		if (instance == null)
-			instance = new DomainMapService();
-
-		return instance;
-	}
-
-	public Iterable<Class<?>> getResources() {
-		return this.config.getClasses();
-	}
-
-	public void start() {
-		try {
-			// Create API server
-
-			// SSL support if requested
-			String keystorePathname = Settings.getInstance().getSslKeystorePathname();
-			String keystorePassword = Settings.getInstance().getSslKeystorePassword();
-
-			if (keystorePathname != null && keystorePassword != null) {
-				// SSL version
-				if (!Files.isReadable(Path.of(keystorePathname)))
-					throw new RuntimeException("Failed to start SSL API due to broken keystore");
-
-				// BouncyCastle-specific SSLContext build
-				SSLContext sslContext = SSLContext.getInstance("TLSv1.3", "BCJSSE");
-				KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX", "BCJSSE");
-
-				KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType(), "BC");
-
-				try (InputStream keystoreStream = Files.newInputStream(Paths.get(keystorePathname))) {
-					keyStore.load(keystoreStream, keystorePassword.toCharArray());
-				}
-
-				keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
-				sslContext.init(keyManagerFactory.getKeyManagers(), null, new SecureRandom());
-
-				SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
-				sslContextFactory.setSslContext(sslContext);
-
-				this.server = new Server();
-
-				HttpConfiguration httpConfig = new HttpConfiguration();
-				httpConfig.setSecureScheme("https");
-				httpConfig.setSecurePort(Settings.getInstance().getDomainMapPort());
-
-				SecureRequestCustomizer src = new SecureRequestCustomizer();
-				httpConfig.addCustomizer(src);
-
-				HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(httpConfig);
-				SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString());
-
-				ServerConnector portUnifiedConnector = new ServerConnector(this.server,
-						new DetectorConnectionFactory(sslConnectionFactory),
-						httpConnectionFactory);
-				portUnifiedConnector.setHost(Network.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getDomainMapPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Network.getInstance().getBindAddress());
-				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getDomainMapPort());
-				this.server = new Server(endpoint);
-			}
-
-			// Error handler
-			ErrorHandler errorHandler = new ApiErrorHandler();
-			this.server.setErrorHandler(errorHandler);
-
-			// Request logging
-			if (Settings.getInstance().isDomainMapLoggingEnabled()) {
-				RequestLogWriter logWriter = new RequestLogWriter("domainmap-requests.log");
-				logWriter.setAppend(true);
-				logWriter.setTimeZone("UTC");
-				RequestLog requestLog = new CustomRequestLog(logWriter, CustomRequestLog.EXTENDED_NCSA_FORMAT);
-				this.server.setRequestLog(requestLog);
-			}
-
-			// Access handler (currently no whitelist is used)
-			InetAccessHandler accessHandler = new InetAccessHandler();
-			this.server.setHandler(accessHandler);
-
-			// URL rewriting
-			RewriteHandler rewriteHandler = new RewriteHandler();
-			accessHandler.setHandler(rewriteHandler);
-
-			// Context
-			ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-			context.setContextPath("/");
-			rewriteHandler.setHandler(context);
-
-			// Cross-origin resource sharing
-			FilterHolder corsFilterHolder = new FilterHolder(CrossOriginFilter.class);
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_ORIGINS_PARAM, "*");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_METHODS_PARAM, "GET, POST, DELETE");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.CHAIN_PREFLIGHT_PARAM, "false");
-			context.addFilter(corsFilterHolder, "/*", null);
-
-			// API servlet
-			ServletContainer container = new ServletContainer(this.config);
-			ServletHolder apiServlet = new ServletHolder(container);
-			apiServlet.setInitOrder(1);
-			context.addServlet(apiServlet, "/*");
-
-			// Start server
-			this.server.start();
-		} catch (Exception e) {
-			// Failed to start
-			throw new RuntimeException("Failed to start API", e);
-		}
-	}
-
-	public void stop() {
-		try {
-			// Stop server
-			this.server.stop();
-		} catch (Exception e) {
-			// Failed to stop
-		}
-
-		this.server = null;
-	}
-
-}

src/main/java/org/qortal/api/GatewayService.java

@@ -1,171 +0,0 @@
-package org.qortal.api;
-
-import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.rewrite.handler.RewriteHandler;
-import org.eclipse.jetty.server.*;
-import org.eclipse.jetty.server.handler.ErrorHandler;
-import org.eclipse.jetty.server.handler.InetAccessHandler;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.qortal.api.resource.AnnotationPostProcessor;
-import org.qortal.api.resource.ApiDefinition;
-import org.qortal.network.Network;
-import org.qortal.settings.Settings;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-
-public class GatewayService {
-
-	private static GatewayService instance;
-
-	private final ResourceConfig config;
-	private Server server;
-
-	private GatewayService() {
-		this.config = new ResourceConfig();
-		this.config.packages("org.qortal.api.resource", "org.qortal.api.gateway.resource");
-		this.config.register(OpenApiResource.class);
-		this.config.register(ApiDefinition.class);
-		this.config.register(AnnotationPostProcessor.class);
-	}
-
-	public static GatewayService getInstance() {
-		if (instance == null)
-			instance = new GatewayService();
-
-		return instance;
-	}
-
-	public Iterable<Class<?>> getResources() {
-		return this.config.getClasses();
-	}
-
-	public void start() {
-		try {
-			// Create API server
-
-			// SSL support if requested
-			String keystorePathname = Settings.getInstance().getSslKeystorePathname();
-			String keystorePassword = Settings.getInstance().getSslKeystorePassword();
-
-			if (keystorePathname != null && keystorePassword != null) {
-				// SSL version
-				if (!Files.isReadable(Path.of(keystorePathname)))
-					throw new RuntimeException("Failed to start SSL API due to broken keystore");
-
-				// BouncyCastle-specific SSLContext build
-				SSLContext sslContext = SSLContext.getInstance("TLSv1.3", "BCJSSE");
-				KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX", "BCJSSE");
-
-				KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType(), "BC");
-
-				try (InputStream keystoreStream = Files.newInputStream(Paths.get(keystorePathname))) {
-					keyStore.load(keystoreStream, keystorePassword.toCharArray());
-				}
-
-				keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
-				sslContext.init(keyManagerFactory.getKeyManagers(), null, new SecureRandom());
-
-				SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
-				sslContextFactory.setSslContext(sslContext);
-
-				this.server = new Server();
-
-				HttpConfiguration httpConfig = new HttpConfiguration();
-				httpConfig.setSecureScheme("https");
-				httpConfig.setSecurePort(Settings.getInstance().getGatewayPort());
-
-				SecureRequestCustomizer src = new SecureRequestCustomizer();
-				httpConfig.addCustomizer(src);
-
-				HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(httpConfig);
-				SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString());
-
-				ServerConnector portUnifiedConnector = new ServerConnector(this.server,
-						new DetectorConnectionFactory(sslConnectionFactory),
-						httpConnectionFactory);
-				portUnifiedConnector.setHost(Network.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getGatewayPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Network.getInstance().getBindAddress());
-				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getGatewayPort());
-				this.server = new Server(endpoint);
-			}
-
-			// Error handler
-			ErrorHandler errorHandler = new ApiErrorHandler();
-			this.server.setErrorHandler(errorHandler);
-
-			// Request logging
-			if (Settings.getInstance().isGatewayLoggingEnabled()) {
-				RequestLogWriter logWriter = new RequestLogWriter("gateway-requests.log");
-				logWriter.setAppend(true);
-				logWriter.setTimeZone("UTC");
-				RequestLog requestLog = new CustomRequestLog(logWriter, CustomRequestLog.EXTENDED_NCSA_FORMAT);
-				this.server.setRequestLog(requestLog);
-			}
-
-			// Access handler (currently no whitelist is used)
-			InetAccessHandler accessHandler = new InetAccessHandler();
-			this.server.setHandler(accessHandler);
-
-			// URL rewriting
-			RewriteHandler rewriteHandler = new RewriteHandler();
-			accessHandler.setHandler(rewriteHandler);
-
-			// Context
-			ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-			context.setContextPath("/");
-			rewriteHandler.setHandler(context);
-
-			// Cross-origin resource sharing
-			FilterHolder corsFilterHolder = new FilterHolder(CrossOriginFilter.class);
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_ORIGINS_PARAM, "*");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.ALLOWED_METHODS_PARAM, "GET, POST, DELETE");
-			corsFilterHolder.setInitParameter(CrossOriginFilter.CHAIN_PREFLIGHT_PARAM, "false");
-			context.addFilter(corsFilterHolder, "/*", null);
-
-			// API servlet
-			ServletContainer container = new ServletContainer(this.config);
-			ServletHolder apiServlet = new ServletHolder(container);
-			apiServlet.setInitOrder(1);
-			context.addServlet(apiServlet, "/*");
-
-			// Start server
-			this.server.start();
-		} catch (Exception e) {
-			// Failed to start
-			throw new RuntimeException("Failed to start API", e);
-		}
-	}
-
-	public void stop() {
-		try {
-			// Stop server
-			this.server.stop();
-		} catch (Exception e) {
-			// Failed to stop
-		}
-
-		this.server = null;
-	}
-
-}

src/main/java/org/qortal/api/HTMLParser.java

@@ -1,94 +0,0 @@
-package org.qortal.api;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
-import org.qortal.arbitrary.misc.Service;
-
-import java.util.Objects;
-
-public class HTMLParser {
-
-    private static final Logger LOGGER = LogManager.getLogger(HTMLParser.class);
-
-    private String qdnBase;
-    private String qdnBaseWithPath;
-    private byte[] data;
-    private String qdnContext;
-    private String resourceId;
-    private Service service;
-    private String identifier;
-    private String path;
-    private String theme;
-    private boolean usingCustomRouting;
-
-    public HTMLParser(String resourceId, String inPath, String prefix, boolean includeResourceIdInPrefix, byte[] data,
-                      String qdnContext, Service service, String identifier, String theme, boolean usingCustomRouting) {
-        String inPathWithoutFilename = inPath.contains("/") ? inPath.substring(0, inPath.lastIndexOf('/')) : String.format("/%s",inPath);
-        this.qdnBase = includeResourceIdInPrefix ? String.format("%s/%s", prefix, resourceId) : prefix;
-        this.qdnBaseWithPath = includeResourceIdInPrefix ? String.format("%s/%s%s", prefix, resourceId, inPathWithoutFilename) : String.format("%s%s", prefix, inPathWithoutFilename);
-        this.data = data;
-        this.qdnContext = qdnContext;
-        this.resourceId = resourceId;
-        this.service = service;
-        this.identifier = identifier;
-        this.path = inPath;
-        this.theme = theme;
-        this.usingCustomRouting = usingCustomRouting;
-    }
-
-    public void addAdditionalHeaderTags() {
-        String fileContents = new String(data);
-        Document document = Jsoup.parse(fileContents);
-        Elements head = document.getElementsByTag("head");
-        if (!head.isEmpty()) {
-            // Add q-apps script tag
-            String qAppsScriptElement = String.format("<script src=\"/apps/q-apps.js?time=%d\">", System.currentTimeMillis());
-            head.get(0).prepend(qAppsScriptElement);
-
-            // Add q-apps gateway script tag if in gateway mode
-            if (Objects.equals(this.qdnContext, "gateway")) {
-                String qAppsGatewayScriptElement = String.format("<script src=\"/apps/q-apps-gateway.js?time=%d\">", System.currentTimeMillis());
-                head.get(0).prepend(qAppsGatewayScriptElement);
-            }
-
-            // Escape and add vars
-            String qdnContext = this.qdnContext != null ? this.qdnContext.replace("\\", "").replace("\"","\\\"") : "";
-            String service = this.service.toString().replace("\\", "").replace("\"","\\\"");
-            String name = this.resourceId != null ? this.resourceId.replace("\\", "").replace("\"","\\\"") : "";
-            String identifier = this.identifier != null ? this.identifier.replace("\\", "").replace("\"","\\\"") : "";
-            String path = this.path != null ? this.path.replace("\\", "").replace("\"","\\\"") : "";
-            String theme = this.theme != null ? this.theme.replace("\\", "").replace("\"","\\\"") : "";
-            String qdnBase = this.qdnBase != null ? this.qdnBase.replace("\\", "").replace("\"","\\\"") : "";
-            String qdnBaseWithPath = this.qdnBaseWithPath != null ? this.qdnBaseWithPath.replace("\\", "").replace("\"","\\\"") : "";
-            String qdnContextVar = String.format("<script>var _qdnContext=\"%s\"; var _qdnTheme=\"%s\"; var _qdnService=\"%s\"; var _qdnName=\"%s\"; var _qdnIdentifier=\"%s\"; var _qdnPath=\"%s\"; var _qdnBase=\"%s\"; var _qdnBaseWithPath=\"%s\";</script>", qdnContext, theme, service, name, identifier, path, qdnBase, qdnBaseWithPath);
-            head.get(0).prepend(qdnContextVar);
-
-            // Add base href tag
-            // Exclude the path if this request was routed back to the index automatically
-            String baseHref = this.usingCustomRouting ? this.qdnBase : this.qdnBaseWithPath;
-            String baseElement = String.format("<base href=\"%s/\">", baseHref);
-            head.get(0).prepend(baseElement);
-
-            // Add meta charset tag
-            String metaCharsetElement = "<meta charset=\"UTF-8\">";
-            head.get(0).prepend(metaCharsetElement);
-
-        }
-        String html = document.html();
-        this.data = html.getBytes();
-    }
-
-    public static boolean isHtmlFile(String path) {
-        if (path.endsWith(".html") || path.endsWith(".htm") || path.isEmpty()) {
-            return true;
-        }
-        return false;
-    }
-
-    public byte[] getData() {
-        return this.data;
-    }
-}

src/main/java/org/qortal/api/RewardSharePercentTypeAdapter.java

@@ -1,8 +1,9 @@
 package org.qortal.api;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.math.BigDecimal;
 
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 public class RewardSharePercentTypeAdapter extends XmlAdapter<String, Integer> {
 
 	@Override

src/main/java/org/qortal/api/SearchMode.java

@@ -1,6 +0,0 @@
-package org.qortal.api;
-
-public enum SearchMode {
-    LATEST,
-    ALL
-}

src/main/java/org/qortal/api/Security.java

@@ -1,127 +1,33 @@
 package org.qortal.api;
 
-import org.qortal.arbitrary.ArbitraryDataResource;
-import org.qortal.arbitrary.misc.Service;
-import org.qortal.controller.arbitrary.ArbitraryDataRenderManager;
-import org.qortal.settings.Settings;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.qortal.settings.Settings;
+
 public abstract class Security {
 
 	public static final String API_KEY_HEADER = "X-API-KEY";
 
-	/**
-	 * Check API call is allowed, retrieving the API key from the request header or GET/POST parameters where required
-	 * @param request
-	 */
 	public static void checkApiCallAllowed(HttpServletRequest request) {
-		checkApiCallAllowed(request, null);
-	}
+		String expectedApiKey = Settings.getInstance().getApiKey();
+		String passedApiKey = request.getHeader(API_KEY_HEADER);
 
-	/**
-	 * Check API call is allowed, retrieving the API key first from the passedApiKey parameter, with a fallback
-	 * to the request header or GET/POST parameters when null.
-	 * @param request
-	 * @param passedApiKey - the API key to test, or null if it should be retrieved from the request headers.
-	 */
-	public static void checkApiCallAllowed(HttpServletRequest request, String passedApiKey) {
-		// We may want to allow automatic authentication for local requests, if enabled in settings
-		boolean localAuthBypassEnabled = Settings.getInstance().isLocalAuthBypassEnabled();
-		if (localAuthBypassEnabled) {
-			try {
-				InetAddress remoteAddr = InetAddress.getByName(request.getRemoteAddr());
-				if (remoteAddr.isLoopbackAddress()) {
-					// Request originates from loopback address, so allow it
-					return;
-				}
-			} catch (UnknownHostException e) {
-				// Ignore failure, and fallback to API key authentication
-			}
-		}
+		if ((expectedApiKey != null && !expectedApiKey.equals(passedApiKey)) ||
+				(passedApiKey != null && !passedApiKey.equals(expectedApiKey)))
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.UNAUTHORIZED);
 
-		// Retrieve the API key
-		ApiKey apiKey = Security.getApiKey(request);
-		if (!apiKey.generated()) {
-			// Not generated an API key yet, so disallow sensitive API calls
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "API key not generated");
-		}
-
-		// We require an API key to be passed
-		if (passedApiKey == null) {
-			// API call not passed as a parameter, so try the header
-			passedApiKey = request.getHeader(API_KEY_HEADER);
-		}
-		if (passedApiKey == null) {
-			// Try query string - this is needed to avoid a CORS preflight. See: https://stackoverflow.com/a/43881141
-			passedApiKey = request.getParameter("apiKey");
-		}
-		if (passedApiKey == null) {
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "Missing 'X-API-KEY' header");
-		}
-
-		// The API keys must match
-		if (!apiKey.toString().equals(passedApiKey)) {
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "API key invalid");
-		}
-	}
-
-	public static void disallowLoopbackRequests(HttpServletRequest request) {
+		InetAddress remoteAddr;
 		try {
-			InetAddress remoteAddr = InetAddress.getByName(request.getRemoteAddr());
-			if (remoteAddr.isLoopbackAddress() && !Settings.getInstance().isGatewayLoopbackEnabled()) {
-				throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "Local requests not allowed");
-			}
+			remoteAddr = InetAddress.getByName(request.getRemoteAddr());
 		} catch (UnknownHostException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.UNAUTHORIZED);
 		}
-	}
 
-	public static void disallowLoopbackRequestsIfAuthBypassEnabled(HttpServletRequest request) {
-		if (Settings.getInstance().isLocalAuthBypassEnabled()) {
-			try {
-				InetAddress remoteAddr = InetAddress.getByName(request.getRemoteAddr());
-				if (remoteAddr.isLoopbackAddress()) {
-					throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "Local requests not allowed when localAuthBypassEnabled is enabled in settings");
-				}
-			} catch (UnknownHostException e) {
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.UNAUTHORIZED);
-			}
-		}
-	}
-
-	public static void requirePriorAuthorization(HttpServletRequest request, String resourceId, Service service, String identifier) {
-		ArbitraryDataResource resource = new ArbitraryDataResource(resourceId, null, service, identifier);
-		if (!ArbitraryDataRenderManager.getInstance().isAuthorized(resource)) {
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "Call /render/authorize first");
-		}
-	}
-
-	public static void requirePriorAuthorizationOrApiKey(HttpServletRequest request, String resourceId, Service service, String identifier, String apiKey) {
-		try {
-			Security.checkApiCallAllowed(request, apiKey);
-
-		} catch (ApiException e) {
-			// API call wasn't allowed, but maybe it was pre-authorized
-			Security.requirePriorAuthorization(request, resourceId, service, identifier);
-		}
-	}
-
-	public static ApiKey getApiKey(HttpServletRequest request) {
-		ApiKey apiKey = ApiService.getInstance().getApiKey();
-		if (apiKey == null) {
-			try {
-				apiKey = new ApiKey();
-			} catch (IOException e) {
-				// Couldn't load API key - so we need to treat it as not generated, and therefore unauthorized
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.UNAUTHORIZED);
-			}
-			ApiService.getInstance().setApiKey(apiKey);
-		}
-		return apiKey;
+		if (!remoteAddr.isLoopbackAddress())
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.UNAUTHORIZED);
 	}
 
 }

src/main/java/org/qortal/api/TransactionCountMapXmlAdapter.java

@@ -1,17 +1,18 @@
 package org.qortal.api;
 
-import org.eclipse.persistence.oxm.annotations.XmlVariableNode;
-import org.qortal.transaction.Transaction.TransactionType;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+import org.eclipse.persistence.oxm.annotations.XmlVariableNode;
+import org.qortal.transaction.Transaction.TransactionType;
+
 public class TransactionCountMapXmlAdapter extends XmlAdapter<TransactionCountMapXmlAdapter.StringIntegerMap, Map<TransactionType, Integer>> {
 
 	public static class StringIntegerMap {

src/main/java/org/qortal/api/domainmap/resource/DomainMapResource.java

@@ -1,58 +0,0 @@
-package org.qortal.api.domainmap.resource;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
-import org.qortal.arbitrary.ArbitraryDataRenderer;
-import org.qortal.arbitrary.misc.Service;
-import org.qortal.settings.Settings;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import java.util.Map;
-
-
-@Path("/")
-@Tag(name = "Domain Map")
-public class DomainMapResource {
-
-    @Context HttpServletRequest request;
-    @Context HttpServletResponse response;
-    @Context ServletContext context;
-
-
-    @GET
-    public HttpServletResponse getIndexByDomainMap() {
-        return this.getDomainMap("/");
-    }
-
-    @GET
-    @Path("{path:.*}")
-    public HttpServletResponse getPathByDomainMap(@PathParam("path") String inPath) {
-        return this.getDomainMap(inPath);
-    }
-
-    private HttpServletResponse getDomainMap(String inPath) {
-        Map<String, String> domainMap = Settings.getInstance().getSimpleDomainMap();
-        if (domainMap != null && domainMap.containsKey(request.getServerName())) {
-            // Build synchronously, so that we don't need to make the summary API endpoints available over
-            // the domain map server. This means that there will be no loading screen, but this is potentially
-            // preferred in this situation anyway (e.g. to avoid confusing search engine robots).
-            return this.get(domainMap.get(request.getServerName()), ResourceIdType.NAME, Service.WEBSITE, null, inPath, null, "", false, false);
-        }
-        return ArbitraryDataRenderer.getResponse(response, 404, "Error 404: File Not Found");
-    }
-
-    private HttpServletResponse get(String resourceId, ResourceIdType resourceIdType, Service service, String identifier,
-                                    String inPath, String secret58, String prefix, boolean includeResourceIdInPrefix, boolean async) {
-
-        ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(resourceId, resourceIdType, service, identifier, inPath,
-                secret58, prefix, includeResourceIdInPrefix, async, "domainMap", request, response, context);
-        return renderer.render();
-    }
-
-}

src/main/java/org/qortal/api/gateway/resource/GatewayResource.java

@@ -1,152 +0,0 @@
-package org.qortal.api.gateway.resource;
-
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.lang3.StringUtils;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.arbitrary.ArbitraryDataFile;
-import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
-import org.qortal.arbitrary.ArbitraryDataReader;
-import org.qortal.arbitrary.ArbitraryDataRenderer;
-import org.qortal.arbitrary.ArbitraryDataResource;
-import org.qortal.arbitrary.misc.Service;
-import org.qortal.data.arbitrary.ArbitraryResourceStatus;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-
-@Path("/")
-@Tag(name = "Gateway")
-public class GatewayResource {
-
-    @Context HttpServletRequest request;
-    @Context HttpServletResponse response;
-    @Context ServletContext context;
-
-    private ArbitraryResourceStatus getStatus(Service service, String name, String identifier, Boolean build) {
-
-        // If "build=true" has been specified in the query string, build the resource before returning its status
-        if (build != null && build) {
-            try {
-                ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, null);
-                if (!reader.isBuilding()) {
-                    reader.loadSynchronously(false);
-                }
-            } catch (Exception e) {
-                // No need to handle exception, as it will be reflected in the status
-            }
-        }
-
-        try (final Repository repository = RepositoryManager.getRepository()) {
-            ArbitraryDataResource resource = new ArbitraryDataResource(name, ResourceIdType.NAME, service, identifier);
-            return resource.getStatus(repository);
-
-        } catch (DataException e) {
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-        }
-    }
-
-
-    @GET
-    public HttpServletResponse getRoot() {
-        return ArbitraryDataRenderer.getResponse(response, 200, "");
-    }
-
-
-    @GET
-    @Path("{path:.*}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getPath(@PathParam("path") String inPath) {
-        // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
-        Security.disallowLoopbackRequests(request);
-        return this.parsePath(inPath, "gateway", null, true, true);
-    }
-
-    
-    private HttpServletResponse parsePath(String inPath, String qdnContext, String secret58, boolean includeResourceIdInPrefix, boolean async) {
-
-        if (inPath == null || inPath.isEmpty()) {
-            // Assume not a real file
-            return ArbitraryDataRenderer.getResponse(response, 404, "Error 404: File Not Found");
-        }
-
-        // Default service is WEBSITE
-        Service service = Service.WEBSITE;
-        String name = null;
-        String identifier = null;
-        String outPath = "";
-        List<String> prefixParts = new ArrayList<>();
-
-        if (!inPath.contains("/")) {
-            // Assume entire inPath is a registered name
-            name = inPath;
-        }
-        else {
-            // Parse the path to determine what we need to load
-            List<String> parts = new LinkedList<>(Arrays.asList(inPath.split("/")));
-
-            // Check if the first element is a service
-            try {
-                Service parsedService = Service.valueOf(parts.get(0).toUpperCase());
-                if (parsedService != null) {
-                    // First element matches a service, so we can assume it is one
-                    service = parsedService;
-                    parts.remove(0);
-                    prefixParts.add(service.name());
-                }
-            } catch (IllegalArgumentException e) {
-                // Not a service
-            }
-
-            if (parts.isEmpty()) {
-                // We need more than just a service
-                return ArbitraryDataRenderer.getResponse(response, 404, "Error 404: File Not Found");
-            }
-
-            // Service is removed, so assume first element is now a registered name
-            name = parts.get(0);
-            parts.remove(0);
-
-            if (!parts.isEmpty()) {
-                // Name is removed, so check if the first element is now an identifier
-                ArbitraryResourceStatus status = this.getStatus(service, name, parts.get(0), false);
-                if (status.getTotalChunkCount() > 0) {
-                    // Matched service, name and identifier combination - so assume this is an identifier and can be removed
-                    identifier = parts.get(0);
-                    parts.remove(0);
-                    prefixParts.add(identifier);
-                }
-            }
-
-            if (!parts.isEmpty()) {
-                // outPath can be built by combining any remaining parts
-                outPath = String.join("/", parts);
-            }
-        }
-
-        String prefix = StringUtils.join(prefixParts, "/");
-        if (prefix != null && !prefix.isEmpty()) {
-            prefix = "/" + prefix;
-        }
-
-        ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(name, ResourceIdType.NAME, service, identifier, outPath,
-                secret58, prefix, includeResourceIdInPrefix, async, qdnContext, request, response, context);
-        return renderer.render();
-    }
-
-}

src/main/java/org/qortal/api/model/AccountPenaltyStats.java

@@ -1,54 +0,0 @@
-package org.qortal.api.model;
-
-import org.qortal.block.SelfSponsorshipAlgoV1Block;
-import org.qortal.data.account.AccountData;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.util.ArrayList;
-import java.util.List;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class AccountPenaltyStats {
-
-	public Integer totalPenalties;
-	public Integer maxPenalty;
-	public Integer minPenalty;
-	public String penaltyHash;
-
-	protected AccountPenaltyStats() {
-	}
-
-	public AccountPenaltyStats(Integer totalPenalties, Integer maxPenalty, Integer minPenalty, String penaltyHash) {
-		this.totalPenalties = totalPenalties;
-		this.maxPenalty = maxPenalty;
-		this.minPenalty = minPenalty;
-		this.penaltyHash = penaltyHash;
-	}
-
-	public static AccountPenaltyStats fromAccounts(List<AccountData> accounts) {
-		int totalPenalties = 0;
-		Integer maxPenalty = null;
-		Integer minPenalty = null;
-
-		List<String> addresses = new ArrayList<>();
-		for (AccountData accountData : accounts) {
-			int penalty = accountData.getBlocksMintedPenalty();
-			addresses.add(accountData.getAddress());
-			totalPenalties++;
-
-			// Penalties are expressed as a negative number, so the min and the max are reversed here
-			if (maxPenalty == null || penalty < maxPenalty) maxPenalty = penalty;
-			if (minPenalty == null || penalty > minPenalty) minPenalty = penalty;
-		}
-
-		String penaltyHash = SelfSponsorshipAlgoV1Block.getHash(addresses);
-		return new AccountPenaltyStats(totalPenalties, maxPenalty, minPenalty, penaltyHash);
-	}
-
-
-	@Override
-	public String toString() {
-		return String.format("totalPenalties: %d, maxPenalty: %d, minPenalty: %d, penaltyHash: %s", totalPenalties, maxPenalty, minPenalty, penaltyHash == null ? "null" : penaltyHash);
-	}
-}

src/main/java/org/qortal/api/model/ActivitySummary.java

@@ -1,14 +1,15 @@
 package org.qortal.api.model;
 
-import org.qortal.api.TransactionCountMapXmlAdapter;
-import org.qortal.transaction.Transaction.TransactionType;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.Map;
+
+import org.qortal.api.TransactionCountMapXmlAdapter;
+import org.qortal.transaction.Transaction.TransactionType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ActivitySummary {

src/main/java/org/qortal/api/model/AddressListRequest.java

@@ -7,12 +7,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import java.util.List;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ListRequest {
+public class AddressListRequest {
 
-	@Schema(description = "A list of items")
-	public List<String> items;
+	@Schema(description = "A list of addresses")
+	public List<String> addresses;
 
-	public ListRequest() {
+	public AddressListRequest() {
 	}
 
 }

src/main/java/org/qortal/api/model/AggregatedOrder.java

@@ -1,13 +1,13 @@
 package org.qortal.api.model;
 
-import org.qortal.data.asset.OrderData;
-
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.qortal.data.asset.OrderData;
+
 @XmlAccessorType(XmlAccessType.NONE)
 public class AggregatedOrder {
 

src/main/java/org/qortal/api/model/ApiOnlineAccount.java

@@ -1,13 +1,7 @@
 package org.qortal.api.model;
 
-import org.qortal.account.Account;
-import org.qortal.repository.DataException;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.repository.Repository;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 // All properties to be converted to JSON via JAXB
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -53,31 +47,4 @@ public class ApiOnlineAccount {
 		return this.recipientAddress;
 	}
 
-	public int getMinterLevelFromPublicKey() {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return Account.getRewardShareEffectiveMintingLevel(repository, this.rewardSharePublicKey);
-		} catch (DataException e) {
-			return 0;
-		}
-	}
-
-	public boolean getIsMember() {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getGroupRepository().memberExists(694, getMinterAddress());
-		} catch (DataException e) {
-			return false;
-		}
-	}
-
-	// JAXB special
-	
-	@XmlElement(name = "minterLevel")
-	protected int getMinterLevel() {
-		return getMinterLevelFromPublicKey();
-	}
-
-	@XmlElement(name = "isMinterMember")
-	protected boolean getMinterMember() {
-		return getIsMember();
-	}
 }

src/main/java/org/qortal/api/model/AtCreationRequest.java

@@ -1,101 +0,0 @@
-package org.qortal.api.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.DecoderException;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class AtCreationRequest {
-
-    @Schema(description = "CIYAM AT version", example = "2")
-    private short ciyamAtVersion;
-
-    @Schema(description = "base64-encoded code bytes", example = "")
-    private String codeBytesBase64;
-
-    @Schema(description = "base64-encoded data bytes", example = "")
-    private String dataBytesBase64;
-
-    private short numCallStackPages;
-    private short numUserStackPages;
-    private long minActivationAmount;
-
-    // Default constructor for JSON deserialization
-    public AtCreationRequest() {}
-
-    // Getters and setters
-    public short getCiyamAtVersion() {
-        return ciyamAtVersion;
-    }
-
-    public void setCiyamAtVersion(short ciyamAtVersion) {
-        this.ciyamAtVersion = ciyamAtVersion;
-    }
-
-
-    public String getCodeBytesBase64() {
-        return this.codeBytesBase64;
-    }
-
-    @XmlTransient
-    @Schema(hidden = true)
-    public byte[] getCodeBytes() {
-        if (this.codeBytesBase64 != null) {
-            try {
-                return Base64.decode(this.codeBytesBase64);
-            }
-            catch (DecoderException e) {
-                return null;
-            }
-        }
-        return null;
-    }
-
-
-    public String getDataBytesBase64() {
-        return this.dataBytesBase64;
-    }
-
-    @XmlTransient
-    @Schema(hidden = true)
-    public byte[] getDataBytes() {
-        if (this.dataBytesBase64 != null) {
-            try {
-                return Base64.decode(this.dataBytesBase64);
-            }
-            catch (DecoderException e) {
-                return null;
-            }
-        }
-        return null;
-    }
-
-
-    public short getNumCallStackPages() {
-        return numCallStackPages;
-    }
-
-    public void setNumCallStackPages(short numCallStackPages) {
-        this.numCallStackPages = numCallStackPages;
-    }
-
-    public short getNumUserStackPages() {
-        return numUserStackPages;
-    }
-
-    public void setNumUserStackPages(short numUserStackPages) {
-        this.numUserStackPages = numUserStackPages;
-    }
-
-    public long getMinActivationAmount() {
-        return minActivationAmount;
-    }
-
-    public void setMinActivationAmount(long minActivationAmount) {
-        this.minActivationAmount = minActivationAmount;
-    }
-}

src/main/java/org/qortal/api/model/BlockMintingInfo.java

@@ -9,7 +9,6 @@ import java.math.BigInteger;
 public class BlockMintingInfo {
 
 	public byte[] minterPublicKey;
-	public String minterAddress;
 	public int minterLevel;
 	public int onlineAccountsCount;
 	public BigDecimal maxDistance;
@@ -20,4 +19,5 @@ public class BlockMintingInfo {
 
 	public BlockMintingInfo() {
 	}
+
 }

src/main/java/org/qortal/api/model/BlockSignerSummary.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import org.qortal.crypto.Crypto;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qortal.crypto.Crypto;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BlockSignerSummary {
 

src/main/java/org/qortal/api/model/ConnectedPeer.java

@@ -1,8 +1,7 @@
 package org.qortal.api.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.controller.Controller;
-import org.qortal.data.block.BlockSummaryData;
+import org.qortal.data.network.PeerChainTipData;
 import org.qortal.data.network.PeerData;
 import org.qortal.network.Handshake;
 import org.qortal.network.Peer;
@@ -17,7 +16,7 @@ public class ConnectedPeer {
 
     public enum Direction {
         INBOUND,
-        OUTBOUND
+        OUTBOUND;
     }
 
     public Direction direction;
@@ -37,7 +36,6 @@ public class ConnectedPeer {
     public Long lastBlockTimestamp;
     public UUID connectionId;
     public String age;
-    public Boolean isTooDivergent;
 
     protected ConnectedPeer() {
     }
@@ -65,16 +63,11 @@ public class ConnectedPeer {
             this.age = "connecting...";
         }
 
-        BlockSummaryData peerChainTipData = peer.getChainTipData();
+        PeerChainTipData peerChainTipData = peer.getChainTipData();
         if (peerChainTipData != null) {
-            this.lastHeight = peerChainTipData.getHeight();
-            this.lastBlockSignature = peerChainTipData.getSignature();
-            this.lastBlockTimestamp = peerChainTipData.getTimestamp();
-        }
-
-        // Only include isTooDivergent decision if we've had the opportunity to request block summaries this peer
-        if (peer.getLastTooDivergentTime() != null) {
-            this.isTooDivergent = Controller.wasRecentlyTooDivergent.test(peer);
+            this.lastHeight = peerChainTipData.getLastHeight();
+            this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
+            this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp();
         }
     }
 

src/main/java/org/qortal/api/model/CrossChainBitcoinRedeemRequest.java

@@ -1,10 +1,11 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import java.math.BigDecimal;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainBitcoinRedeemRequest {

src/main/java/org/qortal/api/model/CrossChainBitcoinRefundRequest.java

@@ -1,10 +1,11 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import java.math.BigDecimal;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainBitcoinRefundRequest {

src/main/java/org/qortal/api/model/CrossChainBitcoinTemplateRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainBitcoinTemplateRequest {
 

src/main/java/org/qortal/api/model/CrossChainBitcoinyHTLCStatus.java

@@ -1,10 +1,11 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import java.math.BigDecimal;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainBitcoinyHTLCStatus {

src/main/java/org/qortal/api/model/CrossChainBuildRequest.java

@@ -1,11 +1,11 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainBuildRequest {
 

src/main/java/org/qortal/api/model/CrossChainCancelRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainCancelRequest {
 

src/main/java/org/qortal/api/model/CrossChainOfferSummary.java

@@ -1,13 +1,14 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.data.crosschain.CrossChainTradeData;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.qortal.crosschain.AcctMode;
+import org.qortal.data.crosschain.CrossChainTradeData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
 // All properties to be converted to JSON via JAXB
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainOfferSummary {

src/main/java/org/qortal/api/model/CrossChainSecretRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainSecretRequest {
 

src/main/java/org/qortal/api/model/CrossChainTradeRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainTradeRequest {
 

src/main/java/org/qortal/api/model/CrossChainTradeSummary.java

@@ -1,12 +1,13 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.data.crosschain.CrossChainTradeData;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.qortal.data.crosschain.CrossChainTradeData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
 // All properties to be converted to JSON via JAXB
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CrossChainTradeSummary {

src/main/java/org/qortal/api/model/DatasetStatus.java

@@ -1,50 +0,0 @@
-package org.qortal.api.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.util.Objects;
-
-// All properties to be converted to JSON via JAXB
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DatasetStatus {
-
-    private String name;
-
-    private long count;
-
-    public DatasetStatus() {}
-
-    public DatasetStatus(String name, long count) {
-        this.name = name;
-        this.count = count;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public long getCount() {
-        return count;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DatasetStatus that = (DatasetStatus) o;
-        return count == that.count && Objects.equals(name, that.name);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, count);
-    }
-
-    @Override
-    public String toString() {
-        return "DatasetStatus{" +
-                "name='" + name + '\'' +
-                ", count=" + count +
-                '}';
-    }
-}

src/main/java/org/qortal/api/model/FileProperties.java

@@ -1,16 +0,0 @@
-package org.qortal.api.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class FileProperties {
-
-	public String filename;
-	public String mimeType;
-	public Long size;
-
-	public FileProperties() {
-	}
-
-}

src/main/java/org/qortal/api/model/GroupMembers.java

@@ -1,11 +1,12 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "Group info, maybe including members")
 // All properties to be converted to JSON via JAX-RS

src/main/java/org/qortal/api/model/NameSummary.java

@@ -1,11 +1,11 @@
 package org.qortal.api.model;
 
-import org.qortal.data.naming.NameData;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
+import org.qortal.data.naming.NameData;
+
 @XmlAccessorType(XmlAccessType.NONE)
 public class NameSummary {
 

src/main/java/org/qortal/api/model/NodeInfo.java

@@ -12,7 +12,6 @@ public class NodeInfo {
 	public long buildTimestamp;
 	public String nodeId;
 	public boolean isTestNet;
-	public String type;
 
 	public NodeInfo() {
 	}

src/main/java/org/qortal/api/model/NodeStatus.java

@@ -1,13 +1,11 @@
 package org.qortal.api.model;
 
-import org.qortal.controller.Controller;
-import org.qortal.controller.OnlineAccountsManager;
-import org.qortal.controller.Synchronizer;
-import org.qortal.network.Network;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qortal.controller.Controller;
+import org.qortal.network.Network;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class NodeStatus {
 
@@ -22,12 +20,12 @@ public class NodeStatus {
 	public final int height;
 
 	public NodeStatus() {
-		this.isMintingPossible = OnlineAccountsManager.getInstance().hasActiveOnlineAccountSignatures();
+		this.isMintingPossible = Controller.getInstance().isMintingPossible();
 
-		this.syncPercent = Synchronizer.getInstance().getSyncPercent();
-		this.isSynchronizing = Synchronizer.getInstance().isSynchronizing();
+		this.syncPercent = Controller.getInstance().getSyncPercent();
+		this.isSynchronizing = this.syncPercent != null;
 
-		this.numberOfConnections = Network.getInstance().getImmutableHandshakedPeers().size();
+		this.numberOfConnections = Network.getInstance().getHandshakedPeers().size();
 
 		this.height = Controller.getInstance().getChainHeight();
 	}

src/main/java/org/qortal/api/model/PeersSummary.java

@@ -1,15 +0,0 @@
-package org.qortal.api.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class PeersSummary {
-
-	public int inboundConnections;
-	public int outboundConnections;
-
-	public PeersSummary() {
-	}
-
-}

src/main/java/org/qortal/api/model/PollVotes.java

@@ -1,83 +0,0 @@
-package org.qortal.api.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.data.voting.VoteOnPollData;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
-
-@Schema(description = "Poll vote info, including voters")
-// All properties to be converted to JSON via JAX-RS
-@XmlAccessorType(XmlAccessType.FIELD)
-public class PollVotes {
-
-    @Schema(description = "List of individual votes")
-    @XmlElement(name = "votes")
-    public List<VoteOnPollData> votes;
-
-    @Schema(description = "Total number of votes")
-    public Integer totalVotes;
-
-    @Schema(description = "Total weight of votes")
-    public Integer totalWeight;
-
-    @Schema(description = "List of vote counts for each option")
-    public List<OptionCount> voteCounts;
-
-    @Schema(description = "List of vote weights for each option")
-    public List<OptionWeight> voteWeights;
-
-    // For JAX-RS
-    protected PollVotes() {
-    }
-
-    public PollVotes(List<VoteOnPollData> votes, Integer totalVotes, Integer totalWeight, List<OptionCount> voteCounts, List<OptionWeight> voteWeights) {
-        this.votes = votes;
-        this.totalVotes = totalVotes;
-        this.totalWeight = totalWeight;
-        this.voteCounts = voteCounts;
-        this.voteWeights = voteWeights;
-    }
-
-    @Schema(description = "Vote info")
-    // All properties to be converted to JSON via JAX-RS
-    @XmlAccessorType(XmlAccessType.FIELD)
-    public static class OptionCount {
-        @Schema(description = "Option name")
-        public String optionName;
-
-        @Schema(description = "Vote count")
-        public Integer voteCount;
-
-        // For JAX-RS
-        protected OptionCount() {
-        }
-
-        public OptionCount(String optionName, Integer voteCount) {
-            this.optionName = optionName;
-            this.voteCount = voteCount;
-        }
-    }
-
-    @Schema(description = "Vote weights")
-    // All properties to be converted to JSON via JAX-RS
-    @XmlAccessorType(XmlAccessType.FIELD)
-    public static class OptionWeight {
-        @Schema(description = "Option name")
-        public String optionName;
-
-        @Schema(description = "Vote weight")
-        public Integer voteWeight;
-
-        // For JAX-RS
-        protected OptionWeight() {
-        }
-
-        public OptionWeight(String optionName, Integer voteWeight) {
-            this.optionName = optionName;
-            this.voteWeight = voteWeight;
-        }
-    }
-}

src/main/java/org/qortal/api/model/RewardShareKeyRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RewardShareKeyRequest {
 

src/main/java/org/qortal/api/model/SimpleForeignTransaction.java

@@ -1,12 +1,13 @@
 package org.qortal.api.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SimpleForeignTransaction {
 

src/main/java/org/qortal/api/model/SimpleTransactionSignRequest.java

@@ -1,10 +1,10 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SimpleTransactionSignRequest {
 

src/main/java/org/qortal/api/model/TradeWithOrderInfo.java

@@ -1,13 +1,14 @@
 package org.qortal.api.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.qortal.data.asset.OrderData;
-import org.qortal.data.asset.TradeData;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
+import org.qortal.data.asset.OrderData;
+import org.qortal.data.asset.TradeData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
 @Schema(description = "Asset trade, including order info")
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qortal/api/model/crosschain/AddressRequest.java

@@ -1,17 +0,0 @@
-package org.qortal.api.model.crosschain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class AddressRequest {
-
-	@Schema(description = "Litecoin BIP32 extended public key", example = "tpub___________________________________________________________________________________________________________")
-	public String xpub58;
-
-	public AddressRequest() {
-	}
-
-}