Bump to v1.0.8

2025-08-01 14:41:23 +00:00 · 2020-05-05 16:18:35 +01:00
668 changed files with 15181 additions and 86096 deletions
--- a/.github/workflows/pr-testing.yml
+++ b/.github/workflows/pr-testing.yml
@@ -1,33 +0,0 @@
-name: PR testing
-
-on:
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  mavenTesting:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Cache local Maven repository
-      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@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-
-    - name: Run all tests
-      run: |
-        mvn -B clean test -DskipTests=false --file pom.xml
-        if [ -f "target/site/jacoco/index.html" ]; then echo "Total coverage: $(cat target/site/jacoco/index.html | grep -o 'Total[^%]*%' | grep -o '[0-9]*%')"; fi
-
-    - name: Log coverage percentage
-      run: |
-        if [ ! -f "target/site/jacoco/index.html" ]; then echo "No coverage information available"; fi
-        if [ -f "target/site/jacoco/index.html" ]; then echo "Total coverage: $(cat target/site/jacoco/index.html | grep -o 'Total[^%]*%' | grep -o '[0-9]*%')"; fi
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 /db*
-/lists/
 /bin/
 /target/
-/qortal-backup/
 /log.txt.*
 /arbitrary*
 /Qortal-BTC*
@@ -16,18 +14,5 @@
 /settings.json
 /testnet*
 /settings*.json
-/testchain*.json
-/run-testnet*.sh
-/.idea
-/qortal.iml
-.DS_Store
-/src/main/resources/resources
-/*.jar
-/run.pid
-/run.log
-/WindowsInstaller/Install Files/qortal.jar
-/*.7z
-/tmp
-/data*
-/src/test/resources/arbitrary/*/.qortal/cache
-apikey.txt
+/testchain.json
+/run-testnet.sh
--- a/AutoUpdates.md
+++ b/AutoUpdates.md
@@ -1,20 +1,5 @@
 # Auto Updates

-## TL;DR: how-to
-
-* Prepare new release version (see way below for details)
-* Assuming you are in git 'master' branch, at HEAD
-* Shutdown local node if running
-* 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.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
-* A minimum number of admins are required for approval, and a minimum number of blocks must pass also.
-* Nodes will start to download, and apply, the update over the next 20 minutes or so (see CHECK_INTERVAL in AutoUpdate.java)
-
 ## Theory
 * Using a specific git commit (e.g. abcdef123) we produce a determinstic JAR with consistent hash.
 * To avoid issues with over-eager anti-virus / firewalls we obfuscate JAR using very simplistic XOR-based method.
@@ -40,8 +25,8 @@ The same method is used to obfuscate and de-obfuscate:

 ## Typical download locations
 The git SHA1 commit hash is used to replace `%s` in various download locations, e.g.:
-* https://github.com/Qortal/qortal/raw/%s/qortal.update
-* https://raw.githubusercontent.com@151.101.16.133/Qortal/qortal/%s/qortal.update
+* https://github.com/QORT/qortal/raw/%s/qortal.update
+* https://raw.githubusercontent.com@151.101.16.133/QORT/qortal/%s/qortal.update

 These locations are part of the org.qortal.settings.Settings class and can be overriden in settings.json like:
 ```
@@ -60,12 +45,4 @@ $ java -cp qortal.jar org.qortal.XorUpdate
 usage: XorUpdate <input-file> <output-file>
 $ java -cp qortal.jar org.qortal.XorUpdate qortal.jar qortal.update
 $
-```
-
-## Preparing new release version
-
-* Shutdown local node
-* Modify `pom.xml` and increase version inside `<version>` tag
-* Commit new `pom.xml` and push to github, e.g. `git commit -m 'Bumped to v1.4.2' -- pom.xml; git push`
-* Tag this new commit with same version: `git tag v1.4.2`
-* Push tag up to github: `git push origin v1.4.2`
+```
--- a/DATABASE.md
+++ b/DATABASE.md
@@ -4,10 +4,10 @@ You can examine your node's database using [HSQLDB's "sqltool"](http://www.hsqld
 It's a good idea to install "rlwrap" (ReadLine wrapper) too as sqltool doesn't support command history/editing.

 Typical command line for sqltool would be:
-`rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC} qortal`
+`rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC} qora`

 `${HSQLDB_JAR}` should be set with pathname where Maven downloaded hsqldb, 
-typically `${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.1/hsqldb-2.5.1.jar`
+typically `${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.0/hsqldb-2.5.0.jar`

 `${SQLTOOL_JAR}` should be set with pathname where Maven downloaded sqltool,
 typically  `${HOME}/.m2/repository/org/hsqldb/sqltool/2.5.0/sqltool-2.5.0.jar`
@@ -25,16 +25,10 @@ Above `url` component `file:db/blockchain` assumes you will call `sqltool` from

 Another idea is to assign a shell alias in your `.bashrc` like:
 ```
-export HSQLDB_JAR=${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.1/hsqldb-2.5.1.jar
+export HSQLDB_JAR=${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.0/hsqldb-2.5.0.jar
 export SQLTOOL_JAR=${HOME}/.m2/repository/org/hsqldb/sqltool/2.5.0/sqltool-2.5.0.jar
 alias sqltool='rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC}'
 ```
 So you can simply type: `sqltool qortal`

 Don't forget to use `SHUTDOWN;` before exiting sqltool so that database files are closed cleanly.
-
-## Quick and dirty version
-
-With `sqltool-2.5.0.jar` and `qortal.jar` in current directory, and database in `db/`
-
-`java -cp qortal.jar:sqltool-2.5.0.jar org.hsqldb.cmdline.SqlTool --inlineRc=url=jdbc:hsqldb:file:db/blockchain`
--- a/26
+++ b/26
@@ -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"]
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@
 - Create basic *settings.json* file: `echo '{}' > settings.json`
 - 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*
+- Or use supplied example shell script: *run.sh*
--- a/TestNets.md
+++ b/TestNets.md
@@ -1,69 +0,0 @@
-# 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
-
--- a/Files/AppData/settings.json
+++ b/Files/AppData/settings.json
@@ -1,3 +0,0 @@
-{
-  "apiDocumentationEnabled": true
-}
--- a/WindowsInstaller/Install
+++ b/WindowsInstaller/Install
@@ -1,70 +0,0 @@
-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}
-
-rootLogger.appenderRef.console.ref = stdout
-rootLogger.appenderRef.rolling.ref = FILE
-
-# Suppress extraneous bitcoinj library output
-logger.bitcoinj.name = org.bitcoinj
-logger.bitcoinj.level = error
-
-# Override HSQLDB logging level to "warn" as too much is logged at "info"
-logger.hsqldb.name = hsqldb.db
-logger.hsqldb.level = warn
-
-# Support optional, per-session HSQLDB debugging
-logger.hsqldbRepository.name = org.qortal.repository.hsqldb
-logger.hsqldbRepository.level = debug
-
-# Suppress extraneous Jersey warning
-logger.jerseyInject.name = org.glassfish.jersey.internal.inject.Providers
-logger.jerseyInject.level = off
-
-# Suppress extraneous Jersey EOF 'errors' (actually remote peers disconnecting early)
-logger.jerseyEOF.name = org.glassfish.jersey.server.internal
-logger.jerseyEOF.level = off
-
-# Suppress extraneous Jetty entries
-# 2019-02-14 11:46:27 INFO  ContextHandler:851 - Started o.e.j.s.ServletContextHandler@6949e948{/,null,AVAILABLE}
-# 2019-02-14 11:46:27 INFO  AbstractConnector:289 - Started ServerConnector@50ad322b{HTTP/1.1,[http/1.1]}{0.0.0.0:9085}
-# 2019-02-14 11:46:27 INFO  Server:374 - jetty-9.4.11.v20180605; built: 2018-06-05T18:24:03.829Z; git: d5fc0523cfa96bfebfbda19606cad384d772f04c; jvm 1.8.0_181-b13
-# 2019-02-14 11:46:27 INFO  Server:411 - Started @2539ms
-logger.jetty.name = org.eclipse.jetty
-logger.jetty.level = warn
-# Even more extraneous Jetty output
-# 2019-01-26 02:18:10 WARN  ResourceService:718 - java.util.concurrent.TimeoutException: Idle timeout expired: 30000/30000 ms
-logger.jettyRS.name = org.eclipse.jetty.server.ResourceService
-logger.jettyRS.level = error
-
-# Suppress extraneous slf4j entries
-# 2019-02-14 11:46:27 INFO  log:193 - Logging initialized @1636ms to org.eclipse.jetty.util.log.Slf4jLog
-logger.slf4j.name = org.slf4j
-logger.slf4j.level = warn
-
-# Suppress extraneous Reflections entry
-# 2019-02-27 10:45:25 WARN  Reflections:179 - given scan urls are empty. set urls in the configuration
-logger.orgReflections.name = org.reflections.Reflections
-logger.orgReflections.level = off
-logger.sunReflections.name = sun.reflect.Reflection
-logger.sunReflections.level = off
-
-appender.console.type = Console
-appender.console.name = stdout
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-appender.console.filter.threshold.type = ThresholdFilter
-appender.console.filter.threshold.level = error
-
-appender.rolling.type = RollingFile
-appender.rolling.name = FILE
-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 = ./${filename}.%i
-appender.rolling.policy.type = SizeBasedTriggeringPolicy
-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
-# appender.rolling.append=true
--- a/WindowsInstaller/Install
+++ b/WindowsInstaller/Install
@@ -1,33 +0,0 @@
-@echo off
-
-:: BatchGotAdmin
-:-------------------------------------
-REM  --> Check for permissions
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-
-REM --> If error flag set, we do not have admin.
-if '%errorlevel%' NEQ '0' (
-    echo Requesting administrative privileges...
-    goto UACPrompt
-) else ( goto gotAdmin )
-
-:UACPrompt
-    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-
-    "%temp%\getadmin.vbs"
-    exit /B
-
-:gotAdmin
-    if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
-    pushd "%CD%"
-    CD /D "%~dp0"
-:--------------------------------------
-
-net stop "Windows Time"
-
-w32tm /config "/manualpeerlist:pool.ntp.org 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org cn.pool.ntp.org 0.cn.pool.ntp.org 1.cn.pool.ntp.org 2.cn.pool.ntp.org 3.cn.pool.ntp.org"
-
-net start "Windows Time"
-
-sc config w32time start= auto
--- a/WindowsInstaller/Qortal.aip
+++ b/WindowsInstaller/Qortal.aip
--- a/WindowsInstaller/README.md
+++ b/WindowsInstaller/README.md
@@ -1,26 +0,0 @@
-# Windows installer
-
-## Prerequisites
-
-* 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.
-
-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
-* New EXE should be generated in `Qortal-SetupFiles\` folder with correct version number
-
--- a/WindowsInstaller/dictionary.ail
+++ b/WindowsInstaller/dictionary.ail
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DICTIONARY type="multilanguage">
-  <!-- Control table -->
-  <ENTRY id="Control.Text.CustomizeDataPathDlg#Description">
-    <STRING lang="en" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
-	<STRING lang="ru" value="Вы можете выбрать место хранения блокчейна и других данных."/>
-    <STRING lang="zh" value="你想把区块链数据存放在一个特定的文件夹吗？"/>
-    <STRING lang="zh_TW" value="你想把区块链数据存放在一个特定的文件夹吗？"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.CustomizeDataPathDlg#Text">
-    <STRING lang="en" value="Select one of the options below, then click &quot;Next&quot;."/>
-	<STRING lang="ru" value="Выберите один из вариантов ниже, затем нажмите Далее"/>
-    <STRING lang="zh" value="请选择，然后“下一步”"/>
-    <STRING lang="zh_TW" value="请选择，然后“下一步”"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.CustomizeDataPathDlg#Title">
-    <STRING lang="en" value="Choose Custom Data Storage Folder?"/>
-	<STRING lang="ru" value="Выберите место хранения данных."/>
-    <STRING lang="zh" value="选择数据保存的文件夹?"/>
-    <STRING lang="zh_TW" value="选择数据保存的文件夹?"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.CustomizeDbDlg#Description">
-    <STRING lang="en" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
-	<STRING lang="ru" value="Вы можете выбрать место хранения блокчейна и других данных."/>
-    <STRING lang="zh" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
-    <STRING lang="zh_TW" value="Do you want to store the blockchain, and other data, in a specific folder?"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.CustomizeDbDlg#Title">
-    <STRING lang="en" value="Choose Custom Data Storage Folder?"/>
-	<STRING lang="ru" value="Выберите место хранения данных."/>
-    <STRING lang="zh" value="Choose Custom Data Storage Folder?"/>
-    <STRING lang="zh_TW" value="Choose Custom Data Storage Folder?"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.DataFolderDlg#Description">
-    <STRING lang="en" value="This is the folder where the blockchain, and other data, will be stored."/>
-	<STRING lang="ru" value="Это папка, в которой будет храниться блокчейн и другие данные."/>
-    <STRING lang="zh" value="这里是区块链及其它数据存放的文件夹"/>
-    <STRING lang="zh_TW" value="这里是区块链及其它数据存放的文件夹"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.DataFolderDlg#Text">
-    <STRING lang="en" value="To store data in this folder, click &quot;[Text_Next]&quot;. To store data in a different folder, enter it below or click &quot;Browse&quot;."/>
-	<STRING lang="ru" value="Чтобы сохранить данные в этой папке, нажмите &quot;[Text_Next]&quot;. Чтобы сохранить данные в другой папке, введите ее ниже или нажмите &quot;Обзор&quot;."/>
-    <STRING lang="zh" value="如果存放在这个文件夹，点 “下一步”。如果存放在其它位置，请选择“浏览”。"/>
-    <STRING lang="zh_TW" value="如果存放在这个文件夹，点 “下一步”。如果存放在其它位置，请选择“浏览”。"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.DataFolderDlg#Title">
-    <STRING lang="en" value="Select Data Storage Folder"/>
-	<STRING lang="ru" value="Выберите папку для хранения данных"/>
-    <STRING lang="zh" value="请选择文件存储地方"/>
-    <STRING lang="zh_TW" value="请选择文件存储地方"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.DbFolderDlg#Description">
-    <STRING lang="en" value="This is the folder where the blockchain, and other data, will be stored."/>
-	<STRING lang="ru" value="Это папка, в которой будет храниться блокчейн и другие данные."/>
-    <STRING lang="zh" value="This is the folder where the blockchain, and other data, will be stored."/>
-    <STRING lang="zh_TW" value="This is the folder where the blockchain, and other data, will be stored."/>
-  </ENTRY>
-  <ENTRY id="Control.Text.DbFolderDlg#Title">
-    <STRING lang="en" value="Select Data Storage Folder"/>
-	<STRING lang="ru" value="Выберите папку для хранения данных"/>
-    <STRING lang="zh" value="请选择文件存储地方"/>
-    <STRING lang="zh_TW" value="请选择文件存储地方"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.NTPDialog#Description">
-    <STRING lang="en" value="Reconfigure Windows for more accurate time?"/>
-	<STRING lang="ru" value="Настроить синхронизацию времени системы Windows?"/>
-    <STRING lang="zh" value="重新配置Windows以获得更准确的时间？"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.NTPDialog#Text_1">
-    <STRING lang="en" value="An accurate Windows clock is required to connect to the [ProductName] network and make transactions."/>
-	<STRING lang="ru" value="Для подключения к сети Qortal и совершения транзакций требуется точная настройка времени Windows"/>
-    <STRING lang="zh" value="需要准确的Windows时钟才能连接到[ProductName]网络并进行交易。"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.NTPDialog#Text_2">
-    <STRING lang="en" value="Select one of the options below, then click &quot;Next&quot;."/>
-	<STRING lang="ru" value="Выберите один из вариантов ниже, затем нажмите"/>
-    <STRING lang="zh" value="请选择，然后“下一步”"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.NTPDialog#Text_3">
-    <STRING lang="en" value="Your computer&apos;s clock needs to be accurate to within 0.5 seconds."/>
-	<STRING lang="ru" value="Точность времени вашего компьютера должна составлять 0.5 секунд."/>
-    <STRING lang="zh" value="您的计算机时钟需要准确到0.5秒内。"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.NTPDialog#Title">
-    <STRING lang="en" value="Windows clock accuracy"/>
-	<STRING lang="ru" value="Настройка времени системы Windows"/>
-    <STRING lang="zh" value="Windows 时钟精度"/>
-  </ENTRY>
-  <ENTRY id="Control.Text.VerifyRemoveDlg#RemoveBlockchainCheckbox">
-    <STRING lang="en" value="Remove downloaded blockchain and other data"/>
-	<STRING lang="ru" value="Удалить загруженный блокчейн и другие данные"/>
-    <STRING lang="zh" value="删除您下载的区块链"/>
-  </ENTRY>
-  <!-- RadioButton table -->
-  <ENTRY id="RadioButton.Text.CUSTOM_DB_BOOL#choose">
-    <STRING lang="en" value="Choose custom data storage folder..."/>
-	<STRING lang="ru" value="Выбрать папку для хранения данных..."/>
-    <STRING lang="zh" value="选择特定的文件夹存储"/>
-    <STRING lang="zh_TW" value="选择特定的文件夹存储"/>
-  </ENTRY>
-  <ENTRY id="RadioButton.Text.CUSTOM_DB_BOOL#default">
-    <STRING lang="en" value="Use default location "/>
-	<STRING lang="ru" value="Использовать папку по умолчанию"/>
-    <STRING lang="zh" value="使用默认存储地点"/>
-    <STRING lang="zh_TW" value="使用默认存储地点"/>
-  </ENTRY>
-  <ENTRY id="RadioButton.Text.RECONFIG_NTP#1">
-    <STRING lang="en" value="Yes, configure Windows to use internet time servers (Recommended)"/>
-	<STRING lang="ru" value="Да, настроить синхронизацию времени Windows (Рекомендуется)"/>
-    <STRING lang="zh" value="是，将Windows配置为使用多个Internet时间服务器 (推荐的)"/>
-  </ENTRY>
-  <ENTRY id="RadioButton.Text.RECONFIG_NTP#2">
-    <STRING lang="en" value="No, I will manage clock accuracy myself"/>
-	<STRING lang="ru" value="Нет, я сам буду управлять настройками часов"/>
-    <STRING lang="zh" value="不，我会自己管理时钟精度。"/>
-  </ENTRY>
-</DICTIONARY>
--- a/WindowsInstaller/qortal.ico
+++ b/WindowsInstaller/qortal.ico
--- a/lib/org/ciyam/AT/1.3.7/AT-1.3.7.jar
+++ b/lib/org/ciyam/AT/1.3.7/AT-1.3.7.jar
--- a/lib/org/ciyam/AT/1.3.8/AT-1.3.8.jar
+++ b/lib/org/ciyam/AT/1.3.8/AT-1.3.8.jar
--- a/lib/org/ciyam/AT/1.3.8/AT-1.3.8.pom
+++ b/lib/org/ciyam/AT/1.3.8/AT-1.3.8.pom
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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.3.8</version>
-  <description>POM was created from install:install-file</description>
-</project>
--- a/lib/org/ciyam/AT/maven-metadata-local.xml
+++ b/lib/org/ciyam/AT/maven-metadata-local.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.ciyam</groupId>
-  <artifactId>AT</artifactId>
-  <versioning>
-    <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>
-    </versions>
-    <lastUpdated>20200925114415</lastUpdated>
-  </versioning>
-</metadata>
--- a/lib/org/ciyam/at/1.0/at-1.0.jar
+++ b/lib/org/ciyam/at/1.0/at-1.0.jar
--- a/lib/org/ciyam/AT/1.3.7/AT-1.3.7.pom
+++ b/lib/org/ciyam/AT/1.3.7/AT-1.3.7.pom
@@ -3,7 +3,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.ciyam</groupId>
-  <artifactId>AT</artifactId>
-  <version>1.3.7</version>
+  <artifactId>at</artifactId>
+  <version>1.0</version>
  <description>POM was created from install:install-file</description>
 </project>
--- a/lib/org/ciyam/at/maven-metadata-local.xml
+++ b/lib/org/ciyam/at/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ciyam</groupId>
+  <artifactId>at</artifactId>
+  <versioning>
+    <release>1.0</release>
+    <versions>
+      <version>1.0</version>
+    </versions>
+    <lastUpdated>20181105100741</lastUpdated>
+  </versioning>
+</metadata>
--- a/log4j2.properties
+++ b/log4j2.properties
@@ -1,15 +1,11 @@
 rootLogger.level = info
-# On Windows, uncomment next line to set dirname:
-# property.dirname = ${sys:user.home}\\AppData\\Local\\qortal\\
+# On Windows, uncomment this:
+# property.dirname = ${sys:user.home}\\AppData\\Roaming\\qortal\\
 property.filename = ${sys:log4j2.filenameTemplate:-log.txt}

 rootLogger.appenderRef.console.ref = stdout
 rootLogger.appenderRef.rolling.ref = FILE

-# Suppress extraneous bitcoinj library output
-logger.bitcoinj.name = org.bitcoinj
-logger.bitcoinj.level = error
-
 # Override HSQLDB logging level to "warn" as too much is logged at "info"
 logger.hsqldb.name = hsqldb.db
 logger.hsqldb.level = warn
@@ -61,7 +57,7 @@ appender.rolling.type = RollingFile
 appender.rolling.name = FILE
 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 = ./${filename}.%i
+appender.rolling.filePattern = ${dirname:-}${filename}.%i
 appender.rolling.policy.type = SizeBasedTriggeringPolicy
 appender.rolling.policy.size = 4MB
 # Set the immediate flush to true (default)
--- a/pom.xml
+++ b/pom.xml
@@ -3,34 +3,26 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.qortal</groupId>
 	<artifactId>qortal</artifactId>
-	<version>3.1.0</version>
+	<version>1.0.8</version>
 	<packaging>jar</packaging>
 	<properties>
-		<skipTests>true</skipTests>
-		<altcoinj.version>bf9fb80</altcoinj.version>
-		<bitcoinj.version>0.15.10</bitcoinj.version>
+		<bitcoin.version>0.15.4</bitcoin.version>
 		<bouncycastle.version>1.64</bouncycastle.version>
 		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-		<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>
-		<commons-io.version>2.6</commons-io.version>
-		<commons-compress.version>1.21</commons-compress.version>
-		<commons-lang3.version>3.12.0</commons-lang3.version>
-		<xz.version>1.9</xz.version>
 		<dagger.version>1.2.2</dagger.version>
 		<guava.version>28.1-jre</guava.version>
-		<hsqldb.version>2.5.1</hsqldb.version>
+		<hsqldb.version>2.5.0-fixed</hsqldb.version>
+		<hsqldb-sqltool.version>2.5.0</hsqldb-sqltool.version>
 		<jersey.version>2.29.1</jersey.version>
-		<jetty.version>9.4.29.v20200521</jetty.version>
-		<log4j.version>2.17.1</log4j.version>
+		<jetty.version>9.4.22.v20191022</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>
-		<jsoup.version>1.13.1</jsoup.version>
-		<java-diff-utils.version>4.10</java-diff-utils.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -206,10 +198,6 @@
 							<pattern>org.qortal.api.model**</pattern>
 							<template>${project.build.sourceDirectory}/org/qortal/data/package-info.java</template>
 						</package>
-						<package>
-							<pattern>org.qortal.api.model.**</pattern>
-							<template>${project.build.sourceDirectory}/org/qortal/data/package-info.java</template>
-						</package>
 					</packages>
 					<outputDirectory>${project.build.directory}/generated-sources/package-info</outputDirectory>
 				</configuration>
@@ -324,14 +312,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
-				<configuration>
-					<skipTests>${skipTests}</skipTests>
-				</configuration>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -394,11 +374,6 @@
 			<name>project</name>
 			<url>file:${project.basedir}/lib</url>
 		</repository>
-		<!-- jitpack for build-on-demand of altcoinj -->
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
 	</repositories>
 	<dependencies>
 		<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/build-helper-maven-plugin -->
@@ -421,23 +396,23 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsqldb.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>sqltool</artifactId>
+			<version>${hsqldb-sqltool.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<!-- CIYAM AT (automated transactions) -->
 		<dependency>
 			<groupId>org.ciyam</groupId>
-			<artifactId>AT</artifactId>
-			<version>${ciyam-at.version}</version>
+			<artifactId>at</artifactId>
+			<version>1.0</version>
 		</dependency>
 		<!-- Bitcoin support -->
 		<dependency>
 			<groupId>org.bitcoinj</groupId>
 			<artifactId>bitcoinj-core</artifactId>
-			<version>${bitcoinj.version}</version>
-		</dependency>
-		<!-- For Litecoin, etc. support, requires bitcoinj -->
-		<dependency>
-			<groupId>com.github.jjos2372</groupId>
-			<artifactId>altcoinj</artifactId>
-			<version>${altcoinj.version}</version>
+			<version>${bitcoin.version}</version>
 		</dependency>
 		<!-- Utilities -->
 		<dependency>
@@ -445,36 +420,11 @@
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<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>
@@ -500,10 +450,6 @@
 					<groupId>org.asynchttpclient</groupId>
 					<artifactId>async-http-client</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>io.druid</groupId>
-					<artifactId>java-util</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<!-- For NTP -->
@@ -557,12 +503,6 @@
 			<artifactId>mail</artifactId>
 			<version>1.5.0-b01</version>
 		</dependency>
-		<!-- Unicode homoglyph utilities -->
-		<dependency>
-			<groupId>net.codebox</groupId>
-			<artifactId>homoglyph</artifactId>
-			<version>1.2.0</version>
-		</dependency>
 		<!-- Jetty -->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
@@ -591,12 +531,6 @@
 			<artifactId>jetty-client</artifactId>
 			<version>${jetty.version}</version>
 		</dependency>
-		<!-- Websocket support -->
-		<dependency>
-			<groupId>org.eclipse.jetty.websocket</groupId>
-			<artifactId>javax-websocket-server-impl</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
 		<!-- Jersey -->
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
@@ -675,15 +609,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>
 	</dependencies>
 </project>
--- a/run.sh
+++ b/run.sh
@@ -1 +0,0 @@
-start.sh
--- a/run.sh
+++ b/run.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# There's no need to run as root, so don't allow it, for security reasons
+if [ "$USER" = "root" ]; then
+	echo "Please su to non-root user before running"
+	exit
+fi
+
+# Validate Java is installed and the minimum version is available
+MIN_JAVA_VER='11'
+
+if command -v java > /dev/null 2>&1; then
+    version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
+    version=$(echo $version | cut -d'.' -f1,2)
+    if [ `echo "${version}>=${MIN_JAVA_VER}" | bc` -eq 1 ]; then
+        echo 'Passed Java version check'
+    else
+        echo 'Please upgrade your Java to version 11 or greater'
+        exit 1
+    fi
+else
+  echo 'Java is not available, please install Java 11 or greater'
+  exit 1
+fi
+
+# No qortal.jar but we have a Maven built one?
+# Be helpful and copy across to correct location
+if [ ! -e qortal.jar -a -f target/qortal*.jar ]; then
+	echo "Copying Maven-built Qortal JAR to correct pathname"
+	cp target/qortal*.jar qortal.jar
+fi
+
+# Limits Java JVM stack size and maximum heap usage.
+# Comment out for bigger systems, e.g. non-routers
+# or when API documentation is enabled
+# JVM_MEMORY_ARGS="-Xss256k -Xmx128m"
+
+# Although java.net.preferIPv4Stack is supposed to be false
+# by default in Java 11, on some platforms (e.g. FreeBSD 12),
+# it is overriden to be true by default. Hence we explicitly
+# set it to true to obtain desired behaviour.
+nohup nice -n 20 java \
+	-Djava.net.preferIPv4Stack=false \
+	-XX:NativeMemoryTracking=summary \
+	${JVM_MEMORY_ARGS} \
+	-jar qortal.jar \
+	1>run.log 2>&1 &
+
+# Save backgrounded process's PID
+echo $! > run.pid
+echo qortal running as pid $!
--- a/src/main/java/org/hsqldb/jdbc/HSQLDBPool.java
+++ b/src/main/java/org/hsqldb/jdbc/HSQLDBPool.java
@@ -21,28 +21,18 @@ public class HSQLDBPool extends JDBCPool {
 	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;
-
-				return pooledConnection.getConnection();
+				return connections[i].getConnection();
 			}

 			if (states.compareAndSet(i, RefState.empty, RefState.allocated)) {
 				try {
-					JDBCPooledConnection pooledConnection = (JDBCPooledConnection) source.getPooledConnection();
+					JDBCPooledConnection connection = (JDBCPooledConnection) source.getPooledConnection();

-					if (pooledConnection == null)
-						// Probably shutdown situation
-						return null;
+					connection.addConnectionEventListener(this);
+					connection.addStatementEventListener(this);
+					connections[i] = connection;

-					pooledConnection.addConnectionEventListener(this);
-					pooledConnection.addStatementEventListener(this);
-					connections[i] = pooledConnection;
-
-					return pooledConnection.getConnection();
+					return connections[i].getConnection();
 				} catch (SQLException e) {
 					states.set(i, RefState.empty);
 				}
--- a/src/main/java/org/qortal/ApplyUpdate.java
+++ b/src/main/java/org/qortal/ApplyUpdate.java
@@ -7,13 +7,14 @@ 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.ArrayList;
+import java.util.Arrays;
+import java.util.List;

 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;
@@ -34,8 +35,6 @@ public class ApplyUpdate {
 	private static final String JAR_FILENAME = AutoUpdate.JAR_FILENAME;
 	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 = "-XX:MaxRAMFraction=4";

 	private static final long CHECK_INTERVAL = 10 * 1000L; // ms
 	private static final int MAX_ATTEMPTS = 12;
@@ -66,45 +65,17 @@ public class ApplyUpdate {
 	}

 	private static boolean shutdownNode() {
-		String baseUri = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
-		LOGGER.info(() -> String.format("Shutting down node using API via %s", baseUri));
+		String BASE_URI = "http://localhost:" + Settings.getInstance().getApiPort() + "/";
+		LOGGER.info(String.format("Shutting down node using API via %s", BASE_URI));

-		// 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 this auto update, so we need to remove it
-					ApplyUpdate.removeGeneratedApiKey();
-				}
-				return true;
-			}
+			LOGGER.info(String.format("Attempt #%d out of %d to shutdown node", attempt + 1, MAX_ATTEMPTS));
+			String response = ApiRequest.perform(BASE_URI + "admin/stop", null);
+			if (response == null)
+				break;

-			LOGGER.info(() -> String.format("Response from API: %s", response));
+			LOGGER.info(String.format("Response from API: %s", response));

 			try {
 				Thread.sleep(CHECK_INTERVAL);
@@ -114,11 +85,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;
@@ -127,39 +93,25 @@ 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.info("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);
 		Path newJar = Paths.get(NEW_JAR_FILENAME);

 		if (!Files.exists(newJar)) {
-			LOGGER.warn(() -> String.format("Replacement JAR '%s' not found?", newJar));
+			LOGGER.warn(String.format("Replacement JAR '%s' not found?", newJar));
 			return;
 		}

 		int attempt;
 		for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-			final int attemptForLogging = attempt;
-			LOGGER.info(() -> String.format("Attempt #%d out of %d to replace JAR", attemptForLogging + 1, MAX_ATTEMPTS));
+			LOGGER.info(String.format("Attempt #%d out of %d to replace JAR", attempt + 1, MAX_ATTEMPTS));

 			try {
 				Files.copy(newJar, realJar, StandardCopyOption.REPLACE_EXISTING);
 				break;
 			} catch (IOException e) {
-				LOGGER.info(() -> String.format("Unable to replace JAR: %s", e.getMessage()));
+				LOGGER.info(String.format("Unable to replace JAR: %s", e.getMessage()));

 				// Try again
 			}
@@ -167,7 +119,6 @@ public class ApplyUpdate {
 			try {
 				Thread.sleep(CHECK_INTERVAL);
 			} catch (InterruptedException e) {
-				LOGGER.warn("Ignoring interrupt...");
 				// Doggedly retry
 			}
 		}
@@ -178,13 +129,13 @@ public class ApplyUpdate {

 	private static void restartNode(String[] args) {
 		String javaHome = System.getProperty("java.home");
-		LOGGER.info(() -> String.format("Java home: %s", javaHome));
+		LOGGER.info(String.format("Java home: %s", javaHome));

 		Path javaBinary = Paths.get(javaHome, "bin", "java");
-		LOGGER.info(() -> String.format("Java binary: %s", javaBinary));
+		LOGGER.info(String.format("Java binary: %s", javaBinary));

 		Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER);
-		LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher));
+		LOGGER.info(String.format("Windows EXE launcher: %s", exeLauncher));

 		List<String> javaCmd;
 		if (Files.exists(exeLauncher)) {
@@ -205,16 +156,9 @@ public class ApplyUpdate {
 		}

 		try {
-			LOGGER.info(() -> 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.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);
-			}
-
-			processBuilder.start();
+			new ProcessBuilder(javaCmd).start();
 		} catch (IOException e) {
 			LOGGER.error(String.format("Failed to restart node (BAD): %s", e.getMessage()));
 		}
--- a/src/main/java/org/qortal/RepositoryMaintenance.java
+++ b/src/main/java/org/qortal/RepositoryMaintenance.java
@@ -1,76 +0,0 @@
-package org.qortal;
-
-import java.security.Security;
-import java.util.concurrent.TimeoutException;
-
-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.controller.Controller;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryFactory;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
-import org.qortal.settings.Settings;
-
-public class RepositoryMaintenance {
-
-	static {
-		// 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(RepositoryMaintenance.class);
-
-	public static void main(String[] args) {
-		LOGGER.info("Repository maintenance starting up...");
-
-		Security.insertProviderAt(new BouncyCastleProvider(), 0);
-		Security.insertProviderAt(new BouncyCastleJsseProvider(), 1);
-
-		// Load/check settings, which potentially sets up blockchain config, etc.
-		try {
-			if (args.length > 0)
-				Settings.fileInstance(args[0]);
-			else
-				Settings.getInstance();
-		} catch (Throwable t) {
-			LOGGER.error("Settings file error: " + t.getMessage());
-			System.exit(2);
-		}
-
-		LOGGER.info("Opening repository");
-		try {
-			RepositoryFactory repositoryFactory = new HSQLDBRepositoryFactory(Controller.getRepositoryUrl());
-			RepositoryManager.setRepositoryFactory(repositoryFactory);
-		} catch (DataException e) {
-			// If exception has no cause then repository is in use by some other process.
-			if (e.getCause() == null) {
-				LOGGER.info("Repository in use by another process?");
-			} else {
-				LOGGER.error("Unable to start repository", e);
-			}
-
-			System.exit(1);
-		}
-
-		LOGGER.info("Starting repository periodic maintenance. This can take a while...");
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			repository.performPeriodicMaintenance(null);
-
-			LOGGER.info("Repository periodic maintenance completed");
-		} catch (DataException | TimeoutException e) {
-			LOGGER.error("Repository periodic maintenance failed", e);
-		}
-
-		try {
-			LOGGER.info("Shutting down repository");
-			RepositoryManager.closeRepositoryFactory();
-		} catch (DataException e) {
-			LOGGER.error("Error occurred while shutting down repository", e);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/account/Account.java
+++ b/src/main/java/org/qortal/account/Account.java
@@ -1,9 +1,7 @@
 package org.qortal.account;

-import static org.qortal.utils.Amounts.prettyAmount;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import java.math.BigDecimal;
+import java.util.List;

 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -11,11 +9,12 @@ 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.data.transaction.TransactionData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
+import org.qortal.transaction.Transaction;
 import org.qortal.utils.Base58;

-@XmlAccessorType(XmlAccessType.NONE) // Stops JAX-RS errors when unmarshalling blockchain config
 public class Account {

 	private static final Logger LOGGER = LogManager.getLogger(Account.class);
@@ -52,52 +51,45 @@ public class Account {
 		return new AccountData(this.address);
 	}

-	public void ensureAccount() throws DataException {
-		this.repository.getAccountRepository().ensureAccount(this.buildAccountData());
-	}
-
 	// Balance manipulations - assetId is 0 for QORT

-	public long getConfirmedBalance(long assetId) throws DataException {
+	public BigDecimal getBalance(long assetId) throws DataException {
 		AccountBalanceData accountBalanceData = this.repository.getAccountRepository().getBalance(this.address, assetId);
 		if (accountBalanceData == null)
-			return 0;
+			return BigDecimal.ZERO.setScale(8);

 		return accountBalanceData.getBalance();
 	}

-	public void setConfirmedBalance(long assetId, long balance) throws DataException {
+	public BigDecimal getConfirmedBalance(long assetId) throws DataException {
+		AccountBalanceData accountBalanceData = this.repository.getAccountRepository().getBalance(this.address, assetId);
+		if (accountBalanceData == null)
+			return BigDecimal.ZERO.setScale(8);
+
+		return accountBalanceData.getBalance();
+	}
+
+	public void setConfirmedBalance(long assetId, BigDecimal balance) throws DataException {
 		// Safety feature!
-		if (balance < 0) {
-			String message = String.format("Refusing to set negative balance %s [assetId %d] for %s", prettyAmount(balance), assetId, this.address);
+		if (balance.compareTo(BigDecimal.ZERO) < 0) {
+			String message = String.format("Refusing to set negative balance %s [assetId %d] for %s", balance.toPlainString(), assetId, this.address);
 			LOGGER.error(message);
 			throw new DataException(message);
 		}

 		// Delete account balance record instead of setting balance to zero
-		if (balance == 0) {
+		if (balance.signum() == 0) {
 			this.repository.getAccountRepository().delete(this.address, assetId);
 			return;
 		}

 		// Can't have a balance without an account - make sure it exists!
-		this.ensureAccount();
+		this.repository.getAccountRepository().ensureAccount(this.buildAccountData());

 		AccountBalanceData accountBalanceData = new AccountBalanceData(this.address, assetId, balance);
 		this.repository.getAccountRepository().save(accountBalanceData);

-		LOGGER.trace(() -> String.format("%s balance now %s [assetId %s]", this.address, prettyAmount(balance), assetId));
-	}
-
-	// Convenience method
-	public void modifyAssetBalance(long assetId, long deltaBalance) throws DataException {
-		this.repository.getAccountRepository().modifyAssetBalance(this.getAddress(), assetId, deltaBalance);
-
-		LOGGER.trace(() -> String.format("%s balance %s by %s [assetId %s]",
-				this.address,
-				(deltaBalance >= 0 ? "increased" : "decreased"),
-				prettyAmount(Math.abs(deltaBalance)),
-				assetId));
+		LOGGER.trace(() -> String.format("%s balance now %s [assetId %s]", this.address, balance.toPlainString(), assetId));
 	}

 	public void deleteBalance(long assetId) throws DataException {
@@ -113,11 +105,38 @@ public class Account {
 	 * @throws DataException
 	 */
 	public byte[] getLastReference() throws DataException {
-		byte[] reference = AccountRefCache.getLastReference(this.repository, this.address);
+		byte[] reference = this.repository.getAccountRepository().getLastReference(this.address);
 		LOGGER.trace(() -> String.format("Last reference for %s is %s", this.address, reference == null ? "null" : Base58.encode(reference)));
 		return reference;
 	}

+	/**
+	 * Fetch last reference for account, considering unconfirmed transactions only, or return null.
+	 * <p>
+	 * NOTE: calls Transaction.getUnconfirmedTransactions which discards uncommitted
+	 * repository changes.
+	 * 
+	 * @return byte[] reference, or null if no unconfirmed transactions for this account.
+	 * @throws DataException
+	 */
+	public byte[] getUnconfirmedLastReference() throws DataException {
+		// Newest unconfirmed transaction takes priority
+		List<TransactionData> unconfirmedTransactions = Transaction.getUnconfirmedTransactions(repository);
+
+		byte[] reference = null;
+
+		for (TransactionData transactionData : unconfirmedTransactions) {
+			String unconfirmedTransactionAddress = PublicKeyAccount.getAddress(transactionData.getCreatorPublicKey());
+
+			if (unconfirmedTransactionAddress.equals(this.address))
+				reference = transactionData.getSignature();
+		}
+
+		final byte[] loggingReference = reference;
+		LOGGER.trace(() -> String.format("Last unconfirmed reference for %s is %s", this.address, loggingReference == null ? "null" : Base58.encode(loggingReference)));
+		return reference;
+	}
+
 	/**
 	 * Set last reference for account.
 	 * 
@@ -130,7 +149,7 @@ public class Account {

 		AccountData accountData = this.buildAccountData();
 		accountData.setReference(reference);
-		AccountRefCache.setLastReference(this.repository, accountData);
+		this.repository.getAccountRepository().setLastReference(accountData);
 	}

 	// Default groupID manipulations
@@ -266,7 +285,11 @@ public class Account {
 		if (Account.isFounder(accountData.getFlags()))
 			return BlockChain.getInstance().getFounderEffectiveMintingLevel();

-		return accountData.getLevel();
+		Integer level = accountData.getLevel();
+		if (level == null)
+			return 0;
+
+		return level;
 	}

 	/**
--- a/src/main/java/org/qortal/account/AccountRefCache.java
+++ b/src/main/java/org/qortal/account/AccountRefCache.java
@@ -1,217 +0,0 @@
-package org.qortal.account;
-
-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>
- * When checking an account's lastReference, the value returned should be the
- * most recent value set after processing the most recent block.
- * <p>
- * However, when processing a batch of transactions, e.g. during block processing or validation,
- * each transaction needs to check, and maybe update, multiple accounts' lastReference values.
- * <p>
- * Because the intermediate updates would affect future checks, we set up a cache of that
- * maintains a consistent value for fetching lastReference, but also tracks the latest new
- * value, without the overhead of repository calls.
- * <p>
- * Thus, when batch transaction processing is finished, only the latest new lastReference values
- * can be committed to the repository, via {@link AccountRefCache#commit()}.
- * <p>
- * Getting and setting lastReferences values are done the usual way via
- * {@link Account#getLastReference()} and {@link Account#setLastReference(byte[])} which call
- * package-visibility methods in <tt>AccountRefCache</tt>.
- * <p>
- * If {@link Account#getLastReference()} or {@link Account#setLastReference(byte[])} are called
- * outside of caching then lastReference values are fetched/set directly from/to the repository.
- * <p>
- * <tt>AccountRefCache</tt> implements <tt>AutoCloseable</tt> for (typical) use in a try-with-resources block.
- *
- * @see Account#getLastReference()
- * @see Account#setLastReference(byte[])
- * @see org.qortal.block.Block#process()
- */
-public class AccountRefCache implements AutoCloseable {
-
-	private static final Map<Repository, RefCache> CACHE = new HashMap<>();
-
-	private static class RefCache {
-		private final Map<String, byte[]> getLastReferenceValues = new HashMap<>();
-		private final Map<String, Pair<byte[], byte[]>> setLastReferenceValues = new HashMap<>();
-
-		/**
-		 * Function for merging publicKey from new data with old publicKey from map.
-		 * <p>
-		 * Last reference is <tt>A</tt> element in pair.<br>
-		 * Public key is <tt>B</tt> element in pair.
-		 */
-		private static final BinaryOperator<Pair<byte[], byte[]>> mergePublicKey = (oldPair,  newPair) -> {
-			// If passed new pair contains non-null publicKey, then we use that one in preference.
-			if (newPair.getB() == null)
-				// Otherwise, inherit publicKey from old map value.
-				newPair.setB(oldPair.getB());
-
-			// We always use new lastReference from new pair.
-			return newPair;
-		};
-
-
-		public byte[] getLastReference(Repository repository, String address) throws DataException {
-			synchronized (this.getLastReferenceValues) {
-				byte[] lastReference = getLastReferenceValues.get(address);
-				if (lastReference != null)
-					// address is present in map, lastReference not null
-					return lastReference;
-
-				// address is present in map, just lastReference is null
-				if (getLastReferenceValues.containsKey(address))
-					return null;
-
-				lastReference = repository.getAccountRepository().getLastReference(address);
-				this.getLastReferenceValues.put(address, lastReference);
-				return lastReference;
-			}
-		}
-
-		public void setLastReference(AccountData accountData) {
-			// We're only interested in lastReference and publicKey
-			Pair<byte[], byte[]> newPair = new Pair<>(accountData.getReference(), accountData.getPublicKey());
-
-			synchronized (this.setLastReferenceValues) {
-				setLastReferenceValues.merge(accountData.getAddress(), newPair, mergePublicKey);
-			}
-		}
-
-		Map<String, Pair<byte[], byte[]>> getNewLastReferences() {
-			return setLastReferenceValues;
-		}
-	}
-
-	private Repository repository;
-
-	/**
-	 * Constructs a new account reference cache, unique to passed <tt>repository</tt> handle.
-	 * 
-	 * @param repository
-	 * @throws IllegalStateException if a cache already exists for <tt>repository</tt>
-	 */
-	public AccountRefCache(Repository repository) {
-		RefCache refCache = new RefCache();
-
-		synchronized (CACHE) {
-			if (CACHE.putIfAbsent(repository, refCache) != null)
-				throw new IllegalStateException("Account reference cache entry already exists");
-		}
-
-		this.repository = repository;
-	}
-
-	/**
-	 * Save all cached setLastReference account-reference values into repository.
-	 * <p>
-	 * Closes cache to prevent any future setLastReference() attempts post-commit.
-	 * 
-	 * @throws DataException
-	 */
-	public void commit() throws DataException {
-		RefCache refCache;
-
-		// Also duplicated in close(), this prevents future setLastReference() attempts post-commit.
-		synchronized (CACHE) {
-			refCache = CACHE.remove(this.repository);
-		}
-
-		if (refCache == null)
-			throw new IllegalStateException("Tried to commit non-existent account reference cache");
-
-		Map<String, Pair<byte[], byte[]>> newLastReferenceValues = refCache.getNewLastReferences();
-
-		for (Entry<String, Pair<byte[], byte[]>> entry : newLastReferenceValues.entrySet()) {
-			AccountData accountData = new AccountData(entry.getKey());
-
-			accountData.setReference(entry.getValue().getA());
-
-			if (entry.getValue().getB() != null)
-				accountData.setPublicKey(entry.getValue().getB());
-
-			this.repository.getAccountRepository().setLastReference(accountData);
-		}
-	}
-
-	@Override
-	public void close() {
-		synchronized (CACHE) {
-			CACHE.remove(this.repository);
-		}
-	}
-
-	/**
-	 * Returns lastReference value for account.
-	 * <p>
-	 * If cache is not in effect for passed <tt>repository</tt> handle,
-	 * then this method fetches lastReference directly from repository.
-	 * <p>
-	 * If cache <i>is</i> in effect, then this method returns cached
-	 * lastReference, which is <b>not</b> affected by calls to
-	 * <tt>setLastReference</tt>.
-	 * <p>
-	 * Typically called by corresponding method in Account class.
-	 * 
-	 * @param repository
-	 * @param address account's address
-	 * @return account's lastReference, or null if account unknown, or lastReference not set
-	 * @throws DataException
-	 */
-	/*package*/ static byte[] getLastReference(Repository repository, String address) throws DataException {
-		RefCache refCache;
-
-		synchronized (CACHE) {
-			refCache = CACHE.get(repository);
-		}
-
-		if (refCache == null)
-			return repository.getAccountRepository().getLastReference(address);
-
-		return refCache.getLastReference(repository, address);
-	}
-
-	/**
-	 * Sets lastReference value for account.
-	 * <p>
-	 * If cache is not in effect for passed <tt>repository</tt> handle,
-	 * then this method sets lastReference directly in repository.
-	 * <p>
-	 * If cache <i>is</i> in effect, then this method caches the new
-	 * lastReference, which is <b>not</b> returned by calls to
-	 * <tt>getLastReference</tt>.
-	 * <p>
-	 * Typically called by corresponding method in Account class.
-	 * 
-	 * @param repository
-	 * @param accountData
-	 * @throws DataException
-	 */
-	/*package*/ static void setLastReference(Repository repository, AccountData accountData) throws DataException {
-		RefCache refCache;
-
-		synchronized (CACHE) {
-			refCache = CACHE.get(repository);
-		}
-
-		if (refCache == null) {
-			repository.getAccountRepository().setLastReference(accountData);
-			return;
-		}
-
-		refCache.setLastReference(accountData);
-	}
-
-}
--- a/src/main/java/org/qortal/account/GenesisAccount.java
+++ b/src/main/java/org/qortal/account/GenesisAccount.java
@@ -0,0 +1,13 @@
+package org.qortal.account;
+
+import org.qortal.repository.Repository;
+
+public final class GenesisAccount extends PublicKeyAccount {
+
+	public static final byte[] PUBLIC_KEY = new byte[] { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	public GenesisAccount(Repository repository) {
+		super(repository, PUBLIC_KEY);
+	}
+
+}
--- a/src/main/java/org/qortal/account/NullAccount.java
+++ b/src/main/java/org/qortal/account/NullAccount.java
@@ -1,24 +0,0 @@
-package org.qortal.account;
-
-import org.qortal.crypto.Crypto;
-import org.qortal.repository.Repository;
-
-public final class NullAccount extends PublicKeyAccount {
-
-	public static final byte[] PUBLIC_KEY = new byte[32];
-	public static final String ADDRESS = Crypto.toAddress(PUBLIC_KEY);
-
-	public NullAccount(Repository repository) {
-		super(repository, PUBLIC_KEY, ADDRESS);
-	}
-
-	protected NullAccount() {
-	}
-
-	@Override
-	public boolean verify(byte[] signature, byte[] message) {
-		// Can't sign, hence can't verify.
-		return false;
-	}
-
-}
--- a/src/main/java/org/qortal/account/PrivateKeyAccount.java
+++ b/src/main/java/org/qortal/account/PrivateKeyAccount.java
@@ -2,11 +2,18 @@ package org.qortal.account;

 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
+import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
+import org.bouncycastle.crypto.params.X25519PublicKeyParameters;
+import org.bouncycastle.math.ec.rfc8032.Ed25519;
+import org.qortal.crypto.BouncyCastle25519;
 import org.qortal.crypto.Crypto;
 import org.qortal.repository.Repository;

 public class PrivateKeyAccount extends PublicKeyAccount {

+	private static final int SIGNATURE_LENGTH = 64;
+	private static final int SHARED_SECRET_LENGTH = 32;
+
 	private final byte[] privateKey;
 	private final Ed25519PrivateKeyParameters edPrivateKeyParams;

@@ -42,11 +49,24 @@ public class PrivateKeyAccount extends PublicKeyAccount {
 	}

 	public byte[] sign(byte[] message) {
-		return Crypto.sign(this.edPrivateKeyParams, message);
+		byte[] signature = new byte[SIGNATURE_LENGTH];
+
+		this.edPrivateKeyParams.sign(Ed25519.Algorithm.Ed25519, edPublicKeyParams, null, message, 0, message.length, signature, 0);
+
+		return signature;
 	}

 	public byte[] getSharedSecret(byte[] publicKey) {
-		return Crypto.getSharedSecret(this.privateKey, publicKey);
+		byte[] x25519PrivateKey = BouncyCastle25519.toX25519PrivateKey(this.privateKey);
+		X25519PrivateKeyParameters xPrivateKeyParams = new X25519PrivateKeyParameters(x25519PrivateKey, 0);
+
+		byte[] x25519PublicKey = BouncyCastle25519.toX25519PublicKey(publicKey);
+		X25519PublicKeyParameters xPublicKeyParams = new X25519PublicKeyParameters(x25519PublicKey, 0);
+
+		byte[] sharedSecret = new byte[SHARED_SECRET_LENGTH];
+		xPrivateKeyParams.generateSecret(xPublicKeyParams, sharedSecret, 0);
+
+		return sharedSecret;
 	}

 	public byte[] getRewardSharePrivateKey(byte[] publicKey) {
--- a/src/main/java/org/qortal/account/PublicKeyAccount.java
+++ b/src/main/java/org/qortal/account/PublicKeyAccount.java
@@ -1,6 +1,7 @@
 package org.qortal.account;

 import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
+import org.bouncycastle.math.ec.rfc8032.Ed25519;
 import org.qortal.crypto.Crypto;
 import org.qortal.data.account.AccountData;
 import org.qortal.repository.Repository;
@@ -21,18 +22,6 @@ public class PublicKeyAccount extends Account {
 		this.publicKey = edPublicKeyParams.getEncoded();
 	}

-	protected PublicKeyAccount(Repository repository, byte[] publicKey, String address) {
-		super(repository, address);
-
-		this.publicKey = publicKey;
-		this.edPublicKeyParams = null;
-	}
-
-	protected PublicKeyAccount() {
-		this.publicKey = null;
-		this.edPublicKeyParams = null;
-	}
-
 	public byte[] getPublicKey() {
 		return this.publicKey;
 	}
@@ -45,7 +34,15 @@ public class PublicKeyAccount extends Account {
 	}

 	public boolean verify(byte[] signature, byte[] message) {
-		return Crypto.verify(this.publicKey, signature, message);
+		return PublicKeyAccount.verify(this.publicKey, signature, message);
+	}
+
+	public static boolean verify(byte[] publicKey, byte[] signature, byte[] message) {
+		try {
+			return Ed25519.verify(signature, 0, publicKey, 0, message, 0, message.length);
+		} catch (Exception e) {
+			return false;
+		}
 	}

 	public static String getAddress(byte[] publicKey) {
--- a/src/main/java/org/qortal/api/AmountTypeAdapter.java
+++ b/src/main/java/org/qortal/api/AmountTypeAdapter.java
@@ -1,27 +0,0 @@
-package org.qortal.api;
-
-import java.math.BigDecimal;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.qortal.utils.Amounts;
-
-public class AmountTypeAdapter extends XmlAdapter<String, Long> {
-
-	@Override
-	public Long unmarshal(String input) throws Exception {
-		if (input == null)
-			return null;
-
-		return new BigDecimal(input).setScale(8).unscaledValue().longValue();
-	}
-
-	@Override
-	public String marshal(Long output) throws Exception {
-		if (output == null)
-			return null;
-
-		return Amounts.prettyAmount(output);
-	}
-
-}
--- a/src/main/java/org/qortal/api/ApiError.java
+++ b/src/main/java/org/qortal/api/ApiError.java
@@ -5,17 +5,11 @@ 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;
-
-@XmlAccessorType(XmlAccessType.NONE)
-@XmlRootElement
 public enum ApiError {
 	// COMMON
 	// UNKNOWN(0, 500),
 	JSON(1, 400),
-	INSUFFICIENT_BALANCE(2, 402),
+	// NO_BALANCE(2, 422),
 	// NOT_YET_RELEASED(3, 422),
 	UNAUTHORIZED(4, 403),
 	REPOSITORY_ISSUE(5, 500),
@@ -124,19 +118,7 @@ public enum ApiError {
 	// MESSAGESIZE_EXCEEDED(1004, 400),

 	// Groups
-	GROUP_UNKNOWN(1101, 404),
-
-	// Foreign blockchain
-	FOREIGN_BLOCKCHAIN_NETWORK_ISSUE(1201, 500),
-	FOREIGN_BLOCKCHAIN_BALANCE_ISSUE(1202, 402),
-	FOREIGN_BLOCKCHAIN_TOO_SOON(1203, 408),
-
-	// Trade portal
-	ORDER_SIZE_TOO_SMALL(1300, 402),
-
-	// Data
-	FILE_NOT_FOUND(1401, 404),
-	NO_REPLY(1402, 404);
+	GROUP_UNKNOWN(1101, 404);

 	private static final Map<Integer, ApiError> map = stream(ApiError.values()).collect(toMap(apiError -> apiError.code, apiError -> apiError));

@@ -164,4 +146,4 @@ public enum ApiError {
 		return this.status;
 	}

-}
+}
--- a/src/main/java/org/qortal/api/ApiErrorHandler.java
+++ b/src/main/java/org/qortal/api/ApiErrorHandler.java
@@ -3,7 +3,6 @@ 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;

@@ -18,7 +17,7 @@ public class ApiErrorHandler extends ErrorHandler {
 	private static final Logger LOGGER = LogManager.getLogger(ApiErrorHandler.class);

 	@Override
-	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
 		if (Settings.getInstance().isApiLoggingEnabled()) {
 			String requestURI = request.getRequestURI();

--- a/src/main/java/org/qortal/api/ApiErrorRoot.java
+++ b/src/main/java/org/qortal/api/ApiErrorRoot.java
@@ -1,20 +0,0 @@
-package org.qortal.api;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-public class ApiErrorRoot {
-
-	private ApiError apiError;
-
-	@XmlJavaTypeAdapter(ApiErrorTypeAdapter.class)
-	@XmlElement(name = "error")
-	public ApiError getApiError() {
-		return this.apiError;
-	}
-
-	public void setApiError(ApiError apiError) {
-		this.apiError = apiError;
-	}
-
-}
--- a/src/main/java/org/qortal/api/ApiErrorTypeAdapter.java
+++ b/src/main/java/org/qortal/api/ApiErrorTypeAdapter.java
@@ -1,32 +0,0 @@
-package org.qortal.api;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class ApiErrorTypeAdapter extends XmlAdapter<ApiErrorTypeAdapter.AdaptedApiError, ApiError> {
-
-	public static class AdaptedApiError {
-		public int code;
-		public String description;
-	}
-
-	@Override
-	public ApiError unmarshal(AdaptedApiError adaptedInput) throws Exception {
-		if (adaptedInput == null)
-			return null;
-
-		return ApiError.fromCode(adaptedInput.code);
-	}
-
-	@Override
-	public AdaptedApiError marshal(ApiError output) throws Exception {
-		if (output == null)
-			return null;
-
-		AdaptedApiError adaptedOutput = new AdaptedApiError();
-		adaptedOutput.code = output.getCode();
-		adaptedOutput.description = output.name();
-
-		return adaptedOutput;
-	}
-
-}
--- a/src/main/java/org/qortal/api/ApiExceptionFactory.java
+++ b/src/main/java/org/qortal/api/ApiExceptionFactory.java
@@ -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);
-	}
-
 }
--- a/src/main/java/org/qortal/api/ApiKey.java
+++ b/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;
-    }
-
-}
--- a/src/main/java/org/qortal/api/ApiService.java
+++ b/src/main/java/org/qortal/api/ApiService.java
@@ -2,32 +2,15 @@ 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.checkerframework.checker.units.qual.A;
-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.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;
@@ -35,18 +18,10 @@ 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.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;

 public class ApiService {
@@ -55,7 +30,6 @@ public class ApiService {

 	private final ResourceConfig config;
 	private Server server;
-	private ApiKey apiKey;

 	private ApiService() {
 		this.config = new ResourceConfig();
@@ -76,69 +50,12 @@ 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
-
-			// 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().getApiPort());
-
-				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(Settings.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getApiPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Settings.getInstance().getBindAddress());
-				InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getApiPort());
-				this.server = new Server(endpoint);
-			}
+			InetAddress bindAddr = InetAddress.getByName(Settings.getInstance().getBindAddress());
+			InetSocketAddress endpoint = new InetSocketAddress(bindAddr, Settings.getInstance().getApiPort());
+			this.server = new Server(endpoint);

 			// Error handler
 			ErrorHandler errorHandler = new ApiErrorHandler();
@@ -206,14 +123,6 @@ public class ApiService {
 				rewriteHandler.addRule(new RedirectPatternRule("/api-documentation", "/api-documentation/")); // redirect to add trailing slash if missing
 			}

-			context.addServlet(AdminStatusWebSocket.class, "/websockets/admin/status");
-			context.addServlet(BlocksWebSocket.class, "/websockets/blocks");
-			context.addServlet(ActiveChatsWebSocket.class, "/websockets/chat/active/*");
-			context.addServlet(ChatMessagesWebSocket.class, "/websockets/chat/messages");
-			context.addServlet(TradeOffersWebSocket.class, "/websockets/crosschain/tradeoffers");
-			context.addServlet(TradeBotWebSocket.class, "/websockets/crosschain/tradebot");
-			context.addServlet(PresenceWebSocket.class, "/websockets/presence");
-
 			// Start server
 			this.server.start();
 		} catch (Exception e) {
--- a/src/main/java/org/qortal/api/Base58TypeAdapter.java
+++ b/src/main/java/org/qortal/api/Base58TypeAdapter.java
@@ -2,7 +2,7 @@ package org.qortal.api;

 import javax.xml.bind.annotation.adapters.XmlAdapter;

-import org.qortal.utils.Base58;
+import org.bitcoinj.core.Base58;

 public class Base58TypeAdapter extends XmlAdapter<String, byte[]> {

--- a/src/main/java/org/qortal/api/DomainMapService.java
+++ b/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.rewrite.handler.RewritePatternRule;
-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.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.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("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().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(Settings.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getDomainMapPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Settings.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;
-	}
-
-}
--- a/src/main/java/org/qortal/api/GatewayService.java
+++ b/src/main/java/org/qortal/api/GatewayService.java
@@ -1,170 +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.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.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("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().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(Settings.getInstance().getBindAddress());
-				portUnifiedConnector.setPort(Settings.getInstance().getGatewayPort());
-
-				this.server.addConnector(portUnifiedConnector);
-			} else {
-				// Non-SSL
-				InetAddress bindAddr = InetAddress.getByName(Settings.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;
-	}
-
-}
--- a/src/main/java/org/qortal/api/HTMLParser.java
+++ b/src/main/java/org/qortal/api/HTMLParser.java
@@ -1,46 +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;
-
-public class HTMLParser {
-
-    private static final Logger LOGGER = LogManager.getLogger(HTMLParser.class);
-
-    private String linkPrefix;
-    private byte[] data;
-
-    public HTMLParser(String resourceId, String inPath, String prefix, boolean usePrefix, byte[] data) {
-        String inPathWithoutFilename = inPath.substring(0, inPath.lastIndexOf('/'));
-        this.linkPrefix = usePrefix ? String.format("%s/%s%s", prefix, resourceId, inPathWithoutFilename) : "";
-        this.data = data;
-    }
-
-    public void addAdditionalHeaderTags() {
-        String fileContents = new String(data);
-        Document document = Jsoup.parse(fileContents);
-        String baseUrl = this.linkPrefix + "/";
-        Elements head = document.getElementsByTag("head");
-        if (!head.isEmpty()) {
-            // Add base href tag
-            String baseElement = String.format("<base href=\"%s\">", baseUrl);
-            head.get(0).prepend(baseElement);
-        }
-        String html = document.html();
-        this.data = html.getBytes();
-    }
-
-    public static boolean isHtmlFile(String path) {
-        if (path.endsWith(".html") || path.endsWith(".htm")) {
-            return true;
-        }
-        return false;
-    }
-
-    public byte[] getData() {
-        return this.data;
-    }
-}
--- a/src/main/java/org/qortal/api/RewardSharePercentTypeAdapter.java
+++ b/src/main/java/org/qortal/api/RewardSharePercentTypeAdapter.java
@@ -1,25 +0,0 @@
-package org.qortal.api;
-
-import java.math.BigDecimal;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class RewardSharePercentTypeAdapter extends XmlAdapter<String, Integer> {
-
-	@Override
-	public Integer unmarshal(String input) throws Exception {
-		if (input == null)
-			return null;
-
-		return new BigDecimal(input).setScale(2).unscaledValue().intValue();
-	}
-
-	@Override
-	public String marshal(Integer output) throws Exception {
-		if (output == null)
-			return null;
-
-		return String.format("%d.%02d", output / 100, Math.abs(output % 100));
-	}
-
-}
--- a/src/main/java/org/qortal/api/Security.java
+++ b/src/main/java/org/qortal/api/Security.java
@@ -1,111 +1,22 @@
 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 java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;

 import javax.servlet.http.HttpServletRequest;

-public abstract class Security {
-
-	public static final String API_KEY_HEADER = "X-API-KEY";
+public class Security {

+	// TODO: replace with proper authentication
 	public static void checkApiCallAllowed(HttpServletRequest request) {
-		// 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
-			}
-		}
-
-		// 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
-		String 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()) {
-				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);
 		}
+
+		if (!remoteAddr.isLoopbackAddress())
+			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) {
-		try {
-			Security.checkApiCallAllowed(request);
-
-		} 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;
-	}
-
 }
--- a/src/main/java/org/qortal/api/domainmap/resource/DomainMapResource.java
+++ b/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 = "Gateway")
-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, inPath, null, "", false, false);
-        }
-        return ArbitraryDataRenderer.getResponse(response, 404, "Error 404: File Not Found");
-    }
-
-    private HttpServletResponse get(String resourceId, ResourceIdType resourceIdType, Service service, String inPath,
-                                    String secret58, String prefix, boolean usePrefix, boolean async) {
-
-        ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(resourceId, resourceIdType, service, inPath,
-                secret58, prefix, usePrefix, async, request, response, context);
-        return renderer.render();
-    }
-
-}
--- a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java
+++ b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java
@@ -1,126 +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.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 javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-
-
-@Path("/")
-@Tag(name = "Gateway")
-public class GatewayResource {
-
-    @Context HttpServletRequest request;
-    @Context HttpServletResponse response;
-    @Context ServletContext context;
-
-    /**
-     * We need to allow resource status checking (and building) via the gateway, as the node's API port
-     * may not be forwarded and will almost certainly not be authenticated. Since gateways allow for
-     * all resources to be loaded except those that are blocked, there is no need for authentication.
-     */
-    @GET
-    @Path("/arbitrary/resource/status/{service}/{name}")
-    public ArbitraryResourceStatus getDefaultResourceStatus(@PathParam("service") Service service,
-                                                             @PathParam("name") String name,
-                                                             @QueryParam("build") Boolean build) {
-
-        return this.getStatus(service, name, null, build);
-    }
-
-    @GET
-    @Path("/arbitrary/resource/status/{service}/{name}/{identifier}")
-    public ArbitraryResourceStatus getResourceStatus(@PathParam("service") Service service,
-                                                      @PathParam("name") String name,
-                                                      @PathParam("identifier") String identifier,
-                                                      @QueryParam("build") Boolean build) {
-
-        return this.getStatus(service, name, identifier, build);
-    }
-
-    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 == true) {
-            ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, null);
-            try {
-                if (!reader.isBuilding()) {
-                    reader.loadSynchronously(false);
-                }
-            } catch (Exception e) {
-                // No need to handle exception, as it will be reflected in the status
-            }
-        }
-
-        ArbitraryDataResource resource = new ArbitraryDataResource(name, ResourceIdType.NAME, service, identifier);
-        return resource.getStatus(false);
-    }
-
-
-    @GET
-    public HttpServletResponse getRoot() {
-        return ArbitraryDataRenderer.getResponse(response, 200, "");
-    }
-
-
-    @GET
-    @Path("{name}/{path:.*}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getPathByName(@PathParam("name") String name,
-                                             @PathParam("path") String inPath) {
-        // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
-        Security.disallowLoopbackRequests(request);
-        return this.get(name, ResourceIdType.NAME, Service.WEBSITE, inPath, null, "", true, true);
-    }
-
-    @GET
-    @Path("{name}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getIndexByName(@PathParam("name") String name) {
-        // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
-        Security.disallowLoopbackRequests(request);
-        return this.get(name, ResourceIdType.NAME, Service.WEBSITE, "/", null, "", true, true);
-    }
-
-
-    // Optional /site alternative for backwards support
-
-    @GET
-    @Path("/site/{name}/{path:.*}")
-    public HttpServletResponse getSitePathByName(@PathParam("name") String name,
-                                                 @PathParam("path") String inPath) {
-        // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
-        Security.disallowLoopbackRequests(request);
-        return this.get(name, ResourceIdType.NAME, Service.WEBSITE, inPath, null, "/site", true, true);
-    }
-
-    @GET
-    @Path("/site/{name}")
-    public HttpServletResponse getSiteIndexByName(@PathParam("name") String name) {
-        // Block requests from localhost, to prevent websites/apps from running javascript that fetches unvetted data
-        Security.disallowLoopbackRequests(request);
-        return this.get(name, ResourceIdType.NAME, Service.WEBSITE, "/", null, "/site", true, true);
-    }
-
-    
-    private HttpServletResponse get(String resourceId, ResourceIdType resourceIdType, Service service, String inPath,
-                                    String secret58, String prefix, boolean usePrefix, boolean async) {
-
-        ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(resourceId, resourceIdType, service, inPath,
-                secret58, prefix, usePrefix, async, request, response, context);
-        return renderer.render();
-    }
-
-}
--- a/src/main/java/org/qortal/api/model/ActivitySummary.java
+++ b/src/main/java/org/qortal/api/model/ActivitySummary.java
@@ -1,6 +1,5 @@
 package org.qortal.api.model;

-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;

@@ -14,61 +13,17 @@ import org.qortal.transaction.Transaction.TransactionType;
@XmlAccessorType(XmlAccessType.FIELD)
 public class ActivitySummary {

-	private int blockCount;
-	private int assetsIssued;
-	private int namesRegistered;
+	public int blockCount;
+	public int transactionCount;
+	public int assetsIssued;
+	public int namesRegistered;

 	// Assuming TransactionType values are contiguous so 'length' equals count
 	@XmlJavaTypeAdapter(TransactionCountMapXmlAdapter.class)
-	private Map<TransactionType, Integer> transactionCountByType = new EnumMap<>(TransactionType.class);
-	private int totalTransactionCount = 0;
+	public Map<TransactionType, Integer> transactionCountByType = new EnumMap<>(TransactionType.class);

 	public ActivitySummary() {
 		// Needed for JAXB
 	}

-	public int getBlockCount() {
-		return this.blockCount;
-	}
-
-	public void setBlockCount(int blockCount) {
-		this.blockCount = blockCount;
-	}
-
-	public int getTotalTransactionCount() {
-		return this.totalTransactionCount;
-	}
-
-	public int getAssetsIssued() {
-		return this.assetsIssued;
-	}
-
-	public void setAssetsIssued(int assetsIssued) {
-		this.assetsIssued = assetsIssued;
-	}
-
-	public int getNamesRegistered() {
-		return this.namesRegistered;
-	}
-
-	public void setNamesRegistered(int namesRegistered) {
-		this.namesRegistered = namesRegistered;
-	}
-
-	public Map<TransactionType, Integer> getTransactionCountByType() {
-		return Collections.unmodifiableMap(this.transactionCountByType);
-	}
-
-	public void setTransactionCountByType(TransactionType transactionType, int transactionCount) {
-		this.transactionCountByType.put(transactionType, transactionCount);
-
-		this.totalTransactionCount = this.transactionCountByType.values().stream().mapToInt(Integer::intValue).sum();
-	}
-
-	public void setTransactionCountByType(Map<TransactionType, Integer> transactionCountByType) {
-		this.transactionCountByType = new EnumMap<>(transactionCountByType);
-
-		this.totalTransactionCount = this.transactionCountByType.values().stream().mapToInt(Integer::intValue).sum();
-	}
-
 }
--- a/src/main/java/org/qortal/api/model/AggregatedOrder.java
+++ b/src/main/java/org/qortal/api/model/AggregatedOrder.java
@@ -1,10 +1,11 @@
 package org.qortal.api.model;

+import java.math.BigDecimal;
+
 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;

@@ -28,14 +29,12 @@ public class AggregatedOrder {
 	}

 	@XmlElement(name = "price")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long getPrice() {
+	public BigDecimal getPrice() {
 		return this.orderData.getPrice();
 	}

 	@XmlElement(name = "unfulfilled")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long getUnfulfilled() {
+	public BigDecimal getUnfulfilled() {
 		return this.orderData.getAmount();
 	}

--- a/src/main/java/org/qortal/api/model/BlockMinterSummary.java
+++ b/src/main/java/org/qortal/api/model/BlockMinterSummary.java
@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import org.qortal.crypto.Crypto;

@XmlAccessorType(XmlAccessType.FIELD)
-public class BlockSignerSummary {
+public class BlockMinterSummary {

 	// Properties

@@ -20,19 +20,19 @@ public class BlockSignerSummary {

 	// Constructors

-	protected BlockSignerSummary() {
+	protected BlockMinterSummary() {
 	}

-	/** Constructs BlockSignerSummary in non-reward-share context. */
-	public BlockSignerSummary(byte[] blockMinterPublicKey, int blockCount) {
+	/** Constructs BlockMinterSummary in non-reward-share context. */
+	public BlockMinterSummary(byte[] blockMinterPublicKey, int blockCount) {
 		this.blockCount = blockCount;

 		this.mintingAccountPublicKey = blockMinterPublicKey;
 		this.mintingAccount = Crypto.toAddress(this.mintingAccountPublicKey);
 	}

-	/** Constructs BlockSignerSummary in reward-share context. */
-	public BlockSignerSummary(byte[] rewardSharePublicKey, int blockCount, byte[] mintingAccountPublicKey, String minterAccount, String recipientAccount) {
+	/** Constructs BlockMinterSummary in reward-share context. */
+	public BlockMinterSummary(byte[] rewardSharePublicKey, int blockCount, byte[] mintingAccountPublicKey, String minterAccount, String recipientAccount) {
 		this.rewardSharePublicKey = rewardSharePublicKey;
 		this.blockCount = blockCount;

--- a/src/main/java/org/qortal/api/model/BlockMintingInfo.java
+++ b/src/main/java/org/qortal/api/model/BlockMintingInfo.java
@@ -1,23 +0,0 @@
-package org.qortal.api.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class BlockMintingInfo {
-
-	public byte[] minterPublicKey;
-	public int minterLevel;
-	public int onlineAccountsCount;
-	public BigDecimal maxDistance;
-	public BigInteger keyDistance;
-	public double keyDistanceRatio;
-	public long timestamp;
-	public long timeDelta;
-
-	public BlockMintingInfo() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/ConnectedPeer.java
+++ b/src/main/java/org/qortal/api/model/ConnectedPeer.java
@@ -1,74 +1,61 @@
 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 org.qortal.data.network.PeerChainTipData;
 import org.qortal.data.network.PeerData;
 import org.qortal.network.Handshake;
 import org.qortal.network.Peer;

-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
+import io.swagger.v3.oas.annotations.media.Schema;

@XmlAccessorType(XmlAccessType.FIELD)
 public class ConnectedPeer {

-    public enum Direction {
-        INBOUND,
-        OUTBOUND;
-    }
+	public enum Direction {
+		INBOUND,
+		OUTBOUND;
+	}
+	public Direction direction;
+	public Handshake handshakeStatus;
+	public Long lastPing;
+	public Long connectedWhen;
+	public Long peersConnectedWhen;

-    public Direction direction;
-    public Handshake handshakeStatus;
-    public Long lastPing;
-    public Long connectedWhen;
-    public Long peersConnectedWhen;
+	public String address;
+	public String version;
+	public Long buildTimestamp;

-    public String address;
-    public String version;
+	public Integer lastHeight;
+	@Schema(example = "base58")
+	public byte[] lastBlockSignature;
+	public Long lastBlockTimestamp;

-    public String nodeId;
+	protected ConnectedPeer() {
+	}

-    public Integer lastHeight;
-    @Schema(example = "base58")
-    public byte[] lastBlockSignature;
-    public Long lastBlockTimestamp;
-    public UUID connectionId;
-    public String age;
+	public ConnectedPeer(Peer peer) {
+		this.direction = peer.isOutbound() ? Direction.OUTBOUND : Direction.INBOUND;
+		this.handshakeStatus = peer.getHandshakeStatus();
+		this.lastPing = peer.getLastPing();

-    protected ConnectedPeer() {
-    }
+		PeerData peerData = peer.getPeerData();
+		this.connectedWhen = peer.getConnectionTimestamp();
+		this.peersConnectedWhen = peer.getPeersConnectionTimestamp();

-    public ConnectedPeer(Peer peer) {
-        this.direction = peer.isOutbound() ? Direction.OUTBOUND : Direction.INBOUND;
-        this.handshakeStatus = peer.getHandshakeStatus();
-        this.lastPing = peer.getLastPing();
+		this.address = peerData.getAddress().toString();
+		if (peer.getVersionMessage() != null) {
+			this.version = peer.getVersionMessage().getVersionString();
+			this.buildTimestamp = peer.getVersionMessage().getBuildTimestamp();
+		}

-        PeerData peerData = peer.getPeerData();
-        this.connectedWhen = peer.getConnectionTimestamp();
-        this.peersConnectedWhen = peer.getPeersConnectionTimestamp();
-
-        this.address = peerData.getAddress().toString();
-
-        this.version = peer.getPeersVersionString();
-        this.nodeId = peer.getPeersNodeId();
-        this.connectionId = peer.getPeerConnectionId();
-        if (peer.getConnectionEstablishedTime() > 0) {
-            long age = (System.currentTimeMillis() - peer.getConnectionEstablishedTime());
-            long minutes = TimeUnit.MILLISECONDS.toMinutes(age);
-            long seconds = TimeUnit.MILLISECONDS.toSeconds(age) - TimeUnit.MINUTES.toSeconds(minutes);
-            this.age = String.format("%dm %ds", minutes, seconds);
-        } else {
-            this.age = "connecting...";
-        }
-
-        PeerChainTipData peerChainTipData = peer.getChainTipData();
-        if (peerChainTipData != null) {
-            this.lastHeight = peerChainTipData.getLastHeight();
-            this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
-            this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp();
-        }
-    }
+		PeerChainTipData peerChainTipData = peer.getChainTipData();
+		if (peerChainTipData != null) {
+			this.lastHeight = peerChainTipData.getLastHeight();
+			this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
+			this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp();
+		}
+	}

 }
--- a/src/main/java/org/qortal/api/model/CrossChainBitcoinRedeemRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainBitcoinRedeemRequest.java
@@ -1,34 +0,0 @@
-package org.qortal.api.model;
-
-import java.math.BigDecimal;
-
-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 CrossChainBitcoinRedeemRequest {
-
-	@Schema(description = "Bitcoin HASH160(public key) for refund", example = "2nGDBPPPFS1c9w1h33YwFk4KUJU2")
-	public byte[] refundPublicKeyHash;
-
-	@Schema(description = "Bitcoin PRIVATE KEY for redeem", example = "cUvGNSnu14q6Hr1X7TESjYVTqBpFjj8GGLGjGdpJwD9NhSQKeYUk")
-	public byte[] redeemPrivateKey;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	@Schema(description = "Bitcoin miner fee", example = "0.00001000")
-	public BigDecimal bitcoinMinerFee;
-
-	@Schema(description = "32-byte secret", example = "6gVbAXCVzJXAWwtAVGAfgAkkXpeXvPUwSciPmCfSfXJG")
-	public byte[] secret;
-
-	@Schema(description = "Bitcoin HASH160(public key) for receiving funds, or omit to derive from private key", example = "u17kBVKkKSp12oUzaxFwNnq1JZf")
-	public byte[] receivingAccountInfo;
-
-	public CrossChainBitcoinRedeemRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainBitcoinRefundRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainBitcoinRefundRequest.java
@@ -1,31 +0,0 @@
-package org.qortal.api.model;
-
-import java.math.BigDecimal;
-
-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 CrossChainBitcoinRefundRequest {
-
-	@Schema(description = "Bitcoin PRIVATE KEY for refund", example = "cSP3zTb6bfm8GATtAcEJ8LqYtNQmzZ9jE2wQUVnZGiBzojDdrwKV")
-	public byte[] refundPrivateKey;
-
-	@Schema(description = "Bitcoin HASH160(public key) for redeem", example = "2daMveGc5pdjRyFacbxBzMksCbyC")
-	public byte[] redeemPublicKeyHash;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	@Schema(description = "Bitcoin miner fee", example = "0.00001000")
-	public BigDecimal bitcoinMinerFee;
-
-	@Schema(description = "Bitcoin HASH160(public key) for receiving funds, or omit to derive from private key", example = "u17kBVKkKSp12oUzaxFwNnq1JZf")
-	public byte[] receivingAccountInfo;
-
-	public CrossChainBitcoinRefundRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainBitcoinTemplateRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainBitcoinTemplateRequest.java
@@ -1,23 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	@Schema(description = "Bitcoin HASH160(public key) for refund", example = "2nGDBPPPFS1c9w1h33YwFk4KUJU2")
-	public byte[] refundPublicKeyHash;
-
-	@Schema(description = "Bitcoin HASH160(public key) for redeem", example = "2daMveGc5pdjRyFacbxBzMksCbyC")
-	public byte[] redeemPublicKeyHash;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	public CrossChainBitcoinTemplateRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainBitcoinyHTLCStatus.java
+++ b/src/main/java/org/qortal/api/model/CrossChainBitcoinyHTLCStatus.java
@@ -1,31 +0,0 @@
-package org.qortal.api.model;
-
-import java.math.BigDecimal;
-
-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 CrossChainBitcoinyHTLCStatus {
-
-	@Schema(description = "P2SH address", example = "3CdH27kTpV8dcFHVRYjQ8EEV5FJg9X8pSJ (mainnet), 2fMiRRXVsxhZeyfum9ifybZvaMHbQTmwdZw (testnet)")
-	public String bitcoinP2shAddress;
-
-	@Schema(description = "P2SH balance")
-	public BigDecimal bitcoinP2shBalance;
-
-	@Schema(description = "Can HTLC redeem yet?")
-	public boolean canRedeem;
-
-	@Schema(description = "Can HTLC refund yet?")
-	public boolean canRefund;
-
-	@Schema(description = "Secret used by HTLC redeemer")
-	public byte[] secret;
-
-	public CrossChainBitcoinyHTLCStatus() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainBuildRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainBuildRequest.java
@@ -1,39 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	@Schema(description = "AT creator's public key", example = "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry")
-	public byte[] creatorPublicKey;
-
-	@Schema(description = "Final QORT amount paid out on successful trade", example = "80.40200000")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long qortAmount;
-
-	@Schema(description = "QORT amount funding AT, including covering AT execution fees", example = "123.45670000")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long fundingQortAmount;
-
-	@Schema(description = "HASH160 of creator's Bitcoin public key", example = "2daMveGc5pdjRyFacbxBzMksCbyC")
-	public byte[] bitcoinPublicKeyHash;
-
-	@Schema(description = "HASH160 of secret", example = "43vnftqkjxrhb5kJdkU1ZFQLEnWV")
-	public byte[] hashOfSecretB;
-
-	@Schema(description = "Bitcoin P2SH BTC balance for release of secret", example = "0.00864200")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long bitcoinAmount;
-
-	@Schema(description = "Trade time window (minutes) from trade agreement to automatic refund", example = "10080")
-	public Integer tradeTimeout;
-
-	public CrossChainBuildRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainCancelRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainCancelRequest.java
@@ -1,20 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	@Schema(description = "AT creator's public key", example = "K6wuddsBV3HzRrXFFezE7P5MoRXp5m3mEDokRDGZB6ry")
-	public byte[] creatorPublicKey;
-
-	@Schema(description = "Qortal trade AT address")
-	public String atAddress;
-
-	public CrossChainCancelRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainDualSecretRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainDualSecretRequest.java
@@ -1,29 +0,0 @@
-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;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CrossChainDualSecretRequest {
-
-	@Schema(description = "Public key to match AT's trade 'partner'", example = "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry")
-	public byte[] partnerPublicKey;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	@Schema(description = "secret-A (32 bytes)", example = "FHMzten4he9jZ4HGb4297Utj6F5g2w7serjq2EnAg2s1")
-	public byte[] secretA;
-
-	@Schema(description = "secret-B (32 bytes)", example = "EN2Bgx3BcEMtxFCewmCVSMkfZjVKYhx3KEXC5A21KBGx")
-	public byte[] secretB;
-
-	@Schema(description = "Qortal address for receiving QORT from AT")
-	public String receivingAddress;
-
-	public CrossChainDualSecretRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainOfferSummary.java
+++ b/src/main/java/org/qortal/api/model/CrossChainOfferSummary.java
@@ -1,127 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	// Properties
-
-	@Schema(description = "AT's Qortal address")
-	private String qortalAtAddress;
-
-	@Schema(description = "AT creator's Qortal address")
-	private String qortalCreator;
-
-	@Schema(description = "AT creator's ephemeral trading key-pair represented as Qortal address")
-	private String qortalCreatorTradeAddress;
-
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private long qortAmount;
-
-	@Schema(description = "Bitcoin amount - DEPRECATED: use foreignAmount")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	@Deprecated
-	private long btcAmount;
-
-	@Schema(description = "Foreign blockchain amount")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private long foreignAmount;
-
-	@Schema(description = "Suggested trade timeout (minutes)", example = "10080")
-	private int tradeTimeout;
-
-	@Schema(description = "Current AT execution mode")
-	private AcctMode mode;
-
-	private long timestamp;
-
-	@Schema(description = "Trade partner's Qortal receiving address")
-	private String partnerQortalReceivingAddress;
-
-	private String foreignBlockchain;
-
-	private String acctName;
-
-	protected CrossChainOfferSummary() {
-		/* For JAXB */
-	}
-
-	public CrossChainOfferSummary(CrossChainTradeData crossChainTradeData, long timestamp) {
-		this.qortalAtAddress = crossChainTradeData.qortalAtAddress;
-		this.qortalCreator = crossChainTradeData.qortalCreator;
-		this.qortalCreatorTradeAddress = crossChainTradeData.qortalCreatorTradeAddress;
-		this.qortAmount = crossChainTradeData.qortAmount;
-		this.foreignAmount = crossChainTradeData.expectedForeignAmount;
-		this.btcAmount = this.foreignAmount; // Duplicate for deprecated field
-		this.tradeTimeout = crossChainTradeData.tradeTimeout;
-		this.mode = crossChainTradeData.mode;
-		this.timestamp = timestamp;
-		this.partnerQortalReceivingAddress = crossChainTradeData.qortalPartnerReceivingAddress;
-		this.foreignBlockchain = crossChainTradeData.foreignBlockchain;
-		this.acctName = crossChainTradeData.acctName;
-	}
-
-	public String getQortalAtAddress() {
-		return this.qortalAtAddress;
-	}
-
-	public String getQortalCreator() {
-		return this.qortalCreator;
-	}
-
-	public String getQortalCreatorTradeAddress() {
-		return this.qortalCreatorTradeAddress;
-	}
-
-	public long getQortAmount() {
-		return this.qortAmount;
-	}
-
-	public long getBtcAmount() {
-		return this.btcAmount;
-	}
-
-	public long getForeignAmount() {
-		return this.foreignAmount;
-	}
-
-	public int getTradeTimeout() {
-		return this.tradeTimeout;
-	}
-
-	public AcctMode getMode() {
-		return this.mode;
-	}
-
-	public long getTimestamp() {
-		return this.timestamp;
-	}
-
-	public String getPartnerQortalReceivingAddress() {
-		return this.partnerQortalReceivingAddress;
-	}
-
-	public String getForeignBlockchain() {
-		return this.foreignBlockchain;
-	}
-
-	public String getAcctName() {
-		return this.acctName;
-	}
-
-	// For debugging mostly
-
-	public String toString() {
-		return String.format("%s: %s", this.qortalAtAddress, this.mode);
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainSecretRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainSecretRequest.java
@@ -1,26 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	@Schema(description = "Private key to match AT's trade 'partner'", example = "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry")
-	public byte[] partnerPrivateKey;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	@Schema(description = "Secret (32 bytes)", example = "FHMzten4he9jZ4HGb4297Utj6F5g2w7serjq2EnAg2s1")
-	public byte[] secret;
-
-	@Schema(description = "Qortal address for receiving QORT from AT")
-	public String receivingAddress;
-
-	public CrossChainSecretRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainTradeRequest.java
+++ b/src/main/java/org/qortal/api/model/CrossChainTradeRequest.java
@@ -1,23 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	@Schema(description = "AT creator's 'trade' public key", example = "C6wuddsBV3HzRrXUtezE7P5MoRXp5m3mEDokRDGZB6ry")
-	public byte[] tradePublicKey;
-
-	@Schema(description = "Qortal AT address")
-	public String atAddress;
-
-	@Schema(description = "Signature of trading partner's 'offer' MESSAGE transaction")
-	public byte[] messageTransactionSignature;
-
-	public CrossChainTradeRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/CrossChainTradeSummary.java
+++ b/src/main/java/org/qortal/api/model/CrossChainTradeSummary.java
@@ -1,67 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	private long tradeTimestamp;
-
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private long qortAmount;
-
-	@Deprecated
-	@Schema(description = "DEPRECATED: use foreignAmount instead")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private long btcAmount;
-
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	private long foreignAmount;
-
-	private String atAddress;
-
-	private String sellerAddress;
-
-	private String buyerReceivingAddress;
-
-	protected CrossChainTradeSummary() {
-		/* For JAXB */
-	}
-
-	public CrossChainTradeSummary(CrossChainTradeData crossChainTradeData, long timestamp) {
-		this.tradeTimestamp = timestamp;
-		this.qortAmount = crossChainTradeData.qortAmount;
-		this.foreignAmount = crossChainTradeData.expectedForeignAmount;
-		this.btcAmount = this.foreignAmount;
-		this.sellerAddress = crossChainTradeData.qortalCreator;
-		this.buyerReceivingAddress = crossChainTradeData.qortalPartnerReceivingAddress;
-		this.atAddress = crossChainTradeData.qortalAtAddress;
-	}
-
-	public long getTradeTimestamp() {
-		return this.tradeTimestamp;
-	}
-
-	public long getQortAmount() {
-		return this.qortAmount;
-	}
-
-	public long getBtcAmount() {
-		return this.btcAmount;
-	}
-
-	public long getForeignAmount() { return this.foreignAmount; }
-
-	public String getAtAddress() { return this.atAddress; }
-
-	public String getSellerAddress() { return this.sellerAddress; }
-
-	public String getBuyerReceivingAddressAddress() { return this.buyerReceivingAddress; }
-}
--- a/src/main/java/org/qortal/api/model/ListRequest.java
+++ b/src/main/java/org/qortal/api/model/ListRequest.java
@@ -1,18 +0,0 @@
-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 java.util.List;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ListRequest {
-
-	@Schema(description = "A list of items")
-	public List<String> items;
-
-	public ListRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/NodeInfo.java
+++ b/src/main/java/org/qortal/api/model/NodeInfo.java
@@ -10,8 +10,6 @@ public class NodeInfo {
 	public long uptime;
 	public String buildVersion;
 	public long buildTimestamp;
-	public String nodeId;
-	public boolean isTestNet;

 	public NodeInfo() {
 	}
--- a/src/main/java/org/qortal/api/model/NodeStatus.java
+++ b/src/main/java/org/qortal/api/model/NodeStatus.java
@@ -3,32 +3,16 @@ package org.qortal.api.model;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

-import org.qortal.controller.Controller;
-import org.qortal.controller.Synchronizer;
-import org.qortal.network.Network;
-
@XmlAccessorType(XmlAccessType.FIELD)
 public class NodeStatus {

-	public final boolean isMintingPossible;
-	public final boolean isSynchronizing;
+	public boolean isMintingPossible;
+	public boolean isSynchronizing;

 	// Not always present
-	public final Integer syncPercent;
-
-	public final int numberOfConnections;
-
-	public final int height;
+	public Integer syncPercent;

 	public NodeStatus() {
-		this.isMintingPossible = Controller.getInstance().isMintingPossible();
-
-		this.syncPercent = Synchronizer.getInstance().getSyncPercent();
-		this.isSynchronizing = this.syncPercent != null;
-
-		this.numberOfConnections = Network.getInstance().getHandshakedPeers().size();
-
-		this.height = Controller.getInstance().getChainHeight();
 	}

 }
--- a/src/main/java/org/qortal/api/model/PeersSummary.java
+++ b/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() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/SimpleForeignTransaction.java
+++ b/src/main/java/org/qortal/api/model/SimpleForeignTransaction.java
@@ -1,157 +0,0 @@
-package org.qortal.api.model;
-
-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 {
-
-	public static class AddressAmount {
-		public final String address;
-		public final long amount;
-
-		protected AddressAmount() {
-			/* For JAXB */
-			this.address = null;
-			this.amount = 0;
-		}
-
-		public AddressAmount(String address, long amount) {
-			this.address = address;
-			this.amount = amount;
-		}
-	}
-
-	private String txHash;
-	private long timestamp;
-
-	private List<AddressAmount> inputs;
-
-	public static class Output {
-		public final List<String> addresses;
-		public final long amount;
-
-		protected Output() {
-			/* For JAXB */
-			this.addresses = null;
-			this.amount = 0;
-		}
-
-		public Output(List<String> addresses, long amount) {
-			this.addresses = addresses;
-			this.amount = amount;
-		}
-	}
-	private List<Output> outputs;
-
-	private long totalAmount;
-	private long fees;
-
-	private Boolean isSentNotReceived;
-
-	protected SimpleForeignTransaction() {
-		/* For JAXB */
-	}
-
-	private SimpleForeignTransaction(Builder builder) {
-		this.txHash = builder.txHash;
-		this.timestamp = builder.timestamp;
-		this.inputs = Collections.unmodifiableList(builder.inputs);
-		this.outputs = Collections.unmodifiableList(builder.outputs);
-
-		Objects.requireNonNull(this.txHash);
-		if (timestamp <= 0)
-			throw new IllegalArgumentException("timestamp must be positive");
-
-		long totalGrossAmount = this.inputs.stream().map(addressAmount -> addressAmount.amount).reduce(0L, Long::sum);
-		this.totalAmount = this.outputs.stream().map(addressAmount -> addressAmount.amount).reduce(0L, Long::sum);
-
-		this.fees = totalGrossAmount - this.totalAmount;
-
-		this.isSentNotReceived = builder.isSentNotReceived;
-	}
-
-	public String getTxHash() {
-		return this.txHash;
-	}
-
-	public long getTimestamp() {
-		return this.timestamp;
-	}
-
-	public List<AddressAmount> getInputs() {
-		return this.inputs;
-	}
-
-	public List<Output> getOutputs() {
-		return this.outputs;
-	}
-
-	public long getTotalAmount() {
-		return this.totalAmount;
-	}
-
-	public long getFees() {
-		return this.fees;
-	}
-
-	public Boolean isSentNotReceived() {
-		return this.isSentNotReceived;
-	}
-
-	public static class Builder {
-		private String txHash;
-		private long timestamp;
-		private List<AddressAmount> inputs = new ArrayList<>();
-		private List<Output> outputs = new ArrayList<>();
-		private Boolean isSentNotReceived;
-
-		public Builder txHash(String txHash) {
-			this.txHash = Objects.requireNonNull(txHash);
-			return this;
-		}
-
-		public Builder timestamp(long timestamp) {
-			if (timestamp <= 0)
-				throw new IllegalArgumentException("timestamp must be positive");
-
-			this.timestamp = timestamp;
-			return this;
-		}
-
-		public Builder input(String address, long amount) {
-			Objects.requireNonNull(address);
-			if (amount < 0)
-				throw new IllegalArgumentException("amount must be zero or positive");
-
-			AddressAmount input = new AddressAmount(address, amount);
-			inputs.add(input);
-			return this;
-		}
-
-		public Builder output(List<String> addresses, long amount) {
-			Objects.requireNonNull(addresses);
-			if (amount < 0)
-				throw new IllegalArgumentException("amount must be zero or positive");
-
-			Output output = new Output(addresses, amount);
-			outputs.add(output);
-			return this;
-		}
-
-		public Builder isSentNotReceived(Boolean isSentNotReceived) {
-			this.isSentNotReceived = isSentNotReceived;
-			return this;
-		}
-
-		public SimpleForeignTransaction build() {
-			return new SimpleForeignTransaction(this);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/crosschain/BitcoinSendRequest.java
+++ b/src/main/java/org/qortal/api/model/crosschain/BitcoinSendRequest.java
@@ -1,29 +0,0 @@
-package org.qortal.api.model.crosschain;
-
-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 BitcoinSendRequest {
-
-	@Schema(description = "Bitcoin BIP32 extended private key", example = "tprv___________________________________________________________________________________________________________")
-	public String xprv58;
-
-	@Schema(description = "Recipient's Bitcoin address ('legacy' P2PKH only)", example = "1BitcoinEaterAddressDontSendf59kuE")
-	public String receivingAddress;
-
-	@Schema(description = "Amount of BTC to send", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long bitcoinAmount;
-
-	@Schema(description = "Transaction fee per byte (optional). Default is 0.00000100 BTC (100 sats) per byte", example = "0.00000100", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public Long feePerByte;
-
-	public BitcoinSendRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/crosschain/DogecoinSendRequest.java
+++ b/src/main/java/org/qortal/api/model/crosschain/DogecoinSendRequest.java
@@ -1,29 +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;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DogecoinSendRequest {
-
-	@Schema(description = "Dogecoin BIP32 extended private key", example = "tprv___________________________________________________________________________________________________________")
-	public String xprv58;
-
-	@Schema(description = "Recipient's Dogecoin address ('legacy' P2PKH only)", example = "DoGecoinEaterAddressDontSendhLfzKD")
-	public String receivingAddress;
-
-	@Schema(description = "Amount of DOGE to send", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long dogecoinAmount;
-
-	@Schema(description = "Transaction fee per byte (optional). Default is 0.00000100 DOGE (100 sats) per byte", example = "0.00000100", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public Long feePerByte;
-
-	public DogecoinSendRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/crosschain/LitecoinSendRequest.java
+++ b/src/main/java/org/qortal/api/model/crosschain/LitecoinSendRequest.java
@@ -1,29 +0,0 @@
-package org.qortal.api.model.crosschain;
-
-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 LitecoinSendRequest {
-
-	@Schema(description = "Litecoin BIP32 extended private key", example = "tprv___________________________________________________________________________________________________________")
-	public String xprv58;
-
-	@Schema(description = "Recipient's Litecoin address ('legacy' P2PKH only)", example = "LiTecoinEaterAddressDontSendhLfzKD")
-	public String receivingAddress;
-
-	@Schema(description = "Amount of LTC to send", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long litecoinAmount;
-
-	@Schema(description = "Transaction fee per byte (optional). Default is 0.00000100 LTC (100 sats) per byte", example = "0.00000100", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public Long feePerByte;
-
-	public LitecoinSendRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/crosschain/TradeBotCreateRequest.java
+++ b/src/main/java/org/qortal/api/model/crosschain/TradeBotCreateRequest.java
@@ -1,46 +0,0 @@
-package org.qortal.api.model.crosschain;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.qortal.crosschain.SupportedBlockchain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class TradeBotCreateRequest {
-
-	@Schema(description = "Trade creator's public key", example = "2zR1WFsbM7akHghqSCYKBPk6LDP8aKiQSRS1FrwoLvoB")
-	public byte[] creatorPublicKey;
-
-	@Schema(description = "QORT amount paid out on successful trade", example = "80.40000000", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long qortAmount;
-
-	@Schema(description = "QORT amount funding AT, including covering AT execution fees", example = "80.50000000", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public long fundingQortAmount;
-
-	@Deprecated
-	@Schema(description = "Bitcoin amount wanted in return. DEPRECATED: use foreignAmount instead", example = "0.00864200", type = "number", hidden = true)
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public Long bitcoinAmount;
-
-	@Schema(description = "Foreign blockchain. Note: default (BITCOIN) to be removed in the future", example = "BITCOIN", implementation = SupportedBlockchain.class)
-	public SupportedBlockchain foreignBlockchain;
-
-	@Schema(description = "Foreign blockchain amount wanted in return", example = "0.00864200", type = "number")
-	@XmlJavaTypeAdapter(value = org.qortal.api.AmountTypeAdapter.class)
-	public Long foreignAmount;
-
-	@Schema(description = "Suggested trade timeout (minutes)", example = "10080")
-	public int tradeTimeout;
-
-	@Schema(description = "Foreign blockchain address for receiving", example = "1BitcoinEaterAddressDontSendf59kuE")
-	public String receivingAddress;
-
-	public TradeBotCreateRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/model/crosschain/TradeBotRespondRequest.java
+++ b/src/main/java/org/qortal/api/model/crosschain/TradeBotRespondRequest.java
@@ -1,29 +0,0 @@
-package org.qortal.api.model.crosschain;
-
-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 TradeBotRespondRequest {
-
-	@Schema(description = "Qortal AT address", example = "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
-	public String atAddress;
-
-	@Deprecated
-	@Schema(description = "Bitcoin BIP32 extended private key. DEPRECATED: use foreignKey instead", hidden = true,
-			example = "xprv___________________________________________________________________________________________________________")
-	public String xprv58;
-
-	@Schema(description = "Foreign blockchain private key, e.g. BIP32 'm' key for Bitcoin/Litecoin starting with 'xprv'",
-			example = "xprv___________________________________________________________________________________________________________")
-	public String foreignKey;
-
-	@Schema(description = "Qortal address for receiving QORT from AT", example = "Qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq")
-	public String receivingAddress;
-
-	public TradeBotRespondRequest() {
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/AddressesResource.java
+++ b/src/main/java/org/qortal/api/resource/AddressesResource.java
@@ -7,16 +7,18 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;

 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;

@@ -26,7 +28,6 @@ import org.qortal.api.ApiError;
 import org.qortal.api.ApiErrors;
 import org.qortal.api.ApiException;
 import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
 import org.qortal.api.model.ApiOnlineAccount;
 import org.qortal.api.model.RewardShareKeyRequest;
 import org.qortal.asset.Asset;
@@ -35,28 +36,18 @@ import org.qortal.crypto.Crypto;
 import org.qortal.data.account.AccountData;
 import org.qortal.data.account.RewardShareData;
 import org.qortal.data.network.OnlineAccountData;
-import org.qortal.data.network.OnlineAccountLevel;
-import org.qortal.data.transaction.PublicizeTransactionData;
 import org.qortal.data.transaction.RewardShareTransactionData;
-import org.qortal.data.transaction.TransactionData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
 import org.qortal.settings.Settings;
-import org.qortal.transaction.PublicizeTransaction;
 import org.qortal.transaction.Transaction;
-import org.qortal.transaction.Transaction.TransactionType;
 import org.qortal.transaction.Transaction.ValidationResult;
 import org.qortal.transform.TransformationException;
 import org.qortal.transform.Transformer;
-import org.qortal.transform.transaction.PublicizeTransactionTransformer;
 import org.qortal.transform.transaction.RewardShareTransactionTransformer;
-import org.qortal.transform.transaction.TransactionTransformer;
-import org.qortal.utils.Amounts;
 import org.qortal.utils.Base58;

-import com.google.common.primitives.Bytes;
-
@Path("/addresses")
@Tag(name = "Addresses")
 public class AddressesResource {
@@ -75,18 +66,32 @@ public class AddressesResource {
 			)
 		}
 	)
-	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN, ApiError.REPOSITORY_ISSUE})
+	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
 	public AccountData getAccountInfo(@PathParam("address") String address) {
 		if (!Crypto.isValidAddress(address))
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);

 		try (final Repository repository = RepositoryManager.getRepository()) {
 			AccountData accountData = repository.getAccountRepository().getAccount(address);
+
 			// Not found?
 			if (accountData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
+				accountData = new AccountData(address);
+			else {
+				// Unconfirmed transactions could update lastReference
+				Account account = new Account(repository, address);
+
+				// Use last reference based on unconfirmed transactions if possible
+				byte[] unconfirmedLastReference = account.getUnconfirmedLastReference();
+
+				if (unconfirmedLastReference != null)
+					// There are unconfirmed transactions so modify returned data
+					accountData.setReference(unconfirmedLastReference);
+			}

 			return accountData;
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -95,37 +100,42 @@ public class AddressesResource {
 	@GET
 	@Path("/lastreference/{address}")
 	@Operation(
-		summary = "Fetch reference for next transaction to be created by address",
-		description = "Returns the base58-encoded signature of the last confirmed transaction created by address, failing that: the first incoming transaction. Returns \"false\" if there is no last-reference.",
+		summary = "Fetch reference for next transaction to be created by address, considering unconfirmed transactions",
+		description = "Returns the base58-encoded signature of the last confirmed/unconfirmed transaction created by address, failing that: the first incoming transaction. Returns \"false\" if there is no transactions.",
 		responses = {
 			@ApiResponse(
-				description = "the base58-encoded last-reference",
+				description = "the base58-encoded transaction signature",
 				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
 			)
 		}
 	)
-	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN, ApiError.REPOSITORY_ISSUE})
-	public String getLastReference(@PathParam("address") String address) {
+	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
+	public String getLastReferenceUnconfirmed(@PathParam("address") String address) {
 		if (!Crypto.isValidAddress(address))
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);

 		byte[] lastReference = null;

 		try (final Repository repository = RepositoryManager.getRepository()) {
-			AccountData accountData = repository.getAccountRepository().getAccount(address);
-			// Not found?
-			if (accountData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
+			Account account = new Account(repository, address);

-			lastReference = accountData.getReference();
+			// Use last reference based on unconfirmed transactions if possible
+			lastReference = account.getUnconfirmedLastReference();
+
+			if (lastReference == null)
+				// No unconfirmed transactions so fallback to using one save in account data
+				lastReference = account.getLastReference();
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}

-		if (lastReference == null || lastReference.length == 0)
+		if(lastReference == null || lastReference.length == 0) {
 			return "false";
-
-		return Base58.encode(lastReference);
+		} else {
+			return Base58.encode(lastReference);
+		}
 	}

 	@GET
@@ -178,66 +188,6 @@ public class AddressesResource {
 		}
 	}

-	@GET
-	@Path("/online/levels")
-	@Operation(
-			summary = "Return currently 'online' accounts counts, grouped by level",
-			responses = {
-					@ApiResponse(
-							description = "online accounts",
-							content = @Content(mediaType = MediaType.APPLICATION_JSON, array = @ArraySchema(schema = @Schema(implementation = ApiOnlineAccount.class)))
-					)
-			}
-	)
-	@ApiErrors({ApiError.PUBLIC_KEY_NOT_FOUND, ApiError.REPOSITORY_ISSUE})
-	public List<OnlineAccountLevel> getOnlineAccountsByLevel() {
-		List<OnlineAccountData> onlineAccounts = Controller.getInstance().getOnlineAccounts();
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<OnlineAccountLevel> onlineAccountLevels = new ArrayList<>();
-
-			for (OnlineAccountData onlineAccountData : onlineAccounts) {
-				try {
-					final int minterLevel = Account.getRewardShareEffectiveMintingLevel(repository, onlineAccountData.getPublicKey());
-
-					OnlineAccountLevel onlineAccountLevel = onlineAccountLevels.stream()
-							.filter(a -> a.getLevel() == minterLevel)
-							.findFirst().orElse(null);
-
-					// Note: I don't think we can use the level as the List index here because there will be gaps.
-					// So we are forced to manually look up the existing item each time.
-					// There's probably a nice shorthand java way of doing this, but this approach gets the same result.
-
-					if (onlineAccountLevel == null) {
-						// No entry exists for this level yet, so create one
-						onlineAccountLevel = new OnlineAccountLevel(minterLevel, 1);
-						onlineAccountLevels.add(onlineAccountLevel);
-					}
-					else {
-						// Already exists - so increment the count
-						int existingCount = onlineAccountLevel.getCount();
-						onlineAccountLevel.setCount(++existingCount);
-
-						// Then replace the existing item
-						int index = onlineAccountLevels.indexOf(onlineAccountLevel);
-						onlineAccountLevels.set(index, onlineAccountLevel);
-					}
-
-				} catch (DataException e) {
-					continue;
-				}
-			}
-
-			// Sort by level
-			onlineAccountLevels.sort(Comparator.comparingInt(OnlineAccountLevel::getLevel));
-
-			return onlineAccountLevels;
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
 	@GET
 	@Path("/balance/{address}")
 	@Operation(
@@ -264,7 +214,7 @@ public class AddressesResource {
 			else if (!repository.getAssetRepository().assetExists(assetId))
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ASSET_ID);

-			return Amounts.toBigDecimal(account.getConfirmedBalance(assetId));
+			return account.getBalance(assetId);
 		} catch (ApiException e) {
 			throw e;
 		} catch (DataException e) {
@@ -458,120 +408,4 @@ public class AddressesResource {
 		}
 	}

-	@POST
-	@Path("/publicize")
-	@Operation(
-		summary = "Build raw, unsigned, PUBLICIZE transaction",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = PublicizeTransactionData.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "raw, unsigned, PUBLICIZE transaction encoded in Base58",
-				content = @Content(
-					mediaType = MediaType.TEXT_PLAIN,
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.NON_PRODUCTION, ApiError.TRANSACTION_INVALID, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	public String publicize(PublicizeTransactionData transactionData) {
-		if (Settings.getInstance().isApiRestricted())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NON_PRODUCTION);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			Transaction transaction = Transaction.fromData(repository, transactionData);
-
-			ValidationResult result = transaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK && result != ValidationResult.INCORRECT_NONCE)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			byte[] bytes = PublicizeTransactionTransformer.toBytes(transactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/publicize/compute")
-	@Operation(
-		summary = "Compute nonce for raw, unsigned PUBLICIZE transaction",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "raw, unsigned PUBLICIZE transaction in base58 encoding",
-					example = "raw transaction base58"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "raw, unsigned, PUBLICIZE transaction encoded in Base58",
-				content = @Content(
-					mediaType = MediaType.TEXT_PLAIN,
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.TRANSACTION_INVALID, ApiError.INVALID_DATA, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String computePublicize(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String rawBytes58) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			byte[] rawBytes = Base58.decode(rawBytes58);
-			// We're expecting unsigned transaction, so append empty signature prior to decoding
-			rawBytes = Bytes.concat(rawBytes, new byte[TransactionTransformer.SIGNATURE_LENGTH]);
-
-			TransactionData transactionData = TransactionTransformer.fromBytes(rawBytes);
-			if (transactionData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			if (transactionData.getType() != TransactionType.PUBLICIZE)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			PublicizeTransaction publicizeTransaction = (PublicizeTransaction) Transaction.fromData(repository, transactionData);
-
-			// Quicker validity check first before we compute nonce
-			ValidationResult result = publicizeTransaction.isValid();
-			if (result != ValidationResult.OK && result != ValidationResult.INCORRECT_NONCE)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			publicizeTransaction.computeNonce();
-
-			// Re-check, but ignores signature
-			result = publicizeTransaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			// Strip zeroed signature
-			transactionData.setSignature(null);
-
-			byte[] bytes = PublicizeTransactionTransformer.toBytes(transactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
 }
--- a/src/main/java/org/qortal/api/resource/AdminResource.java
+++ b/src/main/java/org/qortal/api/resource/AdminResource.java
@@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import java.io.IOException;
@@ -22,29 +21,33 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;

 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;

 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.RollingFileAppender;
-import org.checkerframework.checker.units.qual.A;
 import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
-import org.qortal.api.*;
+import org.qortal.api.ApiError;
+import org.qortal.api.ApiErrors;
+import org.qortal.api.ApiException;
+import org.qortal.api.ApiExceptionFactory;
+import org.qortal.api.Security;
 import org.qortal.api.model.ActivitySummary;
 import org.qortal.api.model.NodeInfo;
 import org.qortal.api.model.NodeStatus;
 import org.qortal.block.BlockChain;
 import org.qortal.controller.Controller;
-import org.qortal.controller.Synchronizer;
 import org.qortal.controller.Synchronizer.SynchronizationResult;
 import org.qortal.data.account.MintingAccountData;
 import org.qortal.data.account.RewardShareData;
@@ -54,7 +57,6 @@ import org.qortal.network.PeerAddress;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
-import org.qortal.settings.Settings;
 import org.qortal.utils.Base58;
 import org.qortal.utils.NTP;

@@ -64,8 +66,6 @@ import com.google.common.collect.Lists;
@Tag(name = "Admin")
 public class AdminResource {

-	private static final Logger LOGGER = LogManager.getLogger(AdminResource.class);
-
 	private static final int MAX_LOG_LINES = 500;

 	@Context
@@ -75,8 +75,7 @@ public class AdminResource {
 	@Path("/unused")
 	@Parameter(in = ParameterIn.PATH, name = "assetid", description = "Asset ID, 0 is native coin", schema = @Schema(type = "integer"))
 	@Parameter(in = ParameterIn.PATH, name = "otherassetid", description = "Asset ID, 0 is native coin", schema = @Schema(type = "integer"))
-	@Parameter(in = ParameterIn.PATH, name = "address", description = "An account address", example = "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v")
-	@Parameter(in = ParameterIn.PATH, name = "path", description = "Local path to folder containing the files", schema = @Schema(type = "String", defaultValue = "/Users/user/Documents/MyStaticWebsite"))
+	@Parameter(in = ParameterIn.PATH, name = "address", description = "an account address", example = "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v")
 	@Parameter(in = ParameterIn.QUERY, name = "count", description = "Maximum number of entries to return, 0 means none", schema = @Schema(type = "integer", defaultValue = "20"))
 	@Parameter(in = ParameterIn.QUERY, name = "limit", description = "Maximum number of entries to return, 0 means unlimited", schema = @Schema(type = "integer", defaultValue = "20"))
 	@Parameter(in = ParameterIn.QUERY, name = "offset", description = "Starting entry in results, 0 is first entry", schema = @Schema(type = "integer"))
@@ -118,8 +117,6 @@ public class AdminResource {
 		nodeInfo.uptime = System.currentTimeMillis() - Controller.startTime;
 		nodeInfo.buildVersion = Controller.getInstance().getVersionString();
 		nodeInfo.buildTimestamp = Controller.getInstance().getBuildTimestamp();
-		nodeInfo.nodeId = Network.getInstance().getOurNodeId();
-		nodeInfo.isTestNet = Settings.getInstance().isTestNet();

 		return nodeInfo;
 	}
@@ -135,8 +132,16 @@ public class AdminResource {
 		}
 	)
 	public NodeStatus status() {
+		Security.checkApiCallAllowed(request);
+
 		NodeStatus nodeStatus = new NodeStatus();

+		nodeStatus.isMintingPossible = Controller.getInstance().isMintingPossible();
+		nodeStatus.isSynchronizing = Controller.getInstance().isSynchronizing();
+
+		if (nodeStatus.isSynchronizing)
+			nodeStatus.syncPercent = Controller.getInstance().getSyncPercent();
+
 		return nodeStatus;
 	}

@@ -152,8 +157,7 @@ public class AdminResource {
 			)
 		}
 	)
-	@SecurityRequirement(name = "apiKey")
-	public String shutdown(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
+	public String shutdown() {
 		Security.checkApiCallAllowed(request);

 		new Thread(() -> {
@@ -181,10 +185,7 @@ public class AdminResource {
 		}
 	)
 	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public ActivitySummary summary(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
+	public ActivitySummary summary() {
 		ActivitySummary summary = new ActivitySummary();

 		LocalDate date = LocalDate.now();
@@ -196,13 +197,16 @@ public class AdminResource {
 			int startHeight = repository.getBlockRepository().getHeightFromTimestamp(start);
 			int endHeight = repository.getBlockRepository().getBlockchainHeight();

-			summary.setBlockCount(endHeight - startHeight);
+			summary.blockCount = endHeight - startHeight;

-			summary.setTransactionCountByType(repository.getTransactionRepository().getTransactionSummary(startHeight + 1, endHeight));
+			summary.transactionCountByType = repository.getTransactionRepository().getTransactionSummary(startHeight + 1, endHeight);

-			summary.setAssetsIssued(repository.getAssetRepository().getRecentAssetIds(start).size());
+			for (Integer count : summary.transactionCountByType.values())
+				summary.transactionCount += count;

-			summary.setNamesRegistered (repository.getNameRepository().getRecentNames(start).size());
+			summary.assetsIssued = repository.getAssetRepository().getRecentAssetIds(start).size();
+
+			summary.namesRegistered = repository.getNameRepository().getRecentNames(start).size();

 			return summary;
 		} catch (DataException e) {
@@ -210,30 +214,6 @@ public class AdminResource {
 		}
 	}

-	@GET
-	@Path("/enginestats")
-	@Operation(
-		summary = "Fetch statistics snapshot for core engine",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					mediaType = MediaType.APPLICATION_JSON,
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = Controller.StatsSnapshot.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public Controller.StatsSnapshot getEngineStats(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		return Controller.getInstance().getStatsSnapshot();
-	}
-
 	@GET
 	@Path("/mintingaccounts")
 	@Operation(
@@ -247,6 +227,7 @@ public class AdminResource {
 	)
 	@ApiErrors({ApiError.REPOSITORY_ISSUE})
 	public List<MintingAccountData> getMintingAccounts() {
+		Security.checkApiCallAllowed(request);

 		try (final Repository repository = RepositoryManager.getRepository()) {
 			List<MintingAccountData> mintingAccounts = repository.getAccountRepository().getMintingAccounts();
@@ -291,8 +272,7 @@ public class AdminResource {
 		}
 	)
 	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.REPOSITORY_ISSUE, ApiError.CANNOT_MINT})
-	@SecurityRequirement(name = "apiKey")
-	public String addMintingAccount(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String seed58) {
+	public String addMintingAccount(String seed58) {
 		Security.checkApiCallAllowed(request);

 		try (final Repository repository = RepositoryManager.getRepository()) {
@@ -327,13 +307,13 @@ public class AdminResource {
 	@DELETE
 	@Path("/mintingaccounts")
 	@Operation(
-		summary = "Remove account/reward-share from use by BlockMinter, using public or private key",
+		summary = "Remove account/reward-share from use by BlockMinter, using private key",
 		requestBody = @RequestBody(
 			required = true,
 			content = @Content(
 				mediaType = MediaType.TEXT_PLAIN,
 				schema = @Schema(
-					type = "string", example = "public or private key"
+					type = "string", example = "private key"
 				)
 			)
 		),
@@ -344,14 +324,13 @@ public class AdminResource {
 		}
 	)
 	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String deleteMintingAccount(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
+	public String deleteMintingAccount(String seed58) {
 		Security.checkApiCallAllowed(request);

 		try (final Repository repository = RepositoryManager.getRepository()) {
-			byte[] key = Base58.decode(key58.trim());
+			byte[] seed = Base58.decode(seed58.trim());

-			if (repository.getAccountRepository().delete(key) == 0)
+			if (repository.getAccountRepository().delete(seed) == 0)
 				return "false";

 			repository.saveChanges();
@@ -444,8 +423,7 @@ public class AdminResource {
 		}
 	)
 	@ApiErrors({ApiError.INVALID_HEIGHT, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String orphan(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String targetHeightString) {
+	public String orphan(String targetHeightString) {
 		Security.checkApiCallAllowed(request);

 		try {
@@ -454,23 +432,6 @@ public class AdminResource {
 			if (targetHeight <= 0 || targetHeight > Controller.getInstance().getChainHeight())
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_HEIGHT);

-			// Make sure we're not orphaning as far back as the archived blocks
-			// FUTURE: we could support this by first importing earlier blocks from the archive
-			if (Settings.getInstance().isTopOnly() ||
-				Settings.getInstance().isArchiveEnabled()) {
-
-				try (final Repository repository = RepositoryManager.getRepository()) {
-					// Find the first unarchived block
-					int oldestBlock = repository.getBlockArchiveRepository().getBlockArchiveHeight();
-					// Add some extra blocks just in case we're currently archiving/pruning
-					oldestBlock += 100;
-					if (targetHeight <= oldestBlock) {
-						LOGGER.info("Unable to orphan beyond block {} because it is archived", oldestBlock);
-						throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_HEIGHT);
-					}
-				}
-			}
-
 			if (BlockChain.orphan(targetHeight))
 				return "true";
 			else
@@ -479,6 +440,8 @@ public class AdminResource {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		} catch (NumberFormatException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_HEIGHT);
+		} catch (ApiException e) {
+			throw e;
 		}
 	}

@@ -503,8 +466,7 @@ public class AdminResource {
 		}
 	)
 	@ApiErrors({ApiError.INVALID_DATA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String forceSync(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String targetPeerAddress) {
+	public String forceSync(String targetPeerAddress) {
 		Security.checkApiCallAllowed(request);

 		try {
@@ -526,7 +488,7 @@ public class AdminResource {
 			SynchronizationResult syncResult;
 			try {
 				do {
-					syncResult = Synchronizer.getInstance().actuallySynchronize(targetPeer, true);
+					syncResult = Controller.getInstance().actuallySynchronize(targetPeer, true);
 				} while (syncResult == SynchronizationResult.OK);
 			} finally {
 				blockchainLock.unlock();
@@ -535,6 +497,8 @@ public class AdminResource {
 			return syncResult.name();
 		} catch (IllegalArgumentException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
+		} catch (ApiException e) {
+			throw e;
 		} catch (UnknownHostException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
 		} catch (InterruptedException e) {
@@ -542,223 +506,4 @@ public class AdminResource {
 		}
 	}

-	@GET
-	@Path("/repository/data")
-	@Operation(
-		summary = "Export sensitive/node-local data from repository.",
-		description = "Exports data to .script files on local machine"
-	)
-	@ApiErrors({ApiError.INVALID_DATA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String exportRepository(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			repository.exportNodeLocalData();
-			return "true";
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/repository/data")
-	@Operation(
-		summary = "Import data into repository.",
-		description = "Imports data from file on local machine. Filename is forced to 'qortal-backup/TradeBotStates.json' if apiKey is not set.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string", example = "qortal-backup/TradeBotStates.json"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "\"true\"",
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String importRepository(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String filename) {
-		Security.checkApiCallAllowed(request);
-
-		// Hard-coded because it's too dangerous to allow user-supplied filenames in weaker security contexts
-		if (Settings.getInstance().getApiKey() == null)
-			filename = "qortal-backup/TradeBotStates.json";
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-
-			blockchainLock.lockInterruptibly();
-
-			try {
-				repository.importDataFromFile(filename);
-				repository.saveChanges();
-
-				return "true";
-
-			} catch (IOException e) {
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA, e);
-
-			} finally {
-				blockchainLock.unlock();
-			}
-		} catch (InterruptedException e) {
-			// We couldn't lock blockchain to perform import
-			return "false";
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/repository/checkpoint")
-	@Operation(
-		summary = "Checkpoint data in repository.",
-		description = "Forces repository to checkpoint uncommitted writes.",
-		responses = {
-			@ApiResponse(
-				description = "\"true\"",
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String checkpointRepository(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		RepositoryManager.setRequestedCheckpoint(Boolean.TRUE);
-
-		return "true";
-	}
-
-	@POST
-	@Path("/repository/backup")
-	@Operation(
-		summary = "Perform online backup of repository.",
-		responses = {
-			@ApiResponse(
-				description = "\"true\"",
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String backupRepository(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-
-			blockchainLock.lockInterruptibly();
-
-			try {
-				// Timeout if the database isn't ready for backing up after 60 seconds
-				long timeout = 60 * 1000L;
-				repository.backup(true, "backup", timeout);
-				repository.saveChanges();
-
-				return "true";
-			} finally {
-				blockchainLock.unlock();
-			}
-		} catch (InterruptedException | TimeoutException e) {
-			// We couldn't lock blockchain to perform backup
-			return "false";
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@DELETE
-	@Path("/repository")
-	@Operation(
-		summary = "Perform maintenance on repository.",
-		description = "Requires enough free space to rebuild repository. This will pause your node for a while."
-	)
-	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public void performRepositoryMaintenance(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
-
-			blockchainLock.lockInterruptibly();
-
-			try {
-				// Timeout if the database isn't ready to start after 60 seconds
-				long timeout = 60 * 1000L;
-				repository.performPeriodicMaintenance(timeout);
-			} finally {
-				blockchainLock.unlock();
-			}
-		} catch (InterruptedException e) {
-			// No big deal
-		} catch (DataException | TimeoutException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-
-	@POST
-	@Path("/apikey/generate")
-	@Operation(
-			summary = "Generate an API key",
-			description = "This request is unauthenticated if no API key has been generated yet. " +
-					"If an API key already exists, it needs to be passed as a header and this endpoint " +
-					"will then generate a new key which replaces the existing one.",
-			responses = {
-					@ApiResponse(
-							description = "API key string",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-					)
-			}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public String generateApiKey(@HeaderParam(Security.API_KEY_HEADER) String apiKeyHeader) {
-		ApiKey apiKey = Security.getApiKey(request);
-
-		// If the API key is already generated, we need to authenticate this request
-		if (apiKey.generated() && apiKey.exists()) {
-			Security.checkApiCallAllowed(request);
-		}
-
-		// Not generated yet - so we are safe to generate one
-		// FUTURE: we may want to restrict this to local/loopback only?
-
-		try {
-			apiKey.generate();
-		} catch (IOException e) {
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.UNAUTHORIZED, "Unable to generate API key");
-		}
-
-		return apiKey.toString();
-	}
-
-	@GET
-	@Path("/apikey/test")
-	@Operation(
-			summary = "Test an API key",
-			responses = {
-					@ApiResponse(
-							description = "true if authenticated",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public String testApiKey(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		return "true";
-	}
-
 }
--- a/src/main/java/org/qortal/api/resource/ApiDefinition.java
+++ b/src/main/java/org/qortal/api/resource/ApiDefinition.java
@@ -1,17 +1,11 @@
 package org.qortal.api.resource;

 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
-import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
 import io.swagger.v3.oas.annotations.extensions.Extension;
 import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
 import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.security.SecurityScheme;
-import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import org.qortal.api.Security;
-
@OpenAPIDefinition(
 		info = @Info( title = "Qortal API", description = "NOTE: byte-arrays are encoded in Base58" ),
 		tags = {
@@ -19,10 +13,7 @@ import org.qortal.api.Security;
 			@Tag(name = "Admin"),
 			@Tag(name = "Arbitrary"),
 			@Tag(name = "Assets"),
-			@Tag(name = "Automated Transactions"),
 			@Tag(name = "Blocks"),
-			@Tag(name = "Chat"),
-			@Tag(name = "Cross-Chain"),
 			@Tag(name = "Groups"),
 			@Tag(name = "Names"),
 			@Tag(name = "Payments"),
@@ -36,9 +27,5 @@ import org.qortal.api.Security;
 			})
 		}
 )
-@SecuritySchemes({
-	@SecurityScheme(name = "basicAuth", type = SecuritySchemeType.HTTP, scheme = "basic"),
-	@SecurityScheme(name = "apiKey", type = SecuritySchemeType.APIKEY, in = SecuritySchemeIn.HEADER, paramName = Security.API_KEY_HEADER)
-})
 public class ApiDefinition {
 }
--- a/src/main/java/org/qortal/api/resource/ArbitraryResource.java
+++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java
--- a/src/main/java/org/qortal/api/resource/AtResource.java
+++ b/src/main/java/org/qortal/api/resource/AtResource.java
@@ -1,204 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.ciyam.at.MachineState;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiException;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.data.at.ATData;
-import org.qortal.data.at.ATStateData;
-import org.qortal.data.transaction.DeployAtTransactionData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.settings.Settings;
-import org.qortal.transaction.Transaction;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.transaction.DeployAtTransactionTransformer;
-import org.qortal.utils.Base58;
-
-@Path("/at")
-@Tag(name = "Automated Transactions")
-public class AtResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@GET
-	@Path("/byfunction/{codehash}")
-	@Operation(
-		summary = "Find automated transactions with matching functionality (code hash)",
-		responses = {
-			@ApiResponse(
-				description = "automated transactions",
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = ATData.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({
-		ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE
-	})
-	public List<ATData> getByFunctionality(
-			@PathParam("codehash")
-			String codeHash58,
-			@Parameter(description = "whether to include ATs that can run, or not, or both (if omitted)")
-			@QueryParam("isExecutable")
-			Boolean isExecutable,
-			@Parameter( ref = "limit") @QueryParam("limit") Integer limit,
-			@Parameter( ref = "offset" ) @QueryParam("offset") Integer offset,
-			@Parameter( ref = "reverse" ) @QueryParam("reverse") Boolean reverse) {
-		// Decode codeHash
-		byte[] codeHash;
-		try {
-			codeHash = Base58.decode(codeHash58);
-		} catch (NumberFormatException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA, e);
-		}
-
-		// codeHash must be present and have correct length
-		if (codeHash == null || codeHash.length != 32)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// Impose a limit on 'limit'
-		if (limit != null && limit > 100)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getATRepository().getATsByFunctionality(codeHash, isExecutable, limit, offset, reverse);
-		} catch (ApiException e) {
-			throw e;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/{ataddress}")
-	@Operation(
-		summary = "Fetch info associated with AT address",
-		responses = {
-			@ApiResponse(
-				description = "automated transaction",
-				content = @Content(
-					schema = @Schema(implementation = ATData.class)
-				)
-			)
-		}
-	)
-	@ApiErrors({
-		ApiError.REPOSITORY_ISSUE
-	})
-	public ATData getByAddress(@PathParam("ataddress") String atAddress) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getATRepository().fromATAddress(atAddress);
-		} catch (ApiException e) {
-			throw e;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/{ataddress}/data")
-	@Operation(
-		summary = "Fetch data segment associated with AT address",
-		responses = {
-			@ApiResponse(
-				description = "automated transaction",
-				content = @Content(
-					schema = @Schema(implementation = byte[].class)
-				)
-			)
-		}
-	)
-	@ApiErrors({
-		ApiError.REPOSITORY_ISSUE
-	})
-	public byte[] getDataByAddress(@PathParam("ataddress") String atAddress) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATStateData atStateData = repository.getATRepository().getLatestATState(atAddress);
-			byte[] stateData = atStateData.getStateData();
-
-			byte[] dataBytes = MachineState.extractDataBytes(stateData);
-
-			return dataBytes;
-		} catch (ApiException e) {
-			throw e;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Operation(
-		summary = "Build raw, unsigned, DEPLOY_AT transaction",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = DeployAtTransactionData.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "raw, unsigned, DEPLOY_AT transaction encoded in Base58",
-				content = @Content(
-					mediaType = MediaType.TEXT_PLAIN,
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.NON_PRODUCTION, ApiError.TRANSACTION_INVALID, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	public String createDeployAt(DeployAtTransactionData transactionData) {
-		if (Settings.getInstance().isApiRestricted())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NON_PRODUCTION);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			Transaction transaction = Transaction.fromData(repository, transactionData);
-
-			ValidationResult result = transaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			byte[] bytes = DeployAtTransactionTransformer.toBytes(transactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/BlocksResource.java
+++ b/src/main/java/org/qortal/api/resource/BlocksResource.java
@@ -1,6 +1,5 @@
 package org.qortal.api.resource;

-import com.google.common.primitives.Ints;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
@@ -9,14 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;

 import javax.servlet.http.HttpServletRequest;
@@ -28,25 +20,19 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;

-import org.qortal.account.Account;
 import org.qortal.api.ApiError;
 import org.qortal.api.ApiErrors;
+import org.qortal.api.ApiException;
 import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.model.BlockMintingInfo;
-import org.qortal.api.model.BlockSignerSummary;
-import org.qortal.block.Block;
-import org.qortal.controller.Controller;
+import org.qortal.api.model.BlockMinterSummary;
 import org.qortal.crypto.Crypto;
 import org.qortal.data.account.AccountData;
 import org.qortal.data.block.BlockData;
 import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.transaction.TransactionData;
-import org.qortal.repository.BlockArchiveReader;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.block.BlockTransformer;
 import org.qortal.utils.Base58;

@Path("/blocks")
@@ -75,8 +61,7 @@ public class BlocksResource {
 	@ApiErrors({
 		ApiError.INVALID_SIGNATURE, ApiError.BLOCK_UNKNOWN, ApiError.REPOSITORY_ISSUE
 	})
-	public BlockData getBlock(@PathParam("signature") String signature58,
-							  @QueryParam("includeOnlineSignatures") Boolean includeOnlineSignatures) {
+	public BlockData getBlock(@PathParam("signature") String signature58) {
 		// Decode signature
 		byte[] signature;
 		try {
@@ -86,80 +71,14 @@ public class BlocksResource {
 		}

 		try (final Repository repository = RepositoryManager.getRepository()) {
-		    // Check the database first
-			BlockData blockData = repository.getBlockRepository().fromSignature(signature);
-			if (blockData != null) {
-				if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-					blockData.setOnlineAccountsSignatures(null);
-				}
-				return blockData;
-			}
-
-            // Not found, so try the block archive
-			blockData = repository.getBlockArchiveRepository().fromSignature(signature);
-			if (blockData != null) {
-				if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-					blockData.setOnlineAccountsSignatures(null);
-				}
-				return blockData;
-			}
-
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
+			return repository.getBlockRepository().fromSignature(signature);
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
 	}

-	@GET
-	@Path("/signature/{signature}/data")
-	@Operation(
-			summary = "Fetch serialized, base58 encoded block data using base58 signature",
-			description = "Returns serialized data for the block that matches the given signature",
-			responses = {
-					@ApiResponse(
-							description = "the block data",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-					)
-			}
-	)
-	@ApiErrors({
-			ApiError.INVALID_SIGNATURE, ApiError.BLOCK_UNKNOWN, ApiError.INVALID_DATA, ApiError.REPOSITORY_ISSUE
-	})
-	public String getSerializedBlockData(@PathParam("signature") String signature58) {
-		// Decode signature
-		byte[] signature;
-		try {
-			signature = Base58.decode(signature58);
-		} catch (NumberFormatException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_SIGNATURE, e);
-		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-            // Check the database first
-			BlockData blockData = repository.getBlockRepository().fromSignature(signature);
-			if (blockData != null) {
-                Block block = new Block(repository, blockData);
-                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                bytes.write(Ints.toByteArray(block.getBlockData().getHeight()));
-                bytes.write(BlockTransformer.toBytes(block));
-                return Base58.encode(bytes.toByteArray());
-            }
-
-            // Not found, so try the block archive
-            byte[] bytes = BlockArchiveReader.getInstance().fetchSerializedBlockBytesForSignature(signature, false, repository);
-            if (bytes != null) {
-                return Base58.encode(bytes);
-            }
-
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA, e);
-		} catch (DataException | IOException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
 	@GET
 	@Path("/signature/{signature}/transactions")
 	@Operation(
@@ -197,14 +116,12 @@ public class BlocksResource {
 		}

 		try (final Repository repository = RepositoryManager.getRepository()) {
-		    // Check if the block exists in either the database or archive
-			if (repository.getBlockRepository().getHeightFromSignature(signature) == 0 &&
-					repository.getBlockArchiveRepository().getHeightFromSignature(signature) == 0) {
-				// Not found in either the database or archive
+			if (repository.getBlockRepository().getHeightFromSignature(signature) == 0)
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-            }

 			return repository.getBlockRepository().getTransactionsFromSignature(signature, limit, offset, reverse);
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -231,19 +148,7 @@ public class BlocksResource {
 	})
 	public BlockData getFirstBlock() {
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Check the database first
-			BlockData blockData = repository.getBlockRepository().fromHeight(1);
-			if (blockData != null) {
-				return blockData;
-			}
-
-			// Try the archive
-			blockData = repository.getBlockArchiveRepository().fromHeight(1);
-			if (blockData != null) {
-				return blockData;
-			}
-
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
+			return repository.getBlockRepository().fromHeight(1);
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -268,15 +173,9 @@ public class BlocksResource {
 	@ApiErrors({
 		ApiError.REPOSITORY_ISSUE
 	})
-	public BlockData getLastBlock(@QueryParam("includeOnlineSignatures") Boolean includeOnlineSignatures) {
+	public BlockData getLastBlock() {
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			BlockData blockData = repository.getBlockRepository().getLastBlock();
-
-			if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-				blockData.setOnlineAccountsSignatures(null);
-			}
-
-			return blockData;
+			return repository.getBlockRepository().getLastBlock();
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -311,30 +210,21 @@ public class BlocksResource {
 		}

 		try (final Repository repository = RepositoryManager.getRepository()) {
-			BlockData childBlockData = null;
-
-			// Check if block exists in database
 			BlockData blockData = repository.getBlockRepository().fromSignature(signature);
-			if (blockData != null) {
-				return repository.getBlockRepository().fromReference(signature);
-			}

-			// Not found, so try the archive
-			// This also checks that the parent block exists
-			// It will return null if either the parent or child don't exit
-			childBlockData = repository.getBlockArchiveRepository().fromReference(signature);
+			// Check block exists
+			if (blockData == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
+
+			BlockData childBlockData = repository.getBlockRepository().fromReference(signature);

 			// Check child block exists
-			if (childBlockData == null) {
+			if (childBlockData == null)
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-			}
-
-			// Check child block's reference matches the supplied signature
-			if (!Arrays.equals(childBlockData.getReference(), signature)) {
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-			}

 			return childBlockData;
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -363,6 +253,8 @@ public class BlocksResource {
 	public int getHeight() {
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			return repository.getBlockRepository().getBlockchainHeight();
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -398,20 +290,15 @@ public class BlocksResource {
 		}

 		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Firstly check the database
 			BlockData blockData = repository.getBlockRepository().fromSignature(signature);
-			if (blockData != null) {
-				return blockData.getHeight();
-			}

-			// Not found, so try the archive
-			blockData = repository.getBlockArchiveRepository().fromSignature(signature);
-			if (blockData != null) {
-				return blockData.getHeight();
-			}
-
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
+			// Check block exists
+			if (blockData == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);

+			return blockData.getHeight();
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -436,101 +323,15 @@ public class BlocksResource {
 	@ApiErrors({
 		ApiError.BLOCK_UNKNOWN, ApiError.REPOSITORY_ISSUE
 	})
-	public BlockData getByHeight(@PathParam("height") int height,
-								 @QueryParam("includeOnlineSignatures") Boolean includeOnlineSignatures) {
+	public BlockData getByHeight(@PathParam("height") int height) {
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Firstly check the database
 			BlockData blockData = repository.getBlockRepository().fromHeight(height);
-			if (blockData != null) {
-				if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-					blockData.setOnlineAccountsSignatures(null);
-				}
-				return blockData;
-			}
+			if (blockData == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);

-			// Not found, so try the archive
-			blockData = repository.getBlockArchiveRepository().fromHeight(height);
-			if (blockData != null) {
-				if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-					blockData.setOnlineAccountsSignatures(null);
-				}
-				return blockData;
-			}
-
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/byheight/{height}/mintinginfo")
-	@Operation(
-			summary = "Fetch block minter info using block height",
-			description = "Returns the minter info for the block with given height",
-			responses = {
-					@ApiResponse(
-							description = "the block",
-							content = @Content(
-									schema = @Schema(
-											implementation = BlockData.class
-									)
-							)
-					)
-			}
-	)
-	@ApiErrors({
-			ApiError.BLOCK_UNKNOWN, ApiError.REPOSITORY_ISSUE
-	})
-	public BlockMintingInfo getBlockMintingInfoByHeight(@PathParam("height") int height) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Try the database
-			BlockData blockData = repository.getBlockRepository().fromHeight(height);
-			if (blockData == null) {
-
-				// Not found, so try the archive
-				blockData = repository.getBlockArchiveRepository().fromHeight(height);
-				if (blockData == null) {
-
-					// Still not found
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-				}
-			}
-
-			Block block = new Block(repository, blockData);
-			BlockData parentBlockData = repository.getBlockRepository().fromSignature(blockData.getReference());
-			if (parentBlockData == null) {
-				// Parent block not found - try the archive
-				parentBlockData = repository.getBlockArchiveRepository().fromSignature(blockData.getReference());
-				if (parentBlockData == null) {
-
-					// Still not found
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-				}
-			}
-
-			int minterLevel = Account.getRewardShareEffectiveMintingLevel(repository, blockData.getMinterPublicKey());
-			if (minterLevel == 0)
-				// This may be unavailable when requesting a trimmed block
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			BigInteger distance = block.calcKeyDistance(parentBlockData.getHeight(), parentBlockData.getSignature(), blockData.getMinterPublicKey(), minterLevel);
-			double ratio = new BigDecimal(distance).divide(new BigDecimal(block.MAX_DISTANCE), 40, RoundingMode.DOWN).doubleValue();
-			long timestamp = block.calcTimestamp(parentBlockData, blockData.getMinterPublicKey(), minterLevel);
-			long timeDelta = timestamp - parentBlockData.getTimestamp();
-
-			BlockMintingInfo blockMintingInfo = new BlockMintingInfo();
-			blockMintingInfo.minterPublicKey = blockData.getMinterPublicKey();
-			blockMintingInfo.minterLevel = minterLevel;
-			blockMintingInfo.onlineAccountsCount = blockData.getOnlineAccountsCount();
-			blockMintingInfo.maxDistance = new BigDecimal(block.MAX_DISTANCE);
-			blockMintingInfo.keyDistance = distance;
-			blockMintingInfo.keyDistanceRatio = ratio;
-			blockMintingInfo.timestamp = timestamp;
-			blockMintingInfo.timeDelta = timeDelta;
-
-			return blockMintingInfo;
+			return blockData;
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -554,39 +355,19 @@ public class BlocksResource {
 	@ApiErrors({
 		ApiError.BLOCK_UNKNOWN, ApiError.REPOSITORY_ISSUE
 	})
-	public BlockData getByTimestamp(@PathParam("timestamp") long timestamp,
-									@QueryParam("includeOnlineSignatures") Boolean includeOnlineSignatures) {
+	public BlockData getByTimestamp(@PathParam("timestamp") long timestamp) {
 		try (final Repository repository = RepositoryManager.getRepository()) {
-			BlockData blockData = null;
-
-			// Try the Blocks table
 			int height = repository.getBlockRepository().getHeightFromTimestamp(timestamp);
-			if (height > 1) {
-				// Found match in Blocks table
-				blockData = repository.getBlockRepository().fromHeight(height);
-				if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-					blockData.setOnlineAccountsSignatures(null);
-				}
-				return blockData;
-			}
-
-			// Not found in Blocks table, so try the archive
-			height = repository.getBlockArchiveRepository().getHeightFromTimestamp(timestamp);
-			if (height > 1) {
-				// Found match in archive
-				blockData = repository.getBlockArchiveRepository().fromHeight(height);
-			}
-
-			// Ensure block exists
-			if (blockData == null) {
+			if (height == 0)
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);
-			}

-			if (includeOnlineSignatures == null || includeOnlineSignatures == false) {
-				blockData.setOnlineAccountsSignatures(null);
-			}
+			BlockData blockData = repository.getBlockRepository().fromHeight(height);
+			if (blockData == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN);

 			return blockData;
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -621,14 +402,9 @@ public class BlocksResource {

 			for (/* count already set */; count > 0; --count, ++height) {
 				BlockData blockData = repository.getBlockRepository().fromHeight(height);
-				if (blockData == null) {
-					// Not found - try the archive
-					blockData = repository.getBlockArchiveRepository().fromHeight(height);
-					if (blockData == null) {
-						// Run out of blocks!
-						break;
-					}
-				}
+				if (blockData == null)
+					// Run out of blocks!
+					break;

 				blocks.add(blockData);
 			}
@@ -640,9 +416,9 @@ public class BlocksResource {
 	}

 	@GET
-	@Path("/signer/{address}")
+	@Path("/minter/{address}")
 	@Operation(
-		summary = "Fetch block summaries for blocks signed by address",
+		summary = "Fetch block summaries for blocks minted by address",
 		responses = {
 			@ApiResponse(
 				description = "block summaries",
@@ -657,7 +433,7 @@ public class BlocksResource {
 		}
 	)
 	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.PUBLIC_KEY_NOT_FOUND, ApiError.REPOSITORY_ISSUE})
-	public List<BlockSummaryData> getBlockSummariesBySigner(@PathParam("address") String address, @Parameter(
+	public List<BlockSummaryData> getBlockSummariesByMinter(@PathParam("address") String address, @Parameter(
 			ref = "limit"
 			) @QueryParam("limit") Integer limit, @Parameter(
 				ref = "offset"
@@ -673,52 +449,32 @@ public class BlocksResource {
 			if (accountData == null || accountData.getPublicKey() == null)
 				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.PUBLIC_KEY_NOT_FOUND);

-
-			List<BlockSummaryData> summaries = repository.getBlockRepository()
-					.getBlockSummariesBySigner(accountData.getPublicKey(), limit, offset, reverse);
-
-			// Add any from the archive
-			List<BlockSummaryData> archivedSummaries = repository.getBlockArchiveRepository()
-					.getBlockSummariesBySigner(accountData.getPublicKey(), limit, offset, reverse);
-			if (archivedSummaries != null && !archivedSummaries.isEmpty()) {
-				summaries.addAll(archivedSummaries);
-			}
-			else {
-				summaries = archivedSummaries;
-			}
-
-			// Sort the results (because they may have been obtained from two places)
-			if (reverse != null && reverse) {
-				summaries.sort((s1, s2) -> Integer.valueOf(s2.getHeight()).compareTo(Integer.valueOf(s1.getHeight())));
-			}
-			else {
-				summaries.sort(Comparator.comparing(s -> Integer.valueOf(s.getHeight())));
-			}
-
-			return summaries;
+			return repository.getBlockRepository().getBlockSummariesByMinter(accountData.getPublicKey(), limit, offset, reverse);
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
 	}

 	@GET
-	@Path("/signers")
+	@Path("/minters")
 	@Operation(
-		summary = "Show summary of block signers",
-		description = "Returns count of blocks signed, optionally limited to minters/recipients in passed address(es).",
+		summary = "Show summary of block minters",
+		description = "Returns count of blocks minted, optionally limited to minters/recipients in passed address(es).",
 		responses = {
 			@ApiResponse(
 				content = @Content(
 					array = @ArraySchema(
 						schema = @Schema(
-							implementation = BlockSignerSummary.class
+							implementation = BlockMinterSummary.class
 						)
 					)
 				)
 			)
 		}
 	)
-	public List<BlockSignerSummary> getBlockSigners(@QueryParam("address") List<String> addresses,
+	public List<BlockMinterSummary> getBlockMinters(@QueryParam("address") List<String> addresses,
 			@Parameter(
 				ref = "limit"
 			) @QueryParam("limit") Integer limit, @Parameter(
@@ -731,117 +487,7 @@ public class BlocksResource {
 				if (!Crypto.isValidAddress(address))
 					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);

-			// This method pulls data from both Blocks and BlockArchive, so no need to query serparately
-			return repository.getBlockArchiveRepository().getBlockSigners(addresses, limit, offset, reverse);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/summaries")
-	@Operation(
-		summary = "Fetch only summary info about a range of blocks",
-		description = "Specify up to 2 out 3 of: start, end and count. If neither start nor end are specified, then end is assumed to be latest block. Where necessary, count is assumed to be 50.",
-		responses = {
-			@ApiResponse(
-				description = "blocks",
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = BlockSummaryData.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({
-		ApiError.REPOSITORY_ISSUE
-	})
-	public List<BlockSummaryData> getBlockSummaries(
-			@QueryParam("start") Integer startHeight,
-			@QueryParam("end") Integer endHeight,
-			@Parameter(ref = "count") @QueryParam("count") Integer count) {
-		// Check up to 2 out of 3 params
-		if (startHeight != null && endHeight != null && count != null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// Check values
-		if ((startHeight != null && startHeight < 1) || (endHeight != null && endHeight < 1) || (count != null && count < 1))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			/*
-			 * start	end		count		result
-			 * 10		40		null		blocks 10 to 39 (excludes end block, ignore count)
-			 *
-			 * null		null	null		blocks 1 to 50 (assume count=50, maybe start=1)
-			 * 30		null	null		blocks 30 to 79 (assume count=50)
-			 * 30		null	10			blocks 30 to 39
-			 *
-			 * null		null	50			last 50 blocks? so if max(blocks.height) is 200, then blocks 151 to 200
-			 * null		200		null		blocks 150 to 199 (excludes end block, assume count=50)
-			 * null		200		10			blocks 190 to 199 (excludes end block)
-			 */
-
-			List<BlockSummaryData> blockSummaries = new ArrayList<>();
-
-			// Use the latest X blocks if only a count is specified
-			if (startHeight == null && endHeight == null && count != null) {
-				BlockData chainTip = repository.getBlockRepository().getLastBlock();
-				startHeight = chainTip.getHeight() - count;
-				endHeight = chainTip.getHeight();
-			}
-
-			// ... otherwise default the start height to 1
-			if (startHeight == null && endHeight == null) {
-				startHeight = 1;
-			}
-
-			// Default the count to 50
-			if (count == null) {
-				count = 50;
-			}
-
-			// If both a start and end height exist, ignore the count
-			if (startHeight != null && endHeight != null) {
-				if (startHeight > 0 && endHeight > 0) {
-					count = Integer.MAX_VALUE;
-				}
-			}
-
-			// Derive start height from end height if missing
-			if (startHeight == null || startHeight == 0) {
-				if (endHeight != null && endHeight > 0) {
-					if (count != null) {
-						startHeight = endHeight - count;
-					}
-				}
-			}
-
-			for (/* count already set */; count > 0; --count, ++startHeight) {
-				if (endHeight != null && startHeight >= endHeight) {
-					break;
-				}
-				BlockData blockData = repository.getBlockRepository().fromHeight(startHeight);
-				if (blockData == null) {
-					// Not found - try the archive
-					blockData = repository.getBlockArchiveRepository().fromHeight(startHeight);
-					if (blockData == null) {
-						// Run out of blocks!
-						break;
-					}
-				}
-
-				if (blockData != null) {
-					BlockSummaryData blockSummaryData = new BlockSummaryData(blockData);
-					blockSummaries.add(blockSummaryData);
-				}
-			}
-
-			return blockSummaries;
+			return repository.getBlockRepository().getBlockMinters(addresses, limit, offset, reverse);
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
--- a/src/main/java/org/qortal/api/resource/BootstrapResource.java
+++ b/src/main/java/org/qortal/api/resource/BootstrapResource.java
@@ -1,95 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.repository.Bootstrap;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-
-
-@Path("/bootstrap")
-@Tag(name = "Bootstrap")
-public class BootstrapResource {
-
-	private static final Logger LOGGER = LogManager.getLogger(BootstrapResource.class);
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/create")
-	@Operation(
-		summary = "Create bootstrap",
-		description = "Builds a bootstrap file for distribution",
-		responses = {
-			@ApiResponse(
-				description = "path to file on success, an exception on failure",
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public String createBootstrap(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			Bootstrap bootstrap = new Bootstrap(repository);
-			try {
-				bootstrap.checkRepositoryState();
-			} catch (DataException e) {
-				LOGGER.info("Not ready to create bootstrap: {}", e.getMessage());
-				throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.REPOSITORY_ISSUE, e.getMessage());
-			}
-			bootstrap.validateBlockchain();
-			return bootstrap.create();
-
-		} catch (DataException | InterruptedException | IOException e) {
-			LOGGER.info("Unable to create bootstrap", e);
-			throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.REPOSITORY_ISSUE, e.getMessage());
-		}
-	}
-
-	@GET
-	@Path("/validate")
-	@Operation(
-			summary = "Validate blockchain",
-			description = "Useful to check database integrity prior to creating or after installing a bootstrap. " +
-					"This process is intensive and can take over an hour to run.",
-			responses = {
-					@ApiResponse(
-							description = "true if valid, false if invalid",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public boolean validateBootstrap(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			Bootstrap bootstrap = new Bootstrap(repository);
-			return bootstrap.validateCompleteBlockchain();
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE);
-		}
-	}
-}
--- a/src/main/java/org/qortal/api/resource/ChatResource.java
+++ b/src/main/java/org/qortal/api/resource/ChatResource.java
@@ -1,246 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.chat.ActiveChats;
-import org.qortal.data.chat.ChatMessage;
-import org.qortal.data.transaction.ChatTransactionData;
-import org.qortal.data.transaction.TransactionData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.transaction.ChatTransaction;
-import org.qortal.transaction.Transaction;
-import org.qortal.transaction.Transaction.TransactionType;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.transaction.ChatTransactionTransformer;
-import org.qortal.transform.transaction.TransactionTransformer;
-import org.qortal.utils.Base58;
-
-import com.google.common.primitives.Bytes;
-
-@Path("/chat")
-@Tag(name = "Chat")
-public class ChatResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@GET
-	@Path("/messages")
-	@Operation(
-		summary = "Find chat messages",
-		description = "Returns CHAT messages that match criteria. Must provide EITHER 'txGroupId' OR two 'involving' addresses.",
-		responses = {
-			@ApiResponse(
-				description = "CHAT messages",
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = ChatMessage.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
-	public List<ChatMessage> searchChat(@QueryParam("before") Long before, @QueryParam("after") Long after,
-			@QueryParam("txGroupId") Integer txGroupId,
-			@QueryParam("involving") List<String> involvingAddresses,
-			@Parameter(ref = "limit") @QueryParam("limit") Integer limit,
-			@Parameter(ref = "offset") @QueryParam("offset") Integer offset,
-			@Parameter(ref = "reverse") @QueryParam("reverse") Boolean reverse) {
-		// Check args meet expectations
-		if ((txGroupId == null && involvingAddresses.size() != 2)
-				|| (txGroupId != null && !involvingAddresses.isEmpty()))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// Check any provided addresses are valid
-		if (involvingAddresses.stream().anyMatch(address -> !Crypto.isValidAddress(address)))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (before != null && before < 1500000000000L)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		if (after != null && after < 1500000000000L)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getChatRepository().getMessagesMatchingCriteria(
-					before,
-					after,
-					txGroupId,
-					involvingAddresses,
-					limit, offset, reverse);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/active/{address}")
-	@Operation(
-		summary = "Find active chats (group/direct) involving address",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = ActiveChats.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
-	public ActiveChats getActiveChats(@PathParam("address") String address) {
-		if (address == null || !Crypto.isValidAddress(address))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getChatRepository().getActiveChats(address);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Operation(
-		summary = "Build raw, unsigned, CHAT transaction",
-		description = "Builds a raw, unsigned CHAT transaction but does NOT compute proof-of-work nonce. See POST /chat/compute.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = ChatTransactionData.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "raw, unsigned, CHAT transaction encoded in Base58",
-				content = @Content(
-					mediaType = MediaType.TEXT_PLAIN,
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.TRANSACTION_INVALID, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String buildChat(@HeaderParam(Security.API_KEY_HEADER) String apiKey, ChatTransactionData transactionData) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ChatTransaction chatTransaction = (ChatTransaction) Transaction.fromData(repository, transactionData);
-
-			ValidationResult result = chatTransaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			byte[] bytes = ChatTransactionTransformer.toBytes(transactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/compute")
-	@Operation(
-		summary = "Compute nonce for raw, unsigned CHAT transaction",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "raw, unsigned CHAT transaction in base58 encoding",
-					example = "raw transaction base58"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "raw, unsigned, CHAT transaction encoded in Base58",
-				content = @Content(
-					mediaType = MediaType.TEXT_PLAIN,
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.TRANSACTION_INVALID, ApiError.INVALID_DATA, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String buildChat(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String rawBytes58) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			byte[] rawBytes = Base58.decode(rawBytes58);
-			// We're expecting unsigned transaction, so append empty signature prior to decoding
-			rawBytes = Bytes.concat(rawBytes, new byte[TransactionTransformer.SIGNATURE_LENGTH]);
-
-			TransactionData transactionData = TransactionTransformer.fromBytes(rawBytes);
-			if (transactionData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			if (transactionData.getType() != TransactionType.CHAT)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			ChatTransaction chatTransaction = (ChatTransaction) Transaction.fromData(repository, transactionData);
-
-			// Quicker validity check first before we compute nonce
-			ValidationResult result = chatTransaction.isValid();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			chatTransaction.computeNonce();
-
-			// Re-check, but ignores signature
-			result = chatTransaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			// Strip zeroed signature
-			transactionData.setSignature(null);
-
-			byte[] bytes = ChatTransactionTransformer.toBytes(transactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainBitcoinACCTv1Resource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainBitcoinACCTv1Resource.java
@@ -1,368 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.Arrays;
-import java.util.Random;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.qortal.account.PublicKeyAccount;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.CrossChainBuildRequest;
-import org.qortal.api.model.CrossChainDualSecretRequest;
-import org.qortal.api.model.CrossChainTradeRequest;
-import org.qortal.asset.Asset;
-import org.qortal.crosschain.BitcoinACCTv1;
-import org.qortal.crosschain.Bitcoiny;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.transaction.BaseTransactionData;
-import org.qortal.data.transaction.DeployAtTransactionData;
-import org.qortal.data.transaction.MessageTransactionData;
-import org.qortal.data.transaction.TransactionData;
-import org.qortal.group.Group;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.transaction.DeployAtTransaction;
-import org.qortal.transaction.MessageTransaction;
-import org.qortal.transaction.Transaction;
-import org.qortal.transaction.Transaction.TransactionType;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.Transformer;
-import org.qortal.transform.transaction.DeployAtTransactionTransformer;
-import org.qortal.transform.transaction.MessageTransactionTransformer;
-import org.qortal.utils.Base58;
-import org.qortal.utils.NTP;
-
-@Path("/crosschain/BitcoinACCTv1")
-@Tag(name = "Cross-Chain (BitcoinACCTv1)")
-public class CrossChainBitcoinACCTv1Resource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/build")
-	@Operation(
-		summary = "Build Bitcoin cross-chain trading AT",
-		description = "Returns raw, unsigned DEPLOY_AT transaction",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainBuildRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_DATA, ApiError.INVALID_REFERENCE, ApiError.TRANSFORMATION_ERROR, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String buildTrade(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainBuildRequest tradeRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] creatorPublicKey = tradeRequest.creatorPublicKey;
-
-		if (creatorPublicKey == null || creatorPublicKey.length != Transformer.PUBLIC_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-		if (tradeRequest.hashOfSecretB == null || tradeRequest.hashOfSecretB.length != Bitcoiny.HASH160_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (tradeRequest.tradeTimeout == null)
-			tradeRequest.tradeTimeout = 7 * 24 * 60; // 7 days
-		else
-			if (tradeRequest.tradeTimeout < 10 || tradeRequest.tradeTimeout > 50000)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (tradeRequest.qortAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (tradeRequest.fundingQortAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		// funding amount must exceed initial + final
-		if (tradeRequest.fundingQortAmount <= tradeRequest.qortAmount)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (tradeRequest.bitcoinAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			PublicKeyAccount creatorAccount = new PublicKeyAccount(repository, creatorPublicKey);
-
-			byte[] creationBytes = BitcoinACCTv1.buildQortalAT(creatorAccount.getAddress(), tradeRequest.bitcoinPublicKeyHash, tradeRequest.hashOfSecretB,
-					tradeRequest.qortAmount, tradeRequest.bitcoinAmount, tradeRequest.tradeTimeout);
-
-			long txTimestamp = NTP.getTime();
-			byte[] lastReference = creatorAccount.getLastReference();
-			if (lastReference == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_REFERENCE);
-
-			long fee = 0;
-			String name = "QORT-BTC cross-chain trade";
-			String description = "Qortal-Bitcoin cross-chain trade";
-			String atType = "ACCT";
-			String tags = "QORT-BTC ACCT";
-
-			BaseTransactionData baseTransactionData = new BaseTransactionData(txTimestamp, Group.NO_GROUP, lastReference, creatorAccount.getPublicKey(), fee, null);
-			TransactionData deployAtTransactionData = new DeployAtTransactionData(baseTransactionData, name, description, atType, tags, creationBytes, tradeRequest.fundingQortAmount, Asset.QORT);
-
-			Transaction deployAtTransaction = new DeployAtTransaction(repository, deployAtTransactionData);
-
-			fee = deployAtTransaction.calcRecommendedFee();
-			deployAtTransactionData.setFee(fee);
-
-			ValidationResult result = deployAtTransaction.isValidUnconfirmed();
-			if (result != ValidationResult.OK)
-				throw TransactionsResource.createTransactionInvalidException(request, result);
-
-			byte[] bytes = DeployAtTransactionTransformer.toBytes(deployAtTransactionData);
-			return Base58.encode(bytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/trademessage")
-	@Operation(
-		summary = "Builds raw, unsigned 'trade' MESSAGE transaction that sends cross-chain trade recipient address, triggering 'trade' mode",
-		description = "Specify address of cross-chain AT that needs to be messaged, and signature of 'offer' MESSAGE from trade partner.<br>"
-			+ "AT needs to be in 'offer' mode. Messages sent to an AT in any other mode will be ignored, but still cost fees to send!<br>"
-			+ "You need to sign output with trade private key otherwise the MESSAGE transaction will be invalid.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainTradeRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String buildTradeMessage(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainTradeRequest tradeRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] tradePublicKey = tradeRequest.tradePublicKey;
-
-		if (tradePublicKey == null || tradePublicKey.length != Transformer.PUBLIC_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-		if (tradeRequest.atAddress == null || !Crypto.isValidAtAddress(tradeRequest.atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (tradeRequest.messageTransactionSignature == null || !Crypto.isValidAddress(tradeRequest.messageTransactionSignature))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, tradeRequest.atAddress);
-			CrossChainTradeData crossChainTradeData = BitcoinACCTv1.getInstance().populateTradeData(repository, atData);
-
-			if (crossChainTradeData.mode != AcctMode.OFFERING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Does supplied public key match trade public key?
-			if (!Crypto.toAddress(tradePublicKey).equals(crossChainTradeData.qortalCreatorTradeAddress))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-			TransactionData transactionData = repository.getTransactionRepository().fromSignature(tradeRequest.messageTransactionSignature);
-			if (transactionData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSACTION_UNKNOWN);
-
-			if (transactionData.getType() != TransactionType.MESSAGE)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSACTION_INVALID);
-
-			MessageTransactionData messageTransactionData = (MessageTransactionData) transactionData;
-			byte[] messageData = messageTransactionData.getData();
-			BitcoinACCTv1.OfferMessageData offerMessageData = BitcoinACCTv1.extractOfferMessageData(messageData);
-			if (offerMessageData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSACTION_INVALID);
-
-			// Good to make MESSAGE
-
-			byte[] aliceForeignPublicKeyHash = offerMessageData.partnerBitcoinPKH;
-			byte[] hashOfSecretA = offerMessageData.hashOfSecretA;
-			int lockTimeA = (int) offerMessageData.lockTimeA;
-
-			String aliceNativeAddress = Crypto.toAddress(messageTransactionData.getCreatorPublicKey());
-			int lockTimeB = BitcoinACCTv1.calcLockTimeB(messageTransactionData.getTimestamp(), lockTimeA);
-
-			byte[] outgoingMessageData = BitcoinACCTv1.buildTradeMessage(aliceNativeAddress, aliceForeignPublicKeyHash, hashOfSecretA, lockTimeA, lockTimeB);
-			byte[] messageTransactionBytes = buildAtMessage(repository, tradePublicKey, tradeRequest.atAddress, outgoingMessageData);
-
-			return Base58.encode(messageTransactionBytes);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/redeemmessage")
-	@Operation(
-		summary = "Builds raw, unsigned 'redeem' MESSAGE transaction that sends secrets to AT, releasing funds to partner",
-		description = "Specify address of cross-chain AT that needs to be messaged, both 32-byte secrets and an address for receiving QORT from AT.<br>"
-			+ "AT needs to be in 'trade' mode. Messages sent to an AT in any other mode will be ignored, but still cost fees to send!<br>"
-			+ "You need to sign output with account the AT considers the trade 'partner' otherwise the MESSAGE transaction will be invalid.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainDualSecretRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_DATA, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String buildRedeemMessage(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainDualSecretRequest secretRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] partnerPublicKey = secretRequest.partnerPublicKey;
-
-		if (partnerPublicKey == null || partnerPublicKey.length != Transformer.PUBLIC_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-		if (secretRequest.atAddress == null || !Crypto.isValidAtAddress(secretRequest.atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (secretRequest.secretA == null || secretRequest.secretA.length != BitcoinACCTv1.SECRET_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (secretRequest.secretB == null || secretRequest.secretB.length != BitcoinACCTv1.SECRET_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (secretRequest.receivingAddress == null || !Crypto.isValidAddress(secretRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, secretRequest.atAddress);
-			CrossChainTradeData crossChainTradeData = BitcoinACCTv1.getInstance().populateTradeData(repository, atData);
-
-			if (crossChainTradeData.mode != AcctMode.TRADING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			String partnerAddress = Crypto.toAddress(partnerPublicKey);
-
-			// MESSAGE must come from address that AT considers trade partner
-			if (!crossChainTradeData.qortalPartnerAddress.equals(partnerAddress))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			// Good to make MESSAGE
-
-			byte[] messageData = BitcoinACCTv1.buildRedeemMessage(secretRequest.secretA, secretRequest.secretB, secretRequest.receivingAddress);
-			byte[] messageTransactionBytes = buildAtMessage(repository, partnerPublicKey, secretRequest.atAddress, messageData);
-
-			return Base58.encode(messageTransactionBytes);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	private ATData fetchAtDataWithChecking(Repository repository, String atAddress) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atAddress);
-		if (atData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-		// Must be correct AT - check functionality using code hash
-		if (!Arrays.equals(atData.getCodeHash(), BitcoinACCTv1.CODE_BYTES_HASH))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// No point sending message to AT that's finished
-		if (atData.getIsFinished())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		return atData;
-	}
-
-	private byte[] buildAtMessage(Repository repository, byte[] senderPublicKey, String atAddress, byte[] messageData) throws DataException {
-		long txTimestamp = NTP.getTime();
-
-		// senderPublicKey could be ephemeral trade public key where there is no corresponding account and hence no reference
-		String senderAddress = Crypto.toAddress(senderPublicKey);
-		byte[] lastReference = repository.getAccountRepository().getLastReference(senderAddress);
-		final boolean requiresPoW = lastReference == null;
-
-		if (requiresPoW) {
-			Random random = new Random();
-			lastReference = new byte[Transformer.SIGNATURE_LENGTH];
-			random.nextBytes(lastReference);
-		}
-
-		int version = 4;
-		int nonce = 0;
-		long amount = 0L;
-		Long assetId = null; // no assetId as amount is zero
-		Long fee = 0L;
-
-		BaseTransactionData baseTransactionData = new BaseTransactionData(txTimestamp, Group.NO_GROUP, lastReference, senderPublicKey, fee, null);
-		TransactionData messageTransactionData = new MessageTransactionData(baseTransactionData, version, nonce, atAddress, amount, assetId, messageData, false, false);
-
-		MessageTransaction messageTransaction = new MessageTransaction(repository, messageTransactionData);
-
-		if (requiresPoW) {
-			messageTransaction.computeNonce();
-		} else {
-			fee = messageTransaction.calcRecommendedFee();
-			messageTransactionData.setFee(fee);
-		}
-
-		ValidationResult result = messageTransaction.isValidUnconfirmed();
-		if (result != ValidationResult.OK)
-			throw TransactionsResource.createTransactionInvalidException(request, result);
-
-		try {
-			return MessageTransactionTransformer.toBytes(messageTransactionData);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainBitcoinResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainBitcoinResource.java
@@ -1,177 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.bitcoinj.core.Transaction;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.crosschain.BitcoinSendRequest;
-import org.qortal.crosschain.Bitcoin;
-import org.qortal.crosschain.ForeignBlockchainException;
-import org.qortal.crosschain.SimpleTransaction;
-
-@Path("/crosschain/btc")
-@Tag(name = "Cross-Chain (Bitcoin)")
-public class CrossChainBitcoinResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/walletbalance")
-	@Operation(
-		summary = "Returns BTC balance for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "balance (satoshis)"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String getBitcoinWalletBalance(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Bitcoin bitcoin = Bitcoin.getInstance();
-
-		if (!bitcoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			Long balance = bitcoin.getWalletBalanceFromTransactions(key58);
-			if (balance == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-
-			return balance.toString();
-
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/wallettransactions")
-	@Operation(
-		summary = "Returns transactions for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public List<SimpleTransaction> getBitcoinWalletTransactions(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Bitcoin bitcoin = Bitcoin.getInstance();
-
-		if (!bitcoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			return bitcoin.getWalletTransactions(key58);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/send")
-	@Operation(
-		summary = "Sends BTC from hierarchical, deterministic BIP32 wallet to specific address",
-		description = "Currently only supports 'legacy' P2PKH Bitcoin addresses. Supply BIP32 'm' private key in base58, starting with 'xprv' for mainnet, 'tprv' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = BitcoinSendRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "transaction hash"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String sendBitcoin(@HeaderParam(Security.API_KEY_HEADER) String apiKey, BitcoinSendRequest bitcoinSendRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (bitcoinSendRequest.bitcoinAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		if (bitcoinSendRequest.feePerByte != null && bitcoinSendRequest.feePerByte <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		Bitcoin bitcoin = Bitcoin.getInstance();
-
-		if (!bitcoin.isValidAddress(bitcoinSendRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (!bitcoin.isValidDeterministicKey(bitcoinSendRequest.xprv58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		Transaction spendTransaction = bitcoin.buildSpend(bitcoinSendRequest.xprv58,
-				bitcoinSendRequest.receivingAddress,
-				bitcoinSendRequest.bitcoinAmount,
-				bitcoinSendRequest.feePerByte);
-
-		if (spendTransaction == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE);
-
-		try {
-			bitcoin.broadcastTransaction(spendTransaction);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-
-		return spendTransaction.getTxId().toString();
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainDogecoinACCTv1Resource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainDogecoinACCTv1Resource.java
@@ -1,143 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.qortal.account.PrivateKeyAccount;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.CrossChainSecretRequest;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.crosschain.DogecoinACCTv1;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.group.Group;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.transaction.MessageTransaction;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.Transformer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.util.Arrays;
-
-@Path("/crosschain/DogecoinACCTv1")
-@Tag(name = "Cross-Chain (DogecoinACCTv1)")
-public class CrossChainDogecoinACCTv1Resource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/redeemmessage")
-	@Operation(
-		summary = "Signs and broadcasts a 'redeem' MESSAGE transaction that sends secrets to AT, releasing funds to partner",
-		description = "Specify address of cross-chain AT that needs to be messaged, Alice's trade private key, the 32-byte secret,<br>"
-			+ "and an address for receiving QORT from AT. All of these can be found in Alice's trade bot data.<br>"
-			+ "AT needs to be in 'trade' mode. Messages sent to an AT in any other mode will be ignored, but still cost fees to send!<br>"
-			+ "You need to use the private key that the AT considers the trade 'partner' otherwise the MESSAGE transaction will be invalid.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainSecretRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_DATA, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public boolean buildRedeemMessage(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainSecretRequest secretRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] partnerPrivateKey = secretRequest.partnerPrivateKey;
-
-		if (partnerPrivateKey == null || partnerPrivateKey.length != Transformer.PRIVATE_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		if (secretRequest.atAddress == null || !Crypto.isValidAtAddress(secretRequest.atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (secretRequest.secret == null || secretRequest.secret.length != DogecoinACCTv1.SECRET_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (secretRequest.receivingAddress == null || !Crypto.isValidAddress(secretRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, secretRequest.atAddress);
-			CrossChainTradeData crossChainTradeData = DogecoinACCTv1.getInstance().populateTradeData(repository, atData);
-
-			if (crossChainTradeData.mode != AcctMode.TRADING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			byte[] partnerPublicKey = new PrivateKeyAccount(null, partnerPrivateKey).getPublicKey();
-			String partnerAddress = Crypto.toAddress(partnerPublicKey);
-
-			// MESSAGE must come from address that AT considers trade partner
-			if (!crossChainTradeData.qortalPartnerAddress.equals(partnerAddress))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			// Good to make MESSAGE
-
-			byte[] messageData = DogecoinACCTv1.buildRedeemMessage(secretRequest.secret, secretRequest.receivingAddress);
-
-			PrivateKeyAccount sender = new PrivateKeyAccount(repository, partnerPrivateKey);
-			MessageTransaction messageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, secretRequest.atAddress, messageData, false, false);
-
-			messageTransaction.computeNonce();
-			messageTransaction.sign(sender);
-
-			// reset repository state to prevent deadlock
-			repository.discardChanges();
-			ValidationResult result = messageTransaction.importAsUnconfirmed();
-
-			if (result != ValidationResult.OK)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSACTION_INVALID);
-
-			return true;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	private ATData fetchAtDataWithChecking(Repository repository, String atAddress) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atAddress);
-		if (atData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-		// Must be correct AT - check functionality using code hash
-		if (!Arrays.equals(atData.getCodeHash(), DogecoinACCTv1.CODE_BYTES_HASH))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// No point sending message to AT that's finished
-		if (atData.getIsFinished())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		return atData;
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainDogecoinResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainDogecoinResource.java
@@ -1,175 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.bitcoinj.core.Transaction;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.crosschain.DogecoinSendRequest;
-import org.qortal.crosschain.ForeignBlockchainException;
-import org.qortal.crosschain.Dogecoin;
-import org.qortal.crosschain.SimpleTransaction;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-@Path("/crosschain/doge")
-@Tag(name = "Cross-Chain (Dogecoin)")
-public class CrossChainDogecoinResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/walletbalance")
-	@Operation(
-		summary = "Returns DOGE balance for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "balance (satoshis)"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String getDogecoinWalletBalance(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Dogecoin dogecoin = Dogecoin.getInstance();
-
-		if (!dogecoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			Long balance = dogecoin.getWalletBalanceFromTransactions(key58);
-			if (balance == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-
-			return balance.toString();
-
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/wallettransactions")
-	@Operation(
-		summary = "Returns transactions for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public List<SimpleTransaction> getDogecoinWalletTransactions(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Dogecoin dogecoin = Dogecoin.getInstance();
-
-		if (!dogecoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			return dogecoin.getWalletTransactions(key58);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/send")
-	@Operation(
-		summary = "Sends DOGE from hierarchical, deterministic BIP32 wallet to specific address",
-		description = "Currently only supports 'legacy' P2PKH Dogecoin addresses. Supply BIP32 'm' private key in base58, starting with 'xprv' for mainnet, 'tprv' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = DogecoinSendRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "transaction hash"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String sendBitcoin(@HeaderParam(Security.API_KEY_HEADER) String apiKey, DogecoinSendRequest dogecoinSendRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (dogecoinSendRequest.dogecoinAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		if (dogecoinSendRequest.feePerByte != null && dogecoinSendRequest.feePerByte <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		Dogecoin dogecoin = Dogecoin.getInstance();
-
-		if (!dogecoin.isValidAddress(dogecoinSendRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (!dogecoin.isValidDeterministicKey(dogecoinSendRequest.xprv58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		Transaction spendTransaction = dogecoin.buildSpend(dogecoinSendRequest.xprv58,
-				dogecoinSendRequest.receivingAddress,
-				dogecoinSendRequest.dogecoinAmount,
-				dogecoinSendRequest.feePerByte);
-
-		if (spendTransaction == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE);
-
-		try {
-			dogecoin.broadcastTransaction(spendTransaction);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-
-		return spendTransaction.getTxId().toString();
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainHtlcResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainHtlcResource.java
@@ -1,657 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bitcoinj.core.*;
-import org.bitcoinj.script.Script;
-import org.qortal.api.*;
-import org.qortal.api.model.CrossChainBitcoinyHTLCStatus;
-import org.qortal.crosschain.*;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.crosschain.TradeBotData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.utils.Base58;
-import org.qortal.utils.NTP;
-
-@Path("/crosschain/htlc")
-@Tag(name = "Cross-Chain (Hash time-locked contracts)")
-public class CrossChainHtlcResource {
-
-	private static final Logger LOGGER = LogManager.getLogger(CrossChainHtlcResource.class);
-
-	@Context
-	HttpServletRequest request;
-
-	@GET
-	@Path("/address/{blockchain}/{refundPKH}/{locktime}/{redeemPKH}/{hashOfSecret}")
-	@Operation(
-		summary = "Returns HTLC address based on trade info",
-		description = "Public key hashes (PKH) and hash of secret should be 20 bytes (base58 encoded). Locktime is seconds since epoch.",
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_CRITERIA})
-	public String deriveHtlcAddress(@PathParam("blockchain") String blockchainName,
-			@PathParam("refundPKH") String refundPKH,
-			@PathParam("locktime") int lockTime,
-			@PathParam("redeemPKH") String redeemPKH,
-			@PathParam("hashOfSecret") String hashOfSecret) {
-		SupportedBlockchain blockchain = SupportedBlockchain.valueOf(blockchainName);
-		if (blockchain == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		byte[] refunderPubKeyHash;
-		byte[] redeemerPubKeyHash;
-		byte[] decodedHashOfSecret;
-
-		try {
-			refunderPubKeyHash = Base58.decode(refundPKH);
-			redeemerPubKeyHash = Base58.decode(redeemPKH);
-
-			if (refunderPubKeyHash.length != 20 || redeemerPubKeyHash.length != 20)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-		} catch (IllegalArgumentException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-		}
-
-		try {
-			decodedHashOfSecret = Base58.decode(hashOfSecret);
-			if (decodedHashOfSecret.length != 20)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		} catch (IllegalArgumentException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		}
-
-		byte[] redeemScript = BitcoinyHTLC.buildScript(refunderPubKeyHash, lockTime, redeemerPubKeyHash, decodedHashOfSecret);
-
-		Bitcoiny bitcoiny = (Bitcoiny) blockchain.getInstance();
-
-		return bitcoiny.deriveP2shAddress(redeemScript);
-	}
-
-	@GET
-	@Path("/status/{blockchain}/{refundPKH}/{locktime}/{redeemPKH}/{hashOfSecret}")
-	@Operation(
-		summary = "Checks HTLC status",
-		description = "Public key hashes (PKH) and hash of secret should be 20 bytes (base58 encoded). Locktime is seconds since epoch.",
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = CrossChainBitcoinyHTLCStatus.class))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN})
-	@SecurityRequirement(name = "apiKey")
-	public CrossChainBitcoinyHTLCStatus checkHtlcStatus(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-			@PathParam("blockchain") String blockchainName,
-			@PathParam("refundPKH") String refundPKH,
-			@PathParam("locktime") int lockTime,
-			@PathParam("redeemPKH") String redeemPKH,
-			@PathParam("hashOfSecret") String hashOfSecret) {
-		Security.checkApiCallAllowed(request);
-
-		SupportedBlockchain blockchain = SupportedBlockchain.valueOf(blockchainName);
-		if (blockchain == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		byte[] refunderPubKeyHash;
-		byte[] redeemerPubKeyHash;
-		byte[] decodedHashOfSecret;
-
-		try {
-			refunderPubKeyHash = Base58.decode(refundPKH);
-			redeemerPubKeyHash = Base58.decode(redeemPKH);
-
-			if (refunderPubKeyHash.length != 20 || redeemerPubKeyHash.length != 20)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-		} catch (IllegalArgumentException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-		}
-
-		try {
-			decodedHashOfSecret = Base58.decode(hashOfSecret);
-			if (decodedHashOfSecret.length != 20)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		} catch (IllegalArgumentException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		}
-
-		byte[] redeemScript = BitcoinyHTLC.buildScript(refunderPubKeyHash, lockTime, redeemerPubKeyHash, decodedHashOfSecret);
-
-		Bitcoiny bitcoiny = (Bitcoiny) blockchain.getInstance();
-
-		String p2shAddress = bitcoiny.deriveP2shAddress(redeemScript);
-
-		long now = NTP.getTime();
-
-		try {
-			int medianBlockTime = bitcoiny.getMedianBlockTime();
-
-			// Check P2SH is funded
-			long p2shBalance = bitcoiny.getConfirmedBalance(p2shAddress.toString());
-
-			CrossChainBitcoinyHTLCStatus htlcStatus = new CrossChainBitcoinyHTLCStatus();
-			htlcStatus.bitcoinP2shAddress = p2shAddress;
-			htlcStatus.bitcoinP2shBalance = BigDecimal.valueOf(p2shBalance, 8);
-
-			List<TransactionOutput> fundingOutputs = bitcoiny.getUnspentOutputs(p2shAddress.toString());
-
-			if (p2shBalance > 0L && !fundingOutputs.isEmpty()) {
-				htlcStatus.canRedeem = now >= medianBlockTime * 1000L;
-				htlcStatus.canRefund = now >= lockTime * 1000L;
-			}
-
-			if (now >= medianBlockTime * 1000L) {
-				// See if we can extract secret
-				htlcStatus.secret = BitcoinyHTLC.findHtlcSecret(bitcoiny, htlcStatus.bitcoinP2shAddress);
-			}
-
-			return htlcStatus;
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/redeem/{ataddress}")
-	@Operation(
-			summary = "Redeems HTLC associated with supplied AT",
-			description = "To be used by a QORT seller (Bob) who needs to redeem LTC/DOGE/etc proceeds that are stuck in a P2SH.<br>" +
-					"This requires Bob's trade bot data to be present in the database for this AT.<br>" +
-					"It will fail if the buyer has yet to redeem the QORT held in the AT.",
-			responses = {
-					@ApiResponse(
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN})
-	@SecurityRequirement(name = "apiKey")
-	public boolean redeemHtlc(@HeaderParam(Security.API_KEY_HEADER) String apiKey, @PathParam("ataddress") String atAddress) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = repository.getATRepository().fromATAddress(atAddress);
-			if (atData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-			if (crossChainTradeData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Attempt to find secret from the buyer's message to AT
-			byte[] decodedSecret = acct.findSecretA(repository, crossChainTradeData);
-			if (decodedSecret == null) {
-				LOGGER.info(() -> String.format("Unable to find secret-A from redeem message to AT %s", atAddress));
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
-
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-			TradeBotData tradeBotData = allTradeBotData.stream().filter(tradeBotDataItem -> tradeBotDataItem.getAtAddress().equals(atAddress)).findFirst().orElse(null);
-
-			// Search for the tradePrivateKey in the tradebot data
-			byte[] decodedPrivateKey = null;
-			if (tradeBotData != null)
-				decodedPrivateKey = tradeBotData.getTradePrivateKey();
-
-			// Search for the foreign blockchain receiving address in the tradebot data
-			byte[] foreignBlockchainReceivingAccountInfo = null;
-			if (tradeBotData != null)
-				// Use receiving address PKH from tradebot data
-				foreignBlockchainReceivingAccountInfo = tradeBotData.getReceivingAccountInfo();
-
-			return this.doRedeemHtlc(atAddress, decodedPrivateKey, decodedSecret, foreignBlockchainReceivingAccountInfo);
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/redeemAll")
-	@Operation(
-			summary = "Redeems HTLC for all applicable ATs in tradebot data",
-			description = "To be used by a QORT seller (Bob) who needs to redeem LTC/DOGE/etc proceeds that are stuck in P2SH transactions.<br>" +
-					"This requires Bob's trade bot data to be present in the database for any ATs that need redeeming.<br>" +
-					"Returns true if at least one trade is redeemed. More detail is available in the log.txt.* file.",
-			responses = {
-					@ApiResponse(
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN})
-	@SecurityRequirement(name = "apiKey")
-	public boolean redeemAllHtlc(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-		boolean success = false;
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-
-			for (TradeBotData tradeBotData : allTradeBotData) {
-				String atAddress = tradeBotData.getAtAddress();
-				if (atAddress == null) {
-					LOGGER.info("Missing AT address in tradebot data", atAddress);
-					continue;
-				}
-
-				String tradeState = tradeBotData.getState();
-				if (tradeState == null) {
-					LOGGER.info("Missing trade state for AT {}", atAddress);
-					continue;
-				}
-
-				if (tradeState.startsWith("ALICE")) {
-					LOGGER.info("AT {} isn't redeemable because it is a buy order", atAddress);
-					continue;
-				}
-
-				ATData atData = repository.getATRepository().fromATAddress(atAddress);
-				if (atData == null) {
-					LOGGER.info("Couldn't find AT with address {}", atAddress);
-					continue;
-				}
-
-				ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-				if (acct == null) {
-					continue;
-				}
-
-				CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-				if (crossChainTradeData == null) {
-					LOGGER.info("Couldn't find crosschain trade data for AT {}", atAddress);
-					continue;
-				}
-
-				// Attempt to find secret from the buyer's message to AT
-				byte[] decodedSecret = acct.findSecretA(repository, crossChainTradeData);
-				if (decodedSecret == null) {
-					LOGGER.info("Unable to find secret-A from redeem message to AT {}", atAddress);
-					continue;
-				}
-
-				// Search for the tradePrivateKey in the tradebot data
-				byte[] decodedPrivateKey = tradeBotData.getTradePrivateKey();
-
-				// Search for the foreign blockchain receiving address PKH in the tradebot data
-				byte[] foreignBlockchainReceivingAccountInfo = tradeBotData.getReceivingAccountInfo();
-
-				try {
-					LOGGER.info("Attempting to redeem P2SH balance associated with AT {}...", atAddress);
-					boolean redeemed = this.doRedeemHtlc(atAddress, decodedPrivateKey, decodedSecret, foreignBlockchainReceivingAccountInfo);
-					if (redeemed) {
-						LOGGER.info("Redeemed P2SH balance associated with AT {}", atAddress);
-						success = true;
-					}
-					else {
-						LOGGER.info("Couldn't redeem P2SH balance associated with AT {}. Already redeemed?", atAddress);
-					}
-				} catch (ApiException e) {
-					LOGGER.info("Couldn't redeem P2SH balance associated with AT {}. Missing data?", atAddress);
-				}
-			}
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-
-		return success;
-	}
-
-	private boolean doRedeemHtlc(String atAddress, byte[] decodedTradePrivateKey, byte[] decodedSecret,
-								 byte[] foreignBlockchainReceivingAccountInfo) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			ATData atData = repository.getATRepository().fromATAddress(atAddress);
-			if (atData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-			if (crossChainTradeData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Validate trade private key
-			if (decodedTradePrivateKey == null || decodedTradePrivateKey.length != 32)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Validate secret
-			if (decodedSecret == null || decodedSecret.length != 32)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Validate receiving address
-			if (foreignBlockchainReceivingAccountInfo == null || foreignBlockchainReceivingAccountInfo.length != 20)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Make sure the receiving address isn't a QORT address, given that we can share the same field for both QORT and foreign blockchains
-			if (Crypto.isValidAddress(foreignBlockchainReceivingAccountInfo))
-				if (Base58.encode(foreignBlockchainReceivingAccountInfo).startsWith("Q"))
-					// This is likely a QORT address, not a foreign blockchain
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-
-			// Use secret-A to redeem P2SH-A
-
-			Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-			if (bitcoiny.getClass() == Bitcoin.class) {
-				LOGGER.info("Redeeming a Bitcoin HTLC is not yet supported");
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
-
-			int lockTime = crossChainTradeData.lockTimeA;
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(crossChainTradeData.partnerForeignPKH, lockTime, crossChainTradeData.creatorForeignPKH, crossChainTradeData.hashOfSecretA);
-			String p2shAddressA = bitcoiny.deriveP2shAddress(redeemScriptA);
-			LOGGER.info(String.format("Redeeming P2SH address: %s", p2shAddressA));
-
-			// Fee for redeem/refund is subtracted from P2SH-A balance.
-			long feeTimestamp = calcFeeTimestamp(lockTime, crossChainTradeData.tradeTimeout);
-			long p2shFee = bitcoiny.getP2shFee(feeTimestamp);
-			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(bitcoiny.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-			switch (htlcStatusA) {
-				case UNFUNDED:
-				case FUNDING_IN_PROGRESS:
-					// P2SH-A suddenly not funded? Our best bet at this point is to hope for AT auto-refund
-					return false;
-
-				case REDEEM_IN_PROGRESS:
-				case REDEEMED:
-					// Double-check that we have redeemed P2SH-A...
-					return false;
-
-				case REFUND_IN_PROGRESS:
-				case REFUNDED:
-					// Wait for AT to auto-refund
-					return false;
-
-				case FUNDED: {
-					Coin redeemAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-					ECKey redeemKey = ECKey.fromPrivate(decodedTradePrivateKey);
-					List<TransactionOutput> fundingOutputs = bitcoiny.getUnspentOutputs(p2shAddressA);
-
-					Transaction p2shRedeemTransaction = BitcoinyHTLC.buildRedeemTransaction(bitcoiny.getNetworkParameters(), redeemAmount, redeemKey,
-							fundingOutputs, redeemScriptA, decodedSecret, foreignBlockchainReceivingAccountInfo);
-
-					bitcoiny.broadcastTransaction(p2shRedeemTransaction);
-					LOGGER.info(String.format("P2SH address %s redeemed!", p2shAddressA));
-					return true;
-				}
-			}
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, e);
-		}
-
-		return false;
-	}
-
-	@POST
-	@Path("/refund/{ataddress}")
-	@Operation(
-			summary = "Refunds HTLC associated with supplied AT",
-			description = "To be used by a QORT buyer (Alice) who needs to refund their LTC/DOGE/etc that is stuck in a P2SH.<br>" +
-					"This requires Alice's trade bot data to be present in the database for this AT.<br>" +
-					"It will fail if it's already redeemed by the seller, or if the lockTime (60 minutes) hasn't passed yet.",
-			responses = {
-					@ApiResponse(
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN})
-	@SecurityRequirement(name = "apiKey")
-	public boolean refundHtlc(@HeaderParam(Security.API_KEY_HEADER) String apiKey, @PathParam("ataddress") String atAddress) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-			TradeBotData tradeBotData = allTradeBotData.stream().filter(tradeBotDataItem -> tradeBotDataItem.getAtAddress().equals(atAddress)).findFirst().orElse(null);
-			if (tradeBotData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			if (tradeBotData.getForeignKey() == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			ATData atData = repository.getATRepository().fromATAddress(atAddress);
-			if (atData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Determine foreign blockchain receive address for refund
-			Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-			String receiveAddress = bitcoiny.getUnusedReceiveAddress(tradeBotData.getForeignKey());
-
-			return this.doRefundHtlc(atAddress, receiveAddress);
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, e);
-		}
-	}
-
-
-	@POST
-	@Path("/refundAll")
-	@Operation(
-			summary = "Refunds HTLC for all applicable ATs in tradebot data",
-			description = "To be used by a QORT buyer (Alice) who needs to refund their LTC/DOGE/etc proceeds that are stuck in P2SH transactions.<br>" +
-					"This requires Alice's trade bot data to be present in the database for this AT.<br>" +
-					"It will fail if it's already redeemed by the seller, or if the lockTime (60 minutes) hasn't passed yet.",
-			responses = {
-					@ApiResponse(
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.ADDRESS_UNKNOWN})
-	@SecurityRequirement(name = "apiKey")
-	public boolean refundAllHtlc(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
-		Security.checkApiCallAllowed(request);
-		boolean success = false;
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-
-			for (TradeBotData tradeBotData : allTradeBotData) {
-				String atAddress = tradeBotData.getAtAddress();
-				if (atAddress == null) {
-					LOGGER.info("Missing AT address in tradebot data", atAddress);
-					continue;
-				}
-
-				String tradeState = tradeBotData.getState();
-				if (tradeState == null) {
-					LOGGER.info("Missing trade state for AT {}", atAddress);
-					continue;
-				}
-
-				if (tradeState.startsWith("BOB")) {
-					LOGGER.info("AT {} isn't refundable because it is a sell order", atAddress);
-					continue;
-				}
-
-				ATData atData = repository.getATRepository().fromATAddress(atAddress);
-				if (atData == null) {
-					LOGGER.info("Couldn't find AT with address {}", atAddress);
-					continue;
-				}
-
-				ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-				if (acct == null) {
-					continue;
-				}
-
-				CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-				if (crossChainTradeData == null) {
-					LOGGER.info("Couldn't find crosschain trade data for AT {}", atAddress);
-					continue;
-				}
-
-				if (tradeBotData.getForeignKey() == null) {
-					LOGGER.info("Couldn't find foreign key for AT {}", atAddress);
-					continue;
-				}
-
-				try {
-					// Determine foreign blockchain receive address for refund
-					Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-					String receivingAddress = bitcoiny.getUnusedReceiveAddress(tradeBotData.getForeignKey());
-
-					LOGGER.info("Attempting to refund P2SH balance associated with AT {}...", atAddress);
-					boolean refunded = this.doRefundHtlc(atAddress, receivingAddress);
-					if (refunded) {
-						LOGGER.info("Refunded P2SH balance associated with AT {}", atAddress);
-						success = true;
-					}
-					else {
-						LOGGER.info("Couldn't refund P2SH balance associated with AT {}. Already redeemed?", atAddress);
-					}
-				} catch (ApiException | ForeignBlockchainException e) {
-					LOGGER.info("Couldn't refund P2SH balance associated with AT {}. Missing data?", atAddress);
-				}
-			}
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-
-		return success;
-	}
-
-
-	private boolean doRefundHtlc(String atAddress, String receiveAddress) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			ATData atData = repository.getATRepository().fromATAddress(atAddress);
-			if (atData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-			if (crossChainTradeData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// If the AT is "finished" then it will have a zero balance
-			// In these cases we should avoid HTLC refunds if tbe QORT haven't been returned to the seller
-			if (atData.getIsFinished() && crossChainTradeData.mode != AcctMode.REFUNDED && crossChainTradeData.mode != AcctMode.CANCELLED) {
-				LOGGER.info(String.format("Skipping AT %s because the QORT has already been redemed", atAddress));
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
-
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-			TradeBotData tradeBotData = allTradeBotData.stream().filter(tradeBotDataItem -> tradeBotDataItem.getAtAddress().equals(atAddress)).findFirst().orElse(null);
-			if (tradeBotData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			Bitcoiny bitcoiny = (Bitcoiny) acct.getBlockchain();
-			if (bitcoiny.getClass() == Bitcoin.class) {
-				LOGGER.info("Refunding a Bitcoin HTLC is not yet supported");
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-			}
-
-			int lockTime = tradeBotData.getLockTimeA();
-
-			// We can't refund P2SH-A until lockTime-A has passed
-			if (NTP.getTime() <= lockTime * 1000L)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_TOO_SOON);
-
-			// We can't refund P2SH-A until median block time has passed lockTime-A (see BIP113)
-			int medianBlockTime = bitcoiny.getMedianBlockTime();
-			if (medianBlockTime <= lockTime)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_TOO_SOON);
-
-			byte[] redeemScriptA = BitcoinyHTLC.buildScript(tradeBotData.getTradeForeignPublicKeyHash(), lockTime, crossChainTradeData.creatorForeignPKH, tradeBotData.getHashOfSecret());
-			String p2shAddressA = bitcoiny.deriveP2shAddress(redeemScriptA);
-			LOGGER.info(String.format("Refunding P2SH address: %s", p2shAddressA));
-
-			// Fee for redeem/refund is subtracted from P2SH-A balance.
-			long feeTimestamp = calcFeeTimestamp(lockTime, crossChainTradeData.tradeTimeout);
-			long p2shFee = bitcoiny.getP2shFee(feeTimestamp);
-			long minimumAmountA = crossChainTradeData.expectedForeignAmount + p2shFee;
-			BitcoinyHTLC.Status htlcStatusA = BitcoinyHTLC.determineHtlcStatus(bitcoiny.getBlockchainProvider(), p2shAddressA, minimumAmountA);
-
-			switch (htlcStatusA) {
-				case UNFUNDED:
-				case FUNDING_IN_PROGRESS:
-					// Still waiting for P2SH-A to be funded...
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_TOO_SOON);
-
-				case REDEEM_IN_PROGRESS:
-				case REDEEMED:
-				case REFUND_IN_PROGRESS:
-				case REFUNDED:
-					// Too late!
-					return false;
-
-				case FUNDED:{
-					Coin refundAmount = Coin.valueOf(crossChainTradeData.expectedForeignAmount);
-					ECKey refundKey = ECKey.fromPrivate(tradeBotData.getTradePrivateKey());
-					List<TransactionOutput> fundingOutputs = bitcoiny.getUnspentOutputs(p2shAddressA);
-
-					// Validate the destination foreign blockchain address
-					Address receiving = Address.fromString(bitcoiny.getNetworkParameters(), receiveAddress);
-					if (receiving.getOutputScriptType() != Script.ScriptType.P2PKH)
-						throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-					Transaction p2shRefundTransaction = BitcoinyHTLC.buildRefundTransaction(bitcoiny.getNetworkParameters(), refundAmount, refundKey,
-							fundingOutputs, redeemScriptA, lockTime, receiving.getHash());
-
-					bitcoiny.broadcastTransaction(p2shRefundTransaction);
-					return true;
-				}
-			}
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, e);
-		}
-
-		return false;
-	}
-
-	private long calcFeeTimestamp(int lockTimeA, int tradeTimeout) {
-		return (lockTimeA - tradeTimeout * 60) * 1000L;
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainLitecoinACCTv1Resource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainLitecoinACCTv1Resource.java
@@ -1,148 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.qortal.account.PrivateKeyAccount;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.CrossChainSecretRequest;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.crosschain.LitecoinACCTv1;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.group.Group;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.transaction.MessageTransaction;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.Transformer;
-import org.qortal.transform.transaction.MessageTransactionTransformer;
-import org.qortal.utils.Base58;
-import org.qortal.utils.NTP;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.util.Arrays;
-import java.util.Random;
-
-@Path("/crosschain/LitecoinACCTv1")
-@Tag(name = "Cross-Chain (LitecoinACCTv1)")
-public class CrossChainLitecoinACCTv1Resource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/redeemmessage")
-	@Operation(
-		summary = "Signs and broadcasts a 'redeem' MESSAGE transaction that sends secrets to AT, releasing funds to partner",
-		description = "Specify address of cross-chain AT that needs to be messaged, Alice's trade private key, the 32-byte secret,<br>"
-			+ "and an address for receiving QORT from AT. All of these can be found in Alice's trade bot data.<br>"
-			+ "AT needs to be in 'trade' mode. Messages sent to an AT in any other mode will be ignored, but still cost fees to send!<br>"
-			+ "You need to use the private key that the AT considers the trade 'partner' otherwise the MESSAGE transaction will be invalid.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainSecretRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_DATA, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public boolean buildRedeemMessage(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainSecretRequest secretRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] partnerPrivateKey = secretRequest.partnerPrivateKey;
-
-		if (partnerPrivateKey == null || partnerPrivateKey.length != Transformer.PRIVATE_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		if (secretRequest.atAddress == null || !Crypto.isValidAtAddress(secretRequest.atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (secretRequest.secret == null || secretRequest.secret.length != LitecoinACCTv1.SECRET_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-		if (secretRequest.receivingAddress == null || !Crypto.isValidAddress(secretRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, secretRequest.atAddress);
-			CrossChainTradeData crossChainTradeData = LitecoinACCTv1.getInstance().populateTradeData(repository, atData);
-
-			if (crossChainTradeData.mode != AcctMode.TRADING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			byte[] partnerPublicKey = new PrivateKeyAccount(null, partnerPrivateKey).getPublicKey();
-			String partnerAddress = Crypto.toAddress(partnerPublicKey);
-
-			// MESSAGE must come from address that AT considers trade partner
-			if (!crossChainTradeData.qortalPartnerAddress.equals(partnerAddress))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			// Good to make MESSAGE
-
-			byte[] messageData = LitecoinACCTv1.buildRedeemMessage(secretRequest.secret, secretRequest.receivingAddress);
-
-			PrivateKeyAccount sender = new PrivateKeyAccount(repository, partnerPrivateKey);
-			MessageTransaction messageTransaction = MessageTransaction.build(repository, sender, Group.NO_GROUP, secretRequest.atAddress, messageData, false, false);
-
-			messageTransaction.computeNonce();
-			messageTransaction.sign(sender);
-
-			// reset repository state to prevent deadlock
-			repository.discardChanges();
-			ValidationResult result = messageTransaction.importAsUnconfirmed();
-
-			if (result != ValidationResult.OK)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSACTION_INVALID);
-
-			return true;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	private ATData fetchAtDataWithChecking(Repository repository, String atAddress) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atAddress);
-		if (atData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-		// Must be correct AT - check functionality using code hash
-		if (!Arrays.equals(atData.getCodeHash(), LitecoinACCTv1.CODE_BYTES_HASH))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// No point sending message to AT that's finished
-		if (atData.getIsFinished())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		return atData;
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainLitecoinResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainLitecoinResource.java
@@ -1,177 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.bitcoinj.core.Transaction;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.crosschain.LitecoinSendRequest;
-import org.qortal.crosschain.ForeignBlockchainException;
-import org.qortal.crosschain.Litecoin;
-import org.qortal.crosschain.SimpleTransaction;
-
-@Path("/crosschain/ltc")
-@Tag(name = "Cross-Chain (Litecoin)")
-public class CrossChainLitecoinResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@POST
-	@Path("/walletbalance")
-	@Operation(
-		summary = "Returns LTC balance for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "balance (satoshis)"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String getLitecoinWalletBalance(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		if (!litecoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			Long balance = litecoin.getWalletBalanceFromTransactions(key58);
-			if (balance == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-
-			return balance.toString();
-
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/wallettransactions")
-	@Operation(
-		summary = "Returns transactions for hierarchical, deterministic BIP32 wallet",
-		description = "Supply BIP32 'm' private/public key in base58, starting with 'xprv'/'xpub' for mainnet, 'tprv'/'tpub' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					description = "BIP32 'm' private/public key in base58",
-					example = "tpubD6NzVbkrYhZ4XTPc4btCZ6SMgn8CxmWkj6VBVZ1tfcJfMq4UwAjZbG8U74gGSypL9XBYk2R2BLbDBe8pcEyBKM1edsGQEPKXNbEskZozeZc"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(array = @ArraySchema( schema = @Schema( implementation = SimpleTransaction.class ) ) )
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public List<SimpleTransaction> getLitecoinWalletTransactions(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String key58) {
-		Security.checkApiCallAllowed(request);
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		if (!litecoin.isValidDeterministicKey(key58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		try {
-			return litecoin.getWalletTransactions(key58);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-	}
-
-	@POST
-	@Path("/send")
-	@Operation(
-		summary = "Sends LTC from hierarchical, deterministic BIP32 wallet to specific address",
-		description = "Currently only supports 'legacy' P2PKH Litecoin addresses. Supply BIP32 'm' private key in base58, starting with 'xprv' for mainnet, 'tprv' for testnet",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = LitecoinSendRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string", description = "transaction hash"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.INVALID_CRITERIA, ApiError.INVALID_ADDRESS, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String sendBitcoin(@HeaderParam(Security.API_KEY_HEADER) String apiKey, LitecoinSendRequest litecoinSendRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (litecoinSendRequest.litecoinAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		if (litecoinSendRequest.feePerByte != null && litecoinSendRequest.feePerByte <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		Litecoin litecoin = Litecoin.getInstance();
-
-		if (!litecoin.isValidAddress(litecoinSendRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (!litecoin.isValidDeterministicKey(litecoinSendRequest.xprv58))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		Transaction spendTransaction = litecoin.buildSpend(litecoinSendRequest.xprv58,
-				litecoinSendRequest.receivingAddress,
-				litecoinSendRequest.litecoinAmount,
-				litecoinSendRequest.feePerByte);
-
-		if (spendTransaction == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE);
-
-		try {
-			litecoin.broadcastTransaction(spendTransaction);
-		} catch (ForeignBlockchainException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-		}
-
-		return spendTransaction.getTxId().toString();
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainResource.java
@@ -1,489 +0,0 @@
-package org.qortal.api.resource;
-
-import com.google.common.primitives.Longs;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.*;
-import java.util.function.Supplier;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.CrossChainCancelRequest;
-import org.qortal.api.model.CrossChainTradeSummary;
-import org.qortal.crosschain.SupportedBlockchain;
-import org.qortal.crosschain.ACCT;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.at.ATStateData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.transaction.BaseTransactionData;
-import org.qortal.data.transaction.MessageTransactionData;
-import org.qortal.data.transaction.TransactionData;
-import org.qortal.group.Group;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.transaction.MessageTransaction;
-import org.qortal.transaction.Transaction.ValidationResult;
-import org.qortal.transform.TransformationException;
-import org.qortal.transform.Transformer;
-import org.qortal.transform.transaction.MessageTransactionTransformer;
-import org.qortal.utils.Amounts;
-import org.qortal.utils.Base58;
-import org.qortal.utils.ByteArray;
-import org.qortal.utils.NTP;
-
-@Path("/crosschain")
-@Tag(name = "Cross-Chain")
-public class CrossChainResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@GET
-	@Path("/tradeoffers")
-	@Operation(
-		summary = "Find cross-chain trade offers",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = CrossChainTradeData.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	public List<CrossChainTradeData> getTradeOffers(
-			@Parameter(
-				description = "Limit to specific blockchain",
-				example = "LITECOIN",
-				schema = @Schema(implementation = SupportedBlockchain.class)
-			) @QueryParam("foreignBlockchain") SupportedBlockchain foreignBlockchain,
-			@Parameter( ref = "limit") @QueryParam("limit") Integer limit,
-			@Parameter( ref = "offset" ) @QueryParam("offset") Integer offset,
-			@Parameter( ref = "reverse" ) @QueryParam("reverse") Boolean reverse) {
-		// Impose a limit on 'limit'
-		if (limit != null && limit > 100)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		final boolean isExecutable = true;
-		List<CrossChainTradeData> crossChainTrades = new ArrayList<>();
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			Map<ByteArray, Supplier<ACCT>> acctsByCodeHash = SupportedBlockchain.getFilteredAcctMap(foreignBlockchain);
-
-			for (Map.Entry<ByteArray, Supplier<ACCT>> acctInfo : acctsByCodeHash.entrySet()) {
-				byte[] codeHash = acctInfo.getKey().value;
-				ACCT acct = acctInfo.getValue().get();
-
-				List<ATData> atsData = repository.getATRepository().getATsByFunctionality(codeHash, isExecutable, limit, offset, reverse);
-
-				for (ATData atData : atsData) {
-					CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-					if (crossChainTradeData.mode == AcctMode.OFFERING) {
-						crossChainTrades.add(crossChainTradeData);
-					}
-				}
-			}
-
-			// Sort the trades by timestamp
-			if (reverse != null && reverse) {
-				crossChainTrades.sort((a, b) -> Longs.compare(b.creationTimestamp, a.creationTimestamp));
-			}
-			else {
-				crossChainTrades.sort((a, b) -> Longs.compare(a.creationTimestamp, b.creationTimestamp));
-			}
-
-			if (limit != null && limit > 0) {
-				// Make sure to not return more than the limit
-				int upperLimit = Math.min(limit, crossChainTrades.size());
-				crossChainTrades = crossChainTrades.subList(0, upperLimit);
-			}
-
-			return crossChainTrades;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/trade/{ataddress}")
-	@Operation(
-		summary = "Show detailed trade info",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						implementation = CrossChainTradeData.class
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.ADDRESS_UNKNOWN, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	public CrossChainTradeData getTrade(@PathParam("ataddress") String atAddress) {
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = repository.getATRepository().fromATAddress(atAddress);
-			if (atData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			return acct.populateTradeData(repository, atData);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/trades")
-	@Operation(
-		summary = "Find completed cross-chain trades",
-		description = "Returns summary info about successfully completed cross-chain trades",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = CrossChainTradeSummary.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	public List<CrossChainTradeSummary> getCompletedTrades(
-			@Parameter(
-					description = "Limit to specific blockchain",
-					example = "LITECOIN",
-					schema = @Schema(implementation = SupportedBlockchain.class)
-				) @QueryParam("foreignBlockchain") SupportedBlockchain foreignBlockchain,
-			@Parameter(
-				description = "Only return trades that completed on/after this timestamp (milliseconds since epoch)",
-				example = "1597310000000"
-			) @QueryParam("minimumTimestamp") Long minimumTimestamp,
-			@Parameter( ref = "limit") @QueryParam("limit") Integer limit,
-			@Parameter( ref = "offset" ) @QueryParam("offset") Integer offset,
-			@Parameter( ref = "reverse" ) @QueryParam("reverse") Boolean reverse) {
-		// Impose a limit on 'limit'
-		if (limit != null && limit > 100)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// minimumTimestamp (if given) needs to be positive
-		if (minimumTimestamp != null && minimumTimestamp <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		final Boolean isFinished = Boolean.TRUE;
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			Integer minimumFinalHeight = null;
-
-			if (minimumTimestamp != null) {
-				minimumFinalHeight = repository.getBlockRepository().getHeightFromTimestamp(minimumTimestamp);
-				// If not found in the block repository it will return either 0 or 1
-				if (minimumFinalHeight == 0 || minimumFinalHeight == 1) {
-					// Try the archive
-					minimumFinalHeight = repository.getBlockArchiveRepository().getHeightFromTimestamp(minimumTimestamp);
-				}
-
-				if (minimumFinalHeight == 0)
-					// We don't have any blocks since minimumTimestamp, let alone trades, so nothing to return
-					return Collections.emptyList();
-
-				// height returned from repository is for block BEFORE timestamp
-				// but we want trades AFTER timestamp so bump height accordingly
-				minimumFinalHeight++;
-			}
-
-			List<CrossChainTradeSummary> crossChainTrades = new ArrayList<>();
-
-			Map<ByteArray, Supplier<ACCT>> acctsByCodeHash = SupportedBlockchain.getFilteredAcctMap(foreignBlockchain);
-
-			for (Map.Entry<ByteArray, Supplier<ACCT>> acctInfo : acctsByCodeHash.entrySet()) {
-				byte[] codeHash = acctInfo.getKey().value;
-				ACCT acct = acctInfo.getValue().get();
-
-				List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStates(codeHash,
-						isFinished, acct.getModeByteOffset(), (long) AcctMode.REDEEMED.value, minimumFinalHeight,
-						limit, offset, reverse);
-
-				for (ATStateData atState : atStates) {
-					CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atState);
-
-					// We also need block timestamp for use as trade timestamp
-					long timestamp = repository.getBlockRepository().getTimestampFromHeight(atState.getHeight());
-					if (timestamp == 0) {
-						// Try the archive
-						timestamp = repository.getBlockArchiveRepository().getTimestampFromHeight(atState.getHeight());
-					}
-
-					CrossChainTradeSummary crossChainTradeSummary = new CrossChainTradeSummary(crossChainTradeData, timestamp);
-					crossChainTrades.add(crossChainTradeSummary);
-				}
-			}
-
-			// Sort the trades by timestamp
-			if (reverse != null && reverse) {
-				crossChainTrades.sort((a, b) -> Longs.compare(b.getTradeTimestamp(), a.getTradeTimestamp()));
-			}
-			else {
-				crossChainTrades.sort((a, b) -> Longs.compare(a.getTradeTimestamp(), b.getTradeTimestamp()));
-			}
-
-			if (limit != null && limit > 0) {
-				// Make sure to not return more than the limit
-				int upperLimit = Math.min(limit, crossChainTrades.size());
-				crossChainTrades = crossChainTrades.subList(0, upperLimit);
-			}
-
-			return crossChainTrades;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@GET
-	@Path("/price/{blockchain}")
-	@Operation(
-		summary = "Request current estimated trading price",
-		description = "Returns price based on most recent completed trades. Price is expressed in terms of QORT per unit foreign currency.",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "number"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	public long getTradePriceEstimate(
-			@Parameter(
-					description = "foreign blockchain",
-					example = "LITECOIN",
-					schema = @Schema(implementation = SupportedBlockchain.class)
-				) @PathParam("blockchain") SupportedBlockchain foreignBlockchain,
-			@Parameter(
-					description = "Maximum number of trades to include in price calculation",
-					example = "10",
-					schema = @Schema(type = "integer", defaultValue = "10")
-			) @QueryParam("maxtrades") Integer maxtrades,
-			@Parameter(
-					description = "Display price in terms of foreign currency per unit QORT",
-					example = "false",
-					schema = @Schema(type = "boolean", defaultValue = "false")
-			) @QueryParam("inverse") Boolean inverse) {
-		// foreignBlockchain is required
-		if (foreignBlockchain == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		// We want both a minimum of 5 trades and enough trades to span at least 4 hours
-		int minimumCount = 5;
-		int maximumCount = maxtrades != null ? maxtrades : 10;
-		long minimumPeriod = 4 * 60 * 60 * 1000L; // ms
-		Boolean isFinished = Boolean.TRUE;
-		boolean useInversePrice = (inverse != null && inverse == true);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			Map<ByteArray, Supplier<ACCT>> acctsByCodeHash = SupportedBlockchain.getFilteredAcctMap(foreignBlockchain);
-
-			long totalForeign = 0;
-			long totalQort = 0;
-
-			Map<Long, CrossChainTradeData> reverseSortedTradeData = new TreeMap<>(Collections.reverseOrder());
-
-			// Collect recent AT states for each ACCT version
-			for (Map.Entry<ByteArray, Supplier<ACCT>> acctInfo : acctsByCodeHash.entrySet()) {
-				byte[] codeHash = acctInfo.getKey().value;
-				ACCT acct = acctInfo.getValue().get();
-
-				List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStatesQuorum(codeHash,
-						isFinished, acct.getModeByteOffset(), (long) AcctMode.REDEEMED.value, minimumCount, maximumCount, minimumPeriod);
-
-				for (ATStateData atState : atStates) {
-					// We also need block timestamp for use as trade timestamp
-					long timestamp = repository.getBlockRepository().getTimestampFromHeight(atState.getHeight());
-					if (timestamp == 0) {
-						// Try the archive
-						timestamp = repository.getBlockArchiveRepository().getTimestampFromHeight(atState.getHeight());
-					}
-
-					CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atState);
-					reverseSortedTradeData.put(timestamp, crossChainTradeData);
-				}
-			}
-
-			// Loop through the sorted map and calculate the average price
-			// Also remove elements beyond the maxtrades limit
-			Set set = reverseSortedTradeData.entrySet();
-			Iterator i = set.iterator();
-			int index = 0;
-			while (i.hasNext()) {
-				Map.Entry tradeDataMap = (Map.Entry)i.next();
-				CrossChainTradeData crossChainTradeData = (CrossChainTradeData) tradeDataMap.getValue();
-
-				if (maxtrades != null && index >= maxtrades) {
-					// We've reached the limit
-					break;
-				}
-
-				totalForeign += crossChainTradeData.expectedForeignAmount;
-				totalQort += crossChainTradeData.qortAmount;
-				index++;
-			}
-
-			return useInversePrice ? Amounts.scaledDivide(totalForeign, totalQort) : Amounts.scaledDivide(totalQort, totalForeign);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@DELETE
-	@Path("/tradeoffer")
-	@Operation(
-		summary = "Builds raw, unsigned 'cancel' MESSAGE transaction that cancels cross-chain trade offer",
-		description = "Specify address of cross-chain AT that needs to be cancelled.<br>"
-			+ "AT needs to be in 'offer' mode. Messages sent to an AT in 'trade' mode will be ignored.<br>"
-			+ "Performs MESSAGE proof-of-work.<br>"
-			+ "You need to sign output with AT creator's private key otherwise the MESSAGE transaction will be invalid.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = CrossChainCancelRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					schema = @Schema(
-						type = "string"
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String cancelTrade(@HeaderParam(Security.API_KEY_HEADER) String apiKey, CrossChainCancelRequest cancelRequest) {
-		Security.checkApiCallAllowed(request);
-
-		byte[] creatorPublicKey = cancelRequest.creatorPublicKey;
-
-		if (creatorPublicKey == null || creatorPublicKey.length != Transformer.PUBLIC_KEY_LENGTH)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-		if (cancelRequest.atAddress == null || !Crypto.isValidAtAddress(cancelRequest.atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, cancelRequest.atAddress);
-
-			ACCT acct = SupportedBlockchain.getAcctByCodeHash(atData.getCodeHash());
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-
-			if (crossChainTradeData.mode != AcctMode.OFFERING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			// Does supplied public key match AT creator's public key?
-			if (!Arrays.equals(creatorPublicKey, atData.getCreatorPublicKey()))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY);
-
-			// Good to make MESSAGE
-
-			String atCreatorAddress = Crypto.toAddress(creatorPublicKey);
-			byte[] messageData = acct.buildCancelMessage(atCreatorAddress);
-
-			byte[] messageTransactionBytes = buildAtMessage(repository, creatorPublicKey, cancelRequest.atAddress, messageData);
-
-			return Base58.encode(messageTransactionBytes);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	private ATData fetchAtDataWithChecking(Repository repository, String atAddress) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atAddress);
-		if (atData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-		// No point sending message to AT that's finished
-		if (atData.getIsFinished())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		return atData;
-	}
-
-	private byte[] buildAtMessage(Repository repository, byte[] senderPublicKey, String atAddress, byte[] messageData) throws DataException {
-		long txTimestamp = NTP.getTime();
-
-		// senderPublicKey could be ephemeral trade public key where there is no corresponding account and hence no reference
-		String senderAddress = Crypto.toAddress(senderPublicKey);
-		byte[] lastReference = repository.getAccountRepository().getLastReference(senderAddress);
-		final boolean requiresPoW = lastReference == null;
-
-		if (requiresPoW) {
-			Random random = new Random();
-			lastReference = new byte[Transformer.SIGNATURE_LENGTH];
-			random.nextBytes(lastReference);
-		}
-
-		int version = 4;
-		int nonce = 0;
-		long amount = 0L;
-		Long assetId = null; // no assetId as amount is zero
-		Long fee = 0L;
-
-		BaseTransactionData baseTransactionData = new BaseTransactionData(txTimestamp, Group.NO_GROUP, lastReference, senderPublicKey, fee, null);
-		TransactionData messageTransactionData = new MessageTransactionData(baseTransactionData, version, nonce, atAddress, amount, assetId, messageData, false, false);
-
-		MessageTransaction messageTransaction = new MessageTransaction(repository, messageTransactionData);
-
-		if (requiresPoW) {
-			messageTransaction.computeNonce();
-		} else {
-			fee = messageTransaction.calcRecommendedFee();
-			messageTransactionData.setFee(fee);
-		}
-
-		ValidationResult result = messageTransaction.isValidUnconfirmed();
-		if (result != ValidationResult.OK)
-			throw TransactionsResource.createTransactionInvalidException(request, result);
-
-		try {
-			return MessageTransactionTransformer.toBytes(messageTransactionData);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/CrossChainTradeBotResource.java
+++ b/src/main/java/org/qortal/api/resource/CrossChainTradeBotResource.java
@@ -1,298 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.qortal.account.Account;
-import org.qortal.account.PublicKeyAccount;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiErrors;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.api.model.crosschain.TradeBotCreateRequest;
-import org.qortal.api.model.crosschain.TradeBotRespondRequest;
-import org.qortal.asset.Asset;
-import org.qortal.controller.Controller;
-import org.qortal.controller.tradebot.AcctTradeBot;
-import org.qortal.controller.tradebot.TradeBot;
-import org.qortal.crosschain.ForeignBlockchain;
-import org.qortal.crosschain.SupportedBlockchain;
-import org.qortal.crosschain.ACCT;
-import org.qortal.crosschain.AcctMode;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.at.ATData;
-import org.qortal.data.crosschain.CrossChainTradeData;
-import org.qortal.data.crosschain.TradeBotData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-import org.qortal.utils.Base58;
-
-@Path("/crosschain/tradebot")
-@Tag(name = "Cross-Chain (Trade-Bot)")
-public class CrossChainTradeBotResource {
-
-	@Context
-	HttpServletRequest request;
-
-	@GET
-	@Operation(
-		summary = "List current trade-bot states",
-		responses = {
-			@ApiResponse(
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = TradeBotData.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public List<TradeBotData> getTradeBotStates(
-			@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-			@Parameter(
-					description = "Limit to specific blockchain",
-					example = "LITECOIN",
-					schema = @Schema(implementation = SupportedBlockchain.class)
-				) @QueryParam("foreignBlockchain") SupportedBlockchain foreignBlockchain) {
-		Security.checkApiCallAllowed(request);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<TradeBotData> allTradeBotData = repository.getCrossChainRepository().getAllTradeBotData();
-
-			if (foreignBlockchain == null)
-				return allTradeBotData;
-
-			return allTradeBotData.stream().filter(tradeBotData -> tradeBotData.getForeignBlockchain().equals(foreignBlockchain.name())).collect(Collectors.toList());
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/create")
-	@Operation(
-		summary = "Create a trade offer (trade-bot entry)",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = TradeBotCreateRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PUBLIC_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_CRITERIA, ApiError.INSUFFICIENT_BALANCE, ApiError.REPOSITORY_ISSUE, ApiError.ORDER_SIZE_TOO_SMALL})
-	@SuppressWarnings("deprecation")
-	@SecurityRequirement(name = "apiKey")
-	public String tradeBotCreator(@HeaderParam(Security.API_KEY_HEADER) String apiKey, TradeBotCreateRequest tradeBotCreateRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (tradeBotCreateRequest.foreignBlockchain == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		ForeignBlockchain foreignBlockchain = tradeBotCreateRequest.foreignBlockchain.getInstance();
-
-		// We prefer foreignAmount to deprecated bitcoinAmount
-		if (tradeBotCreateRequest.foreignAmount == null)
-			tradeBotCreateRequest.foreignAmount = tradeBotCreateRequest.bitcoinAmount;
-
-		if (!foreignBlockchain.isValidAddress(tradeBotCreateRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (tradeBotCreateRequest.tradeTimeout < 60)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		if (tradeBotCreateRequest.foreignAmount == null || tradeBotCreateRequest.foreignAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ORDER_SIZE_TOO_SMALL);
-
-		if (tradeBotCreateRequest.foreignAmount < foreignBlockchain.getMinimumOrderAmount())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ORDER_SIZE_TOO_SMALL);
-
-		if (tradeBotCreateRequest.qortAmount <= 0 || tradeBotCreateRequest.fundingQortAmount <= 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ORDER_SIZE_TOO_SMALL);
-
-		if (!Controller.getInstance().isUpToDate())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCKCHAIN_NEEDS_SYNC);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Do some simple checking first
-			Account creator = new PublicKeyAccount(repository, tradeBotCreateRequest.creatorPublicKey);
-
-			if (creator.getConfirmedBalance(Asset.QORT) < tradeBotCreateRequest.fundingQortAmount)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INSUFFICIENT_BALANCE);
-
-			byte[] unsignedBytes = TradeBot.getInstance().createTrade(repository, tradeBotCreateRequest);
-			if (unsignedBytes == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			return Base58.encode(unsignedBytes);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/respond")
-	@Operation(
-		summary = "Respond to a trade offer. NOTE: WILL SPEND FUNDS!)",
-		description = "Start a new trade-bot entry to respond to chosen trade offer.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.APPLICATION_JSON,
-				schema = @Schema(
-					implementation = TradeBotRespondRequest.class
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_PRIVATE_KEY, ApiError.INVALID_ADDRESS, ApiError.INVALID_CRITERIA, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE, ApiError.REPOSITORY_ISSUE})
-	@SuppressWarnings("deprecation")
-	@SecurityRequirement(name = "apiKey")
-	public String tradeBotResponder(@HeaderParam(Security.API_KEY_HEADER) String apiKey, TradeBotRespondRequest tradeBotRespondRequest) {
-		Security.checkApiCallAllowed(request);
-
-		final String atAddress = tradeBotRespondRequest.atAddress;
-
-		// We prefer foreignKey to deprecated xprv58
-		if (tradeBotRespondRequest.foreignKey == null)
-			tradeBotRespondRequest.foreignKey = tradeBotRespondRequest.xprv58;
-
-		if (tradeBotRespondRequest.foreignKey == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-		if (atAddress == null || !Crypto.isValidAtAddress(atAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (tradeBotRespondRequest.receivingAddress == null || !Crypto.isValidAddress(tradeBotRespondRequest.receivingAddress))
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-		if (!Controller.getInstance().isUpToDate())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCKCHAIN_NEEDS_SYNC);
-
-		// Extract data from cross-chain trading AT
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ATData atData = fetchAtDataWithChecking(repository, atAddress);
-
-			// TradeBot uses AT's code hash to map to ACCT
-			ACCT acct = TradeBot.getInstance().getAcctUsingAtData(atData);
-			if (acct == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			if (!acct.getBlockchain().isValidWalletKey(tradeBotRespondRequest.foreignKey))
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-
-			CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atData);
-			if (crossChainTradeData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS);
-
-			if (crossChainTradeData.mode != AcctMode.OFFERING)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-			AcctTradeBot.ResponseResult result = TradeBot.getInstance().startResponse(repository, atData, acct, crossChainTradeData,
-					tradeBotRespondRequest.foreignKey, tradeBotRespondRequest.receivingAddress);
-
-			switch (result) {
-				case OK:
-					return "true";
-
-				case BALANCE_ISSUE:
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_BALANCE_ISSUE);
-
-				case NETWORK_ISSUE:
-					throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.FOREIGN_BLOCKCHAIN_NETWORK_ISSUE);
-
-				default:
-					return "false";
-			}
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@DELETE
-	@Operation(
-		summary = "Delete completed trade",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string",
-					example = "93MB2qRDNVLxbmmPuYpLdAqn3u2x9ZhaVZK5wELHueP8"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "string"))
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_ADDRESS, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String tradeBotDelete(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String tradePrivateKey58) {
-		Security.checkApiCallAllowed(request);
-
-		final byte[] tradePrivateKey;
-		try {
-			tradePrivateKey = Base58.decode(tradePrivateKey58);
-
-			if (tradePrivateKey.length != 32)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-		} catch (NumberFormatException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PRIVATE_KEY);
-		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			// Handed off to TradeBot
-			return TradeBot.getInstance().deleteEntry(repository, tradePrivateKey) ? "true" : "false";
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	private ATData fetchAtDataWithChecking(Repository repository, String atAddress) throws DataException {
-		ATData atData = repository.getATRepository().fromATAddress(atAddress);
-		if (atData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.ADDRESS_UNKNOWN);
-
-		// No point sending message to AT that's finished
-		if (atData.getIsFinished())
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-
-		return atData;
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/ListsResource.java
+++ b/src/main/java/org/qortal/api/resource/ListsResource.java
@@ -1,176 +0,0 @@
-package org.qortal.api.resource;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import org.qortal.api.*;
-import org.qortal.api.model.ListRequest;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.account.AccountData;
-import org.qortal.list.ResourceListManager;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-
-@Path("/lists")
-@Tag(name = "Lists")
-public class ListsResource {
-
-	@Context
-	HttpServletRequest request;
-
-
-	@POST
-	@Path("/{listName}")
-	@Operation(
-			summary = "Add items to a new or existing list",
-			requestBody = @RequestBody(
-					required = true,
-					content = @Content(
-							mediaType = MediaType.APPLICATION_JSON,
-							schema = @Schema(
-									implementation = ListRequest.class
-							)
-					)
-			),
-			responses = {
-					@ApiResponse(
-							description = "Returns true if all items were processed, false if any couldn't be " +
-									"processed, or an exception on failure. If false or an exception is returned, " +
-									"the list will not be updated, and the request will need to be re-issued.",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String addItemstoList(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-								 @PathParam("listName") String listName,
-								 ListRequest listRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (listName == null) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		}
-
-		if (listRequest == null || listRequest.items == null) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		}
-
-		int successCount = 0;
-		int errorCount = 0;
-
-		for (String item : listRequest.items) {
-
-			boolean success = ResourceListManager.getInstance().addToList(listName, item, false);
-			if (success) {
-				successCount++;
-			}
-			else {
-				errorCount++;
-			}
-		}
-
-		if (successCount > 0 && errorCount == 0) {
-			// All were successful, so save the list
-			ResourceListManager.getInstance().saveList(listName);
-			return "true";
-		}
-		else {
-			// Something went wrong, so revert
-			ResourceListManager.getInstance().revertList(listName);
-			return "false";
-		}
-	}
-
-	@DELETE
-	@Path("/{listName}")
-	@Operation(
-			summary = "Remove one or more items from a list",
-			requestBody = @RequestBody(
-					required = true,
-					content = @Content(
-							mediaType = MediaType.APPLICATION_JSON,
-							schema = @Schema(
-									implementation = ListRequest.class
-							)
-					)
-			),
-			responses = {
-					@ApiResponse(
-							description = "Returns true if all items were processed, false if any couldn't be " +
-									"processed, or an exception on failure. If false or an exception is returned, " +
-									"the list will not be updated, and the request will need to be re-issued.",
-							content = @Content(mediaType = MediaType.TEXT_PLAIN, schema = @Schema(type = "boolean"))
-					)
-			}
-	)
-	@ApiErrors({ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public String removeItemsFromList(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-									  @PathParam("listName") String listName,
-									  ListRequest listRequest) {
-		Security.checkApiCallAllowed(request);
-
-		if (listRequest == null || listRequest.items == null) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
-		}
-
-		int successCount = 0;
-		int errorCount = 0;
-
-		for (String address : listRequest.items) {
-
-			// Attempt to remove the item
-			// Don't save as we will do this at the end of the process
-			boolean success = ResourceListManager.getInstance().removeFromList(listName, address, false);
-			if (success) {
-				successCount++;
-			}
-			else {
-				errorCount++;
-			}
-		}
-
-		if (successCount > 0 && errorCount == 0) {
-			// All were successful, so save the list
-			ResourceListManager.getInstance().saveList(listName);
-			return "true";
-		}
-		else {
-			// Something went wrong, so revert
-			ResourceListManager.getInstance().revertList(listName);
-			return "false";
-		}
-	}
-
-	@GET
-	@Path("/{listName}")
-	@Operation(
-			summary = "Fetch all items in a list",
-			responses = {
-					@ApiResponse(
-							description = "A JSON array of items",
-							content = @Content(mediaType = MediaType.APPLICATION_JSON, array = @ArraySchema(schema = @Schema(implementation = String.class)))
-					)
-			}
-	)
-	@SecurityRequirement(name = "apiKey")
-	public String getItemsInList(@HeaderParam(Security.API_KEY_HEADER) String apiKey, @PathParam("listName") String listName) {
-		Security.checkApiCallAllowed(request);
-		return ResourceListManager.getInstance().getJSONStringForList(listName);
-	}
-
-}
--- a/src/main/java/org/qortal/api/resource/PeersResource.java
+++ b/src/main/java/org/qortal/api/resource/PeersResource.java
@@ -6,34 +6,30 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;

 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;

-import org.qortal.api.*;
+import org.qortal.api.ApiError;
+import org.qortal.api.ApiErrors;
+import org.qortal.api.ApiException;
+import org.qortal.api.ApiExceptionFactory;
+import org.qortal.api.Security;
 import org.qortal.api.model.ConnectedPeer;
-import org.qortal.api.model.PeersSummary;
-import org.qortal.controller.Controller;
-import org.qortal.controller.Synchronizer;
-import org.qortal.controller.Synchronizer.SynchronizationResult;
-import org.qortal.data.block.BlockSummaryData;
 import org.qortal.data.network.PeerData;
 import org.qortal.network.Network;
-import org.qortal.network.Peer;
 import org.qortal.network.PeerAddress;
 import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
 import org.qortal.utils.ExecuteProduceConsume;
 import org.qortal.utils.NTP;

@@ -126,8 +122,7 @@ public class PeersResource {
 			)
 		}
 	)
-	@SecurityRequirement(name = "apiKey")
-	public ExecuteProduceConsume.StatsSnapshot getEngineStats(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
+	public ExecuteProduceConsume.StatsSnapshot getEngineStats() {
 		Security.checkApiCallAllowed(request);

 		return Network.getInstance().getStatsSnapshot();
@@ -164,8 +159,7 @@ public class PeersResource {
 	@ApiErrors({
 		ApiError.INVALID_NETWORK_ADDRESS, ApiError.REPOSITORY_ISSUE
 	})
-	@SecurityRequirement(name = "apiKey")
-	public String addPeer(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String address) {
+	public String addPeer(String address) {
 		Security.checkApiCallAllowed(request);

 		final Long addedWhen = NTP.getTime();
@@ -175,14 +169,13 @@ public class PeersResource {
 		try {
 			PeerAddress peerAddress = PeerAddress.fromString(address);

-			List<PeerAddress> newPeerAddresses = new ArrayList<>(1);
-			newPeerAddresses.add(peerAddress);
+			Network.getInstance().mergePeers("API", addedWhen, Arrays.asList(peerAddress));

-			boolean addResult = Network.getInstance().mergePeers("API", addedWhen, newPeerAddresses);
-
-			return addResult ? "true" : "false";
+			return "true";
 		} catch (IllegalArgumentException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_NETWORK_ADDRESS);
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		}
@@ -219,8 +212,7 @@ public class PeersResource {
 	@ApiErrors({
 		ApiError.INVALID_NETWORK_ADDRESS, ApiError.REPOSITORY_ISSUE
 	})
-	@SecurityRequirement(name = "apiKey")
-	public String removePeer(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String address) {
+	public String removePeer(String address) {
 		Security.checkApiCallAllowed(request);

 		try {
@@ -255,8 +247,7 @@ public class PeersResource {
 	@ApiErrors({
 		ApiError.REPOSITORY_ISSUE
 	})
-	@SecurityRequirement(name = "apiKey")
-	public String removeKnownPeers(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String address) {
+	public String removeKnownPeers(String address) {
 		Security.checkApiCallAllowed(request);

 		try {
@@ -268,100 +259,4 @@ public class PeersResource {
 		}
 	}

-	@POST
-	@Path("/commonblock")
-	@Operation(
-		summary = "Report common block with given peer.",
-		requestBody = @RequestBody(
-			required = true,
-			content = @Content(
-				mediaType = MediaType.TEXT_PLAIN,
-				schema = @Schema(
-					type = "string", example = "node2.qortal.org"
-				)
-			)
-		),
-		responses = {
-			@ApiResponse(
-				description = "the block",
-				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = BlockSummaryData.class
-						)
-					)
-				)
-			)
-		}
-	)
-	@ApiErrors({ApiError.INVALID_DATA, ApiError.REPOSITORY_ISSUE})
-	@SecurityRequirement(name = "apiKey")
-	public List<BlockSummaryData> commonBlock(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String targetPeerAddress) {
-		Security.checkApiCallAllowed(request);
-
-		try {
-			// Try to resolve passed address to make things easier
-			PeerAddress peerAddress = PeerAddress.fromString(targetPeerAddress);
-			InetSocketAddress resolvedAddress = peerAddress.toSocketAddress();
-
-			List<Peer> peers = Network.getInstance().getHandshakedPeers();
-			Peer targetPeer = peers.stream().filter(peer -> peer.getResolvedAddress().equals(resolvedAddress)).findFirst().orElse(null);
-
-			if (targetPeer == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			try (final Repository repository = RepositoryManager.getRepository()) {
-				int ourInitialHeight = Controller.getInstance().getChainHeight();
-				boolean force = true;
-				List<BlockSummaryData> peerBlockSummaries = new ArrayList<>();
-
-				SynchronizationResult findCommonBlockResult = Synchronizer.getInstance().fetchSummariesFromCommonBlock(repository, targetPeer, ourInitialHeight, force, peerBlockSummaries, true);
-				if (findCommonBlockResult != SynchronizationResult.OK)
-					return null;
-
-				return peerBlockSummaries;
-			}
-		} catch (IllegalArgumentException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-		} catch (UnknownHostException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		} catch (InterruptedException e) {
-			return null;
-		}
-	}
-
-	@GET
-	@Path("/summary")
-	@Operation(
-			summary = "Returns total inbound and outbound connections for connected peers",
-			responses = {
-					@ApiResponse(
-							content = @Content(
-									mediaType = MediaType.APPLICATION_JSON,
-									array = @ArraySchema(
-											schema = @Schema(
-													implementation = PeersSummary.class
-											)
-									)
-							)
-					)
-			}
-	)
-	public PeersSummary peersSummary() {
-		PeersSummary peersSummary = new PeersSummary();
-
-		List<Peer> connectedPeers = Network.getInstance().getConnectedPeers().stream().collect(Collectors.toList());
-		for (Peer peer : connectedPeers) {
-			if (peer.isOutbound()) {
-				peersSummary.inboundConnections++;
-			}
-			else {
-				peersSummary.outboundConnections++;
-			}
-		}
-		return peersSummary;
-	}
-
 }
--- a/src/main/java/org/qortal/api/resource/RenderResource.java
+++ b/src/main/java/org/qortal/api/resource/RenderResource.java
@@ -1,200 +0,0 @@
-package org.qortal.api.resource;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.io.*;
-import java.nio.file.Paths;
-import java.util.Map;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.qortal.api.ApiError;
-import org.qortal.api.ApiExceptionFactory;
-import org.qortal.api.Security;
-import org.qortal.arbitrary.misc.Service;
-import org.qortal.arbitrary.*;
-import org.qortal.arbitrary.exception.MissingDataException;
-import org.qortal.controller.arbitrary.ArbitraryDataRenderManager;
-import org.qortal.data.transaction.ArbitraryTransactionData.*;
-import org.qortal.repository.DataException;
-import org.qortal.settings.Settings;
-import org.qortal.arbitrary.ArbitraryDataFile.*;
-import org.qortal.utils.Base58;
-
-
-@Path("/render")
-@Tag(name = "Render")
-public class RenderResource {
-
-    private static final Logger LOGGER = LogManager.getLogger(RenderResource.class);
-
-    @Context HttpServletRequest request;
-    @Context HttpServletResponse response;
-    @Context ServletContext context;
-
-    @POST
-    @Path("/preview")
-    @Operation(
-            summary = "Generate preview URL based on a user-supplied path and service",
-            requestBody = @RequestBody(
-                    required = true,
-                    content = @Content(
-                            mediaType = MediaType.TEXT_PLAIN,
-                            schema = @Schema(
-                                    type = "string", example = "/Users/user/Documents/MyStaticWebsite"
-                            )
-                    )
-            ),
-            responses = {
-                    @ApiResponse(
-                            description = "a temporary URL to preview the website",
-                            content = @Content(
-                                    mediaType = MediaType.TEXT_PLAIN,
-                                    schema = @Schema(
-                                            type = "string"
-                                    )
-                            )
-                    )
-            }
-    )
-    @SecurityRequirement(name = "apiKey")
-    public String preview(@HeaderParam(Security.API_KEY_HEADER) String apiKey, String directoryPath) {
-        Security.checkApiCallAllowed(request);
-        Method method = Method.PUT;
-        Compression compression = Compression.ZIP;
-
-        ArbitraryDataWriter arbitraryDataWriter = new ArbitraryDataWriter(Paths.get(directoryPath), null, Service.WEBSITE, null, method, compression);
-        try {
-            arbitraryDataWriter.save();
-        } catch (IOException | DataException | InterruptedException | MissingDataException e) {
-            LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE);
-        } catch (RuntimeException e) {
-            LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
-            throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-        }
-
-        ArbitraryDataFile arbitraryDataFile = arbitraryDataWriter.getArbitraryDataFile();
-        if (arbitraryDataFile != null) {
-            String digest58 = arbitraryDataFile.digest58();
-            if (digest58 != null) {
-                return "http://localhost:12393/render/hash/" + digest58 + "?secret=" + Base58.encode(arbitraryDataFile.getSecret());
-            }
-        }
-        return "Unable to generate preview URL";
-    }
-
-    @POST
-    @Path("/authorize/{resourceId}")
-    @SecurityRequirement(name = "apiKey")
-    public boolean authorizeResource(@HeaderParam(Security.API_KEY_HEADER) String apiKey, @PathParam("resourceId") String resourceId) {
-        Security.checkApiCallAllowed(request);
-        Security.disallowLoopbackRequestsIfAuthBypassEnabled(request);
-        ArbitraryDataResource resource = new ArbitraryDataResource(resourceId, null, null, null);
-        ArbitraryDataRenderManager.getInstance().addToAuthorizedResources(resource);
-        return true;
-    }
-
-    @POST
-    @Path("authorize/{service}/{resourceId}")
-    @SecurityRequirement(name = "apiKey")
-    public boolean authorizeResource(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-                                     @PathParam("service") Service service,
-                                     @PathParam("resourceId") String resourceId) {
-        Security.checkApiCallAllowed(request);
-        Security.disallowLoopbackRequestsIfAuthBypassEnabled(request);
-        ArbitraryDataResource resource = new ArbitraryDataResource(resourceId, null, service, null);
-        ArbitraryDataRenderManager.getInstance().addToAuthorizedResources(resource);
-        return true;
-    }
-
-    @POST
-    @Path("authorize/{service}/{resourceId}/{identifier}")
-    @SecurityRequirement(name = "apiKey")
-    public boolean authorizeResource(@HeaderParam(Security.API_KEY_HEADER) String apiKey,
-                                     @PathParam("service") Service service,
-                                     @PathParam("resourceId") String resourceId,
-                                     @PathParam("identifier") String identifier) {
-        Security.checkApiCallAllowed(request);
-        Security.disallowLoopbackRequestsIfAuthBypassEnabled(request);
-        ArbitraryDataResource resource = new ArbitraryDataResource(resourceId, null, service, identifier);
-        ArbitraryDataRenderManager.getInstance().addToAuthorizedResources(resource);
-        return true;
-    }
-
-    @GET
-    @Path("/signature/{signature}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getIndexBySignature(@PathParam("signature") String signature) {
-        Security.requirePriorAuthorization(request, signature, Service.WEBSITE, null);
-        return this.get(signature, ResourceIdType.SIGNATURE, null, "/", null, "/render/signature", true, true);
-    }
-
-    @GET
-    @Path("/signature/{signature}/{path:.*}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getPathBySignature(@PathParam("signature") String signature, @PathParam("path") String inPath) {
-        Security.requirePriorAuthorization(request, signature, Service.WEBSITE, null);
-        return this.get(signature, ResourceIdType.SIGNATURE, null, inPath,null, "/render/signature", true, true);
-    }
-
-    @GET
-    @Path("/hash/{hash}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getIndexByHash(@PathParam("hash") String hash58, @QueryParam("secret") String secret58) {
-        Security.requirePriorAuthorization(request, hash58, Service.WEBSITE, null);
-        return this.get(hash58, ResourceIdType.FILE_HASH, Service.WEBSITE, "/", secret58, "/render/hash", true, false);
-    }
-
-    @GET
-    @Path("/hash/{hash}/{path:.*}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getPathByHash(@PathParam("hash") String hash58, @PathParam("path") String inPath,
-                                             @QueryParam("secret") String secret58) {
-        Security.requirePriorAuthorization(request, hash58, Service.WEBSITE, null);
-        return this.get(hash58, ResourceIdType.FILE_HASH, Service.WEBSITE, inPath, secret58, "/render/hash", true, false);
-    }
-
-    @GET
-    @Path("{service}/{name}/{path:.*}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getPathByName(@PathParam("service") Service service,
-                                             @PathParam("name") String name,
-                                             @PathParam("path") String inPath) {
-        Security.requirePriorAuthorization(request, name, service, null);
-        String prefix = String.format("/render/%s", service);
-        return this.get(name, ResourceIdType.NAME, service, inPath, null, prefix, true, true);
-    }
-
-    @GET
-    @Path("{service}/{name}")
-    @SecurityRequirement(name = "apiKey")
-    public HttpServletResponse getIndexByName(@PathParam("service") Service service,
-                                              @PathParam("name") String name) {
-        Security.requirePriorAuthorization(request, name, service, null);
-        String prefix = String.format("/render/%s", service);
-        return this.get(name, ResourceIdType.NAME, service, "/", null, prefix, true, true);
-    }
-
-
-
-    private HttpServletResponse get(String resourceId, ResourceIdType resourceIdType, Service service, String inPath,
-                                    String secret58, String prefix, boolean usePrefix, boolean async) {
-
-        ArbitraryDataRenderer renderer = new ArbitraryDataRenderer(resourceId, resourceIdType, service, inPath,
-                secret58, prefix, usePrefix, async, request, response, context);
-        return renderer.render();
-    }
-
-}
--- a/src/main/java/org/qortal/api/resource/TransactionsResource.java
+++ b/src/main/java/org/qortal/api/resource/TransactionsResource.java
@@ -9,8 +9,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -46,7 +44,6 @@ import org.qortal.transform.transaction.TransactionTransformer;
 import org.qortal.utils.Base58;

 import com.google.common.primitives.Bytes;
-import org.qortal.utils.NTP;

@Path("/transactions")
@Tag(name = "Transactions")
@@ -351,7 +348,7 @@ public class TransactionsResource {

 		try (final Repository repository = RepositoryManager.getRepository()) {
 			List<byte[]> signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(startBlock, blockLimit, txGroupId,
-					txTypes, null, null, address, confirmationStatus, limit, offset, reverse);
+					txTypes, null, address, confirmationStatus, limit, offset, reverse);

 			// Expand signatures to transactions
 			List<TransactionData> transactions = new ArrayList<>(signatures.size());
@@ -366,215 +363,33 @@ public class TransactionsResource {
 		}
 	}

-	@GET
-	@Path("/unitfee")
-	@Operation(
-			summary = "Get transaction unit fee",
-			responses = {
-					@ApiResponse(
-							content = @Content(
-									mediaType = MediaType.TEXT_PLAIN,
-									schema = @Schema(
-											type = "number"
-									)
-							)
-					)
-			}
-	)
-	@ApiErrors({
-			ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE
-	})
-	public long getTransactionUnitFee(@QueryParam("txType") TransactionType txType,
-                                      @QueryParam("timestamp") Long timestamp,
-									  @QueryParam("level") Integer accountLevel) {
-		try {
-			if (timestamp == null) {
-				timestamp = NTP.getTime();
-			}
-
-			Constructor<?> constructor = txType.constructor;
-			Transaction transaction = (Transaction) constructor.newInstance(null, null);
-			// FUTURE: add accountLevel parameter to transaction.getUnitFee() if needed
-			return transaction.getUnitFee(timestamp);
-
-		} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA, e);
-		}
-	}
-
 	@POST
-	@Path("/fee")
+	@Path("/sign")
 	@Operation(
-			summary = "Get recommended fee for supplied transaction data",
-			requestBody = @RequestBody(
-					required = true,
-					content = @Content(
-							mediaType = MediaType.TEXT_PLAIN,
-							schema = @Schema(
-									type = "string"
-							)
-					)
+		summary = "Sign a raw, unsigned transaction",
+		requestBody = @RequestBody(
+			required = true,
+			content = @Content(
+				mediaType = MediaType.APPLICATION_JSON,
+				schema = @Schema(
+					implementation = SimpleTransactionSignRequest.class
+				)
 			)
-	)
-	@ApiErrors({
-			ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE
-	})
-	public long getRecommendedTransactionFee(String rawInputBytes58) {
-		byte[] rawInputBytes = Base58.decode(rawInputBytes58);
-		if (rawInputBytes.length == 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.JSON);
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-
-			// Append null signature on the end before transformation
-			byte[] rawBytes = Bytes.concat(rawInputBytes, new byte[TransactionTransformer.SIGNATURE_LENGTH]);
-
-			TransactionData transactionData = TransactionTransformer.fromBytes(rawBytes);
-			if (transactionData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			Transaction transaction = Transaction.fromData(repository, transactionData);
-			return transaction.calcRecommendedFee();
-
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}  catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		}
-	}
-
-	@GET
-	@Path("/creator/{publickey}")
-	@Operation(
-		summary = "Find matching transactions created by account with given public key",
+		),
 		responses = {
 			@ApiResponse(
-				description = "transactions",
+				description = "raw, signed transaction encoded in Base58",
 				content = @Content(
-					array = @ArraySchema(
-						schema = @Schema(
-							implementation = TransactionData.class
-						)
+					mediaType = MediaType.TEXT_PLAIN,
+					schema = @Schema(
+						type = "string"
 					)
 				)
 			)
 		}
 	)
 	@ApiErrors({
-		ApiError.INVALID_CRITERIA, ApiError.REPOSITORY_ISSUE
-	})
-	public List<TransactionData> findCreatorsTransactions(@PathParam("publickey") String publicKey58,
-			@Parameter(
-				description = "whether to include confirmed, unconfirmed or both",
-				required = true
-			) @QueryParam("confirmationStatus") ConfirmationStatus confirmationStatus, @Parameter(
-				ref = "limit"
-			) @QueryParam("limit") Integer limit, @Parameter(
-				ref = "offset"
-			) @QueryParam("offset") Integer offset, @Parameter(
-				ref = "reverse"
-			) @QueryParam("reverse") Boolean reverse) {
-		// Decode public key
-		byte[] publicKey;
-		try {
-			publicKey = Base58.decode(publicKey58);
-		} catch (NumberFormatException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_PUBLIC_KEY, e);
-		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			List<byte[]> signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null,
-					publicKey, confirmationStatus, limit, offset, reverse);
-
-			// Expand signatures to transactions
-			List<TransactionData> transactions = new ArrayList<>(signatures.size());
-			for (byte[] signature : signatures)
-				transactions.add(repository.getTransactionRepository().fromSignature(signature));
-
-			return transactions;
-		} catch (DataException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
-		}
-	}
-
-	@POST
-	@Path("/convert")
-	@Operation(
-			summary = "Convert transaction bytes into bytes for signing",
-			requestBody = @RequestBody(
-					required = true,
-					content = @Content(
-							mediaType = MediaType.TEXT_PLAIN,
-							schema = @Schema(
-									type = "string",
-									description = "raw, unsigned transaction in base58 encoding",
-									example = "raw transaction base58"
-							)
-					)
-			),
-			responses = {
-					@ApiResponse(
-							description = "raw, unsigned transaction encoded in Base58, ready for signing",
-							content = @Content(
-									mediaType = MediaType.TEXT_PLAIN,
-									schema = @Schema(
-											type = "string"
-									)
-							)
-					)
-			}
-	)
-	@ApiErrors({
-			ApiError.NON_PRODUCTION, ApiError.TRANSFORMATION_ERROR
-	})
-	public String convertTransactionForSigning(String rawInputBytes58) {
-		byte[] rawInputBytes = Base58.decode(rawInputBytes58);
-		if (rawInputBytes.length == 0)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.JSON);
-
-		try {
-			// Append null signature on the end before transformation
-			byte[] rawBytes = Bytes.concat(rawInputBytes, new byte[TransactionTransformer.SIGNATURE_LENGTH]);
-
-			TransactionData transactionData = TransactionTransformer.fromBytes(rawBytes);
-			if (transactionData == null)
-				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
-			byte[] convertedBytes = TransactionTransformer.toBytesForSigning(transactionData);
-
-			return Base58.encode(convertedBytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		}
-	}
-
-	@POST
-	@Path("/sign")
-	@Operation(
-			summary = "Sign a raw, unsigned transaction",
-			requestBody = @RequestBody(
-					required = true,
-					content = @Content(
-							mediaType = MediaType.APPLICATION_JSON,
-							schema = @Schema(
-									implementation = SimpleTransactionSignRequest.class
-							)
-					)
-			),
-			responses = {
-					@ApiResponse(
-							description = "raw, signed transaction encoded in Base58",
-							content = @Content(
-									mediaType = MediaType.TEXT_PLAIN,
-									schema = @Schema(
-											type = "string"
-									)
-							)
-					)
-			}
-	)
-	@ApiErrors({
-			ApiError.NON_PRODUCTION, ApiError.INVALID_PRIVATE_KEY, ApiError.TRANSFORMATION_ERROR
+		ApiError.NON_PRODUCTION, ApiError.INVALID_PRIVATE_KEY, ApiError.TRANSFORMATION_ERROR
 	})
 	public String signTransaction(SimpleTransactionSignRequest signRequest) {
 		if (Settings.getInstance().isApiRestricted())
@@ -641,19 +456,14 @@ public class TransactionsResource {
 		if (!Controller.getInstance().isUpToDate())
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCKCHAIN_NEEDS_SYNC);

-		byte[] rawBytes = Base58.decode(rawBytes58);
-
-		TransactionData transactionData;
-		try {
-			transactionData = TransactionTransformer.fromBytes(rawBytes);
-		} catch (TransformationException e) {
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
-		}
-
-		if (transactionData == null)
-			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
-
 		try (final Repository repository = RepositoryManager.getRepository()) {
+			byte[] rawBytes = Base58.decode(rawBytes58);
+
+			TransactionData transactionData = TransactionTransformer.fromBytes(rawBytes);
+
+			if (transactionData == null)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
+
 			Transaction transaction = Transaction.fromData(repository, transactionData);

 			if (!transaction.isSignatureValid())
@@ -667,13 +477,20 @@ public class TransactionsResource {
 				ValidationResult result = transaction.importAsUnconfirmed();
 				if (result != ValidationResult.OK)
 					throw createTransactionInvalidException(request, result);
+
+				// Notify controller of new transaction
+				Controller.getInstance().onNewTransaction(transactionData);
+
+				return "true";
 			} finally {
 				blockchainLock.unlock();
 			}
-
-			return "true";
 		} catch (NumberFormatException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA, e);
+		} catch (TransformationException e) {
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.TRANSFORMATION_ERROR, e);
+		} catch (ApiException e) {
+			throw e;
 		} catch (DataException e) {
 			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);
 		} catch (InterruptedException e) {
--- a/src/main/java/org/qortal/api/resource/UtilsResource.java
+++ b/src/main/java/org/qortal/api/resource/UtilsResource.java
@@ -33,6 +33,7 @@ import org.qortal.transaction.Transaction.TransactionType;
 import org.qortal.transform.Transformer;
 import org.qortal.transform.transaction.TransactionTransformer;
 import org.qortal.transform.transaction.TransactionTransformer.Transformation;
+import org.qortal.utils.BIP39;
 import org.qortal.utils.Base58;

 import com.google.common.hash.HashCode;
@@ -194,6 +195,123 @@ public class UtilsResource {
 		return Base58.encode(random);
 	}

+	@GET
+	@Path("/mnemonic")
+	@Operation(
+		summary = "Generate 12-word BIP39 mnemonic",
+		description = "Optionally pass 16-byte, base58-encoded entropy or entropy will be internally generated.<br>"
+				+ "Example entropy input: YcVfxkQb6JRzqk5kF2tNLv",
+		responses = {
+			@ApiResponse(
+				description = "mnemonic",
+				content = @Content(
+					mediaType = MediaType.TEXT_PLAIN,
+					schema = @Schema(
+						type = "string"
+					)
+				)
+			)
+		}
+	)
+	@ApiErrors({ApiError.NON_PRODUCTION, ApiError.INVALID_DATA})
+	public String getMnemonic(@QueryParam("entropy") String suppliedEntropy) {
+		if (Settings.getInstance().isApiRestricted())
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NON_PRODUCTION);
+
+		/*
+		 * BIP39 word lists have 2048 entries so can be represented by 11 bits.
+		 * UUID (128bits) and another 4 bits gives 132 bits.
+		 * 132 bits, divided by 11, gives 12 words.
+		 */
+		byte[] entropy;
+		if (suppliedEntropy != null) {
+			// Use caller-supplied entropy input
+			try {
+				entropy = Base58.decode(suppliedEntropy);
+			} catch (NumberFormatException e) {
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
+			}
+
+			// Must be 16-bytes
+			if (entropy.length != 16)
+				throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
+		} else {
+			// Generate entropy internally
+			UUID uuid = UUID.randomUUID();
+
+			byte[] uuidMSB = Longs.toByteArray(uuid.getMostSignificantBits());
+			byte[] uuidLSB = Longs.toByteArray(uuid.getLeastSignificantBits());
+			entropy = Bytes.concat(uuidMSB, uuidLSB);
+		}
+
+		// Use SHA256 to generate more bits
+		byte[] hash = Crypto.digest(entropy);
+
+		// Append first 4 bits from hash to end. (Actually 8 bits but we only use 4).
+		byte checksum = (byte) (hash[0] & 0xf0);
+		entropy = Bytes.concat(entropy, new byte[] {
+			checksum
+		});
+
+		return BIP39.encode(entropy, "en");
+	}
+
+	@POST
+	@Path("/mnemonic")
+	@Operation(
+		summary = "Calculate binary entropy from 12-word BIP39 mnemonic",
+		description = "Returns the base58-encoded binary form, or \"false\" if mnemonic is invalid.",
+		requestBody = @RequestBody(
+			required = true,
+			content = @Content(
+				mediaType = MediaType.TEXT_PLAIN,
+				schema = @Schema(
+					type = "string"
+				)
+			)
+		),
+		responses = {
+			@ApiResponse(
+				description = "entropy in base58",
+				content = @Content(
+					mediaType = MediaType.TEXT_PLAIN,
+					schema = @Schema(
+						type = "string"
+					)
+				)
+			)
+		}
+	)
+	@ApiErrors({ApiError.NON_PRODUCTION})
+	public String fromMnemonic(String mnemonic) {
+		if (Settings.getInstance().isApiRestricted())
+			throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.NON_PRODUCTION);
+
+		if (mnemonic.isEmpty())
+			return "false";
+
+		// Strip leading/trailing whitespace if any
+		mnemonic = mnemonic.trim();
+
+		String[] phraseWords = mnemonic.split(" ");
+		if (phraseWords.length != 12)
+			return "false";
+
+		// Convert BIP39 mnemonic to binary
+		byte[] binary = BIP39.decode(phraseWords, "en");
+		if (binary == null)
+			return "false";
+
+		byte[] entropy = Arrays.copyOf(binary, 16); // 132 bits is 16.5 bytes, but we're discarding checksum nybble
+
+		byte checksumNybble = (byte) (binary[16] & 0xf0);
+		byte[] checksum = Crypto.digest(entropy);
+		if (checksumNybble != (byte) (checksum[0] & 0xf0))
+			return "false";
+
+		return Base58.encode(entropy);
+	}
+
 	@POST
 	@Path("/privatekey")
 	@Operation(
--- a/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
+++ b/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
@@ -1,96 +0,0 @@
-package org.qortal.api.websocket;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.WebSocketException;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.qortal.controller.ChatNotifier;
-import org.qortal.crypto.Crypto;
-import org.qortal.data.chat.ActiveChats;
-import org.qortal.data.transaction.ChatTransactionData;
-import org.qortal.repository.DataException;
-import org.qortal.repository.Repository;
-import org.qortal.repository.RepositoryManager;
-
-@WebSocket
-@SuppressWarnings("serial")
-public class ActiveChatsWebSocket extends ApiWebSocket {
-
-	@Override
-	public void configure(WebSocketServletFactory factory) {
-		factory.register(ActiveChatsWebSocket.class);
-	}
-
-	@OnWebSocketConnect
-	@Override
-	public void onWebSocketConnect(Session session) {
-		Map<String, String> pathParams = getPathParams(session, "/{address}");
-
-		String address = pathParams.get("address");
-		if (address == null || !Crypto.isValidAddress(address)) {
-			session.close(4001, "invalid address");
-			return;
-		}
-
-		AtomicReference<String> previousOutput = new AtomicReference<>(null);
-
-		ChatNotifier.Listener listener = chatTransactionData -> onNotify(session, chatTransactionData, address, previousOutput);
-		ChatNotifier.getInstance().register(session, listener);
-
-		this.onNotify(session, null, address, previousOutput);
-	}
-
-	@OnWebSocketClose
-	@Override
-	public void onWebSocketClose(Session session, int statusCode, String reason) {
-		ChatNotifier.getInstance().deregister(session);
-	}
-
-	@OnWebSocketError
-	public void onWebSocketError(Session session, Throwable throwable) {
-		/* ignored */
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketMessage(Session session, String message) {
-		/* ignored */
-	}
-
-	private void onNotify(Session session, ChatTransactionData chatTransactionData, String ourAddress, AtomicReference<String> previousOutput) {
-		// If CHAT has a recipient (i.e. direct message, not group-based) and we're neither sender nor recipient, then it's of no interest
-		if (chatTransactionData != null) {
-			String recipient = chatTransactionData.getRecipient();
-
-			if (recipient != null && (!recipient.equals(ourAddress) && !chatTransactionData.getSender().equals(ourAddress)))
-				return;
-		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			ActiveChats activeChats = repository.getChatRepository().getActiveChats(ourAddress);
-
-			StringWriter stringWriter = new StringWriter();
-
-			marshall(stringWriter, activeChats);
-
-			// Only output if something has changed
-			String output = stringWriter.toString();
-			if (output.equals(previousOutput.get()))
-				return;
-
-			previousOutput.set(output);
-			session.getRemote().sendStringByFuture(output);
-		} catch (DataException | IOException | WebSocketException e) {
-			// No output this time?
-		}
-	}
-
-}
--- a/src/main/java/org/qortal/api/websocket/AdminStatusWebSocket.java
+++ b/src/main/java/org/qortal/api/websocket/AdminStatusWebSocket.java
@@ -1,101 +0,0 @@
-package org.qortal.api.websocket;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.WebSocketException;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.qortal.api.model.NodeStatus;
-import org.qortal.controller.Controller;
-import org.qortal.event.Event;
-import org.qortal.event.EventBus;
-import org.qortal.event.Listener;
-
-@WebSocket
-@SuppressWarnings("serial")
-public class AdminStatusWebSocket extends ApiWebSocket implements Listener {
-
-	private static final AtomicReference<String> previousOutput = new AtomicReference<>(null);
-
-	@Override
-	public void configure(WebSocketServletFactory factory) {
-		factory.register(AdminStatusWebSocket.class);
-
-		try {
-			previousOutput.set(buildStatusString());
-		} catch (IOException e) {
-			// How to fail properly?
-			return;
-		}
-
-		EventBus.INSTANCE.addListener(this::listen);
-	}
-
-	@Override
-	public void listen(Event event) {
-		if (!(event instanceof Controller.StatusChangeEvent))
-			return;
-
-		String newOutput;
-		try {
-			newOutput = buildStatusString();
-		} catch (IOException e) {
-			// Ignore this time?
-			return;
-		}
-
-		if (previousOutput.getAndUpdate(currentValue -> newOutput).equals(newOutput))
-			// Output hasn't changed, so don't send anything
-			return;
-
-		for (Session session : getSessions())
-			this.sendStatus(session, newOutput);
-	}
-
-	@OnWebSocketConnect
-	@Override
-	public void onWebSocketConnect(Session session) {
-		this.sendStatus(session, previousOutput.get());
-
-		super.onWebSocketConnect(session);
-	}
-
-	@OnWebSocketClose
-	@Override
-	public void onWebSocketClose(Session session, int statusCode, String reason) {
-		super.onWebSocketClose(session, statusCode, reason);
-	}
-
-	@OnWebSocketError
-	public void onWebSocketError(Session session, Throwable throwable) {
-		/* We ignore errors for now, but method here to silence log spam */
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketMessage(Session session, String message) {
-		/* ignored */
-	}
-
-	private static String buildStatusString() throws IOException {
-		NodeStatus nodeStatus = new NodeStatus();
-		StringWriter stringWriter = new StringWriter();
-		marshall(stringWriter, nodeStatus);
-		return stringWriter.toString();
-	}
-
-	private void sendStatus(Session session, String status) {
-		try {
-			session.getRemote().sendStringByFuture(status);
-		} catch (WebSocketException e) {
-			// No output this time?
-		}
-	}
-
-}
--- a/Show More
+++ b/Show More