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

Massive refactor to change 'qora' references to 'qortal'.

Browse Source 
Blockchain configs will need "v2Timestamp" feature trigger renaming to "qortalTimestamp"!

Due to Controller.VERSION_PREFIX changing, peer-to-peer protocol version detection has
been changed. Was previous a substring match, now we test peers's buildTimestamp is at
least Peer.V2_PROTOCOL_TIMESTAMP_THRESHOLD. Changes in Peer.java.

Also added comment and throw() to QortalATAPI.getNextTransactionTimestamp()
as this needs given the change to Qortal's block timestamps from legacy Qora.

Changes to HSQLDB data types, e.g. QoraAddress to QortalAddress, means existing
database will need to be thrown away after this commit!
This commit is contained in:
catbref 2020-02-04 12:11:37 +00:00
parent 87dffb183e
commit e0e9673837
428 changed files with 3175 additions and 3011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log4j2.properties
View File

@ -11,7 +11,7 @@ logger.hsqldb.name = hsqldb.db
logger.hsqldb.level = warn
# Support optional, per-session HSQLDB debugging
logger.hsqldbRepository.name = org.qora.repository.hsqldb
logger.hsqldbRepository.name = org.qortal.repository.hsqldb
logger.hsqldbRepository.level = debug
# Suppress extraneous Jersey warning

12
pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.qora</groupId>
<groupId>org.qortal</groupId>
<artifactId>qortal</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
@ -191,12 +191,12 @@
<configuration>
<packages>
<package>
<pattern>org.qora.data.**</pattern>
<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
<pattern>org.qortal.data.**</pattern>
<template>${project.build.sourceDirectory}/org/qortal/data/package-info.java</template>
</package>
<package>
<pattern>org.qora.api.model**</pattern>
<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
<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>
@ -283,7 +283,7 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.qora.controller.Controller</mainClass>
<mainClass>org.qortal.controller.Controller</mainClass>
<manifestEntries>
<Class-Path>. ..</Class-Path>
</manifestEntries>

8
src/main/java/org/qora/ApplyUpdate.java → src/main/java/org/qortal/ApplyUpdate.java
View File

@ -1,4 +1,4 @@
package org.qora;
package org.qortal;
import java.io.IOException;
import java.lang.management.ManagementFactory;
@ -15,9 +15,9 @@ 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.qora.api.ApiRequest;
import org.qora.controller.AutoUpdate;
import org.qora.settings.Settings;
import org.qortal.api.ApiRequest;
import org.qortal.controller.AutoUpdate;
import org.qortal.settings.Settings;
public class ApplyUpdate {

4
src/main/java/org/qora/XorUpdate.java → src/main/java/org/qortal/XorUpdate.java
View File

@ -1,4 +1,4 @@
package org.qora;
package org.qortal;
import java.io.IOException;
import java.io.InputStream;
@ -7,7 +7,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.qora.controller.AutoUpdate;
import org.qortal.controller.AutoUpdate;
public class XorUpdate {

20
src/main/java/org/qora/account/Account.java → src/main/java/org/qortal/account/Account.java
View File

@ -1,19 +1,19 @@
package org.qora.account;
package org.qortal.account;
import java.math.BigDecimal;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.block.BlockChain;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.account.AccountData;
import org.qora.data.account.RewardShareData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.transaction.Transaction;
import org.qora.utils.Base58;
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;
public class Account {

4
src/main/java/org/qora/account/GenesisAccount.java → src/main/java/org/qortal/account/GenesisAccount.java
View File

@ -1,6 +1,6 @@
package org.qora.account;
package org.qortal.account;
import org.qora.repository.Repository;
import org.qortal.repository.Repository;
public final class GenesisAccount extends PublicKeyAccount {

8
src/main/java/org/qora/account/PrivateKeyAccount.java → src/main/java/org/qortal/account/PrivateKeyAccount.java
View File

@ -1,13 +1,13 @@
package org.qora.account;
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.qora.crypto.BouncyCastle25519;
import org.qora.crypto.Crypto;
import org.qora.repository.Repository;
import org.qortal.crypto.BouncyCastle25519;
import org.qortal.crypto.Crypto;
import org.qortal.repository.Repository;
public class PrivateKeyAccount extends PublicKeyAccount {

8
src/main/java/org/qora/account/PublicKeyAccount.java → src/main/java/org/qortal/account/PublicKeyAccount.java
View File

@ -1,10 +1,10 @@
package org.qora.account;
package org.qortal.account;
import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
import org.bouncycastle.math.ec.rfc8032.Ed25519;
import org.qora.crypto.Crypto;
import org.qora.data.account.AccountData;
import org.qora.repository.Repository;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountData;
import org.qortal.repository.Repository;
public class PublicKeyAccount extends Account {

2
src/main/java/org/qora/api/ApiError.java → src/main/java/org/qortal/api/ApiError.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import static java.util.Arrays.stream;
import static java.util.stream.Collectors.toMap;

4
src/main/java/org/qora/api/ApiErrorHandler.java → src/main/java/org/qortal/api/ApiErrorHandler.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import java.io.IOException;
@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.qora.settings.Settings;
import org.qortal.settings.Settings;
public class ApiErrorHandler extends ErrorHandler {

2
src/main/java/org/qora/api/ApiErrorMessage.java → src/main/java/org/qortal/api/ApiErrorMessage.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/api/ApiErrors.java → src/main/java/org/qortal/api/ApiErrors.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
src/main/java/org/qora/api/ApiException.java → src/main/java/org/qortal/api/ApiException.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;

4
src/main/java/org/qora/api/ApiExceptionFactory.java → src/main/java/org/qortal/api/ApiExceptionFactory.java
View File

@ -1,8 +1,8 @@
package org.qora.api;
package org.qortal.api;
import javax.servlet.http.HttpServletRequest;
import org.qora.globalization.Translator;
import org.qortal.globalization.Translator;
public enum ApiExceptionFactory {
INSTANCE;

2
src/main/java/org/qora/api/ApiRequest.java → src/main/java/org/qortal/api/ApiRequest.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import java.io.IOException;
import java.io.InputStream;

10
src/main/java/org/qora/api/ApiService.java → src/main/java/org/qortal/api/ApiService.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
@ -20,9 +20,9 @@ import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlets.CrossOriginFilter;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
import org.qora.api.resource.AnnotationPostProcessor;
import org.qora.api.resource.ApiDefinition;
import org.qora.settings.Settings;
import org.qortal.api.resource.AnnotationPostProcessor;
import org.qortal.api.resource.ApiDefinition;
import org.qortal.settings.Settings;
public class ApiService {
@ -33,7 +33,7 @@ public class ApiService {
private ApiService() {
this.config = new ResourceConfig();
this.config.packages("org.qora.api.resource");
this.config.packages("org.qortal.api.resource");
this.config.register(OpenApiResource.class);
this.config.register(ApiDefinition.class);
this.config.register(AnnotationPostProcessor.class);

2
src/main/java/org/qora/api/Base58TypeAdapter.java → src/main/java/org/qortal/api/Base58TypeAdapter.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import javax.xml.bind.annotation.adapters.XmlAdapter;

2
src/main/java/org/qora/api/BigDecimalTypeAdapter.java → src/main/java/org/qortal/api/BigDecimalTypeAdapter.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import java.math.BigDecimal;

2
src/main/java/org/qora/api/Constants.java → src/main/java/org/qortal/api/Constants.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;

2
src/main/java/org/qora/api/Security.java → src/main/java/org/qortal/api/Security.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import java.net.InetAddress;
import java.net.UnknownHostException;

2
src/main/java/org/qora/api/TransactionClassExtractor.java → src/main/java/org/qortal/api/TransactionClassExtractor.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
import org.eclipse.persistence.descriptors.ClassExtractor;
import org.eclipse.persistence.sessions.Record;

4
src/main/java/org/qora/api/TransactionCountMapXmlAdapter.java → src/main/java/org/qortal/api/TransactionCountMapXmlAdapter.java
View File

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

2
src/main/java/org/qora/api/TranslatableProperty.java → src/main/java/org/qortal/api/TranslatableProperty.java
View File

@ -1,4 +1,4 @@
package org.qora.api;
package org.qortal.api;
interface TranslatableProperty<T> {
public String keyName();

6
src/main/java/org/qora/api/model/ActivitySummary.java → src/main/java/org/qortal/api/model/ActivitySummary.java
View File

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

4
src/main/java/org/qora/api/model/AggregatedOrder.java → src/main/java/org/qortal/api/model/AggregatedOrder.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import java.math.BigDecimal;
@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.qora.data.asset.OrderData;
import org.qortal.data.asset.OrderData;
@XmlAccessorType(XmlAccessType.NONE)
public class AggregatedOrder {

2
src/main/java/org/qora/api/model/ApiOnlineAccount.java → src/main/java/org/qortal/api/model/ApiOnlineAccount.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

4
src/main/java/org/qora/api/model/BlockMinterSummary.java → src/main/java/org/qortal/api/model/BlockMinterSummary.java
View File

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

10
src/main/java/org/qora/api/model/ConnectedPeer.java → src/main/java/org/qortal/api/model/ConnectedPeer.java
View File

@ -1,12 +1,12 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.qora.data.network.PeerChainTipData;
import org.qora.data.network.PeerData;
import org.qora.network.Handshake;
import org.qora.network.Peer;
import org.qortal.data.network.PeerChainTipData;
import org.qortal.data.network.PeerData;
import org.qortal.network.Handshake;
import org.qortal.network.Peer;
import io.swagger.v3.oas.annotations.media.Schema;

2
src/main/java/org/qora/api/model/GroupMembers.java → src/main/java/org/qortal/api/model/GroupMembers.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import java.util.List;

4
src/main/java/org/qora/api/model/NameSummary.java → src/main/java/org/qortal/api/model/NameSummary.java
View File

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

2
src/main/java/org/qora/api/model/NodeInfo.java → src/main/java/org/qortal/api/model/NodeInfo.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/api/model/RewardShareKeyRequest.java → src/main/java/org/qortal/api/model/RewardShareKeyRequest.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/api/model/SimpleTransactionSignRequest.java → src/main/java/org/qortal/api/model/SimpleTransactionSignRequest.java
View File

@ -1,4 +1,4 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

6
src/main/java/org/qora/api/model/TradeWithOrderInfo.java → src/main/java/org/qortal/api/model/TradeWithOrderInfo.java
View File

@ -1,11 +1,11 @@
package org.qora.api.model;
package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.qora.data.asset.OrderData;
import org.qora.data.asset.TradeData;
import org.qortal.data.asset.OrderData;
import org.qortal.data.asset.TradeData;
import io.swagger.v3.oas.annotations.media.Schema;

52
src/main/java/org/qora/api/resource/AddressesResource.java → src/main/java/org/qortal/api/resource/AddressesResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -22,31 +22,31 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.ApiOnlineAccount;
import org.qora.api.model.RewardShareKeyRequest;
import org.qora.asset.Asset;
import org.qora.controller.Controller;
import org.qora.crypto.Crypto;
import org.qora.data.account.AccountData;
import org.qora.data.account.RewardShareData;
import org.qora.data.network.OnlineAccountData;
import org.qora.data.transaction.RewardShareTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.Transformer;
import org.qora.transform.transaction.RewardShareTransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
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.ApiOnlineAccount;
import org.qortal.api.model.RewardShareKeyRequest;
import org.qortal.asset.Asset;
import org.qortal.controller.Controller;
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.transaction.RewardShareTransactionData;
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.Transformer;
import org.qortal.transform.transaction.RewardShareTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/addresses")
@Tag(name = "Addresses")

46
src/main/java/org/qora/api/resource/AdminResource.java → src/main/java/org/qortal/api/resource/AdminResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,28 +36,28 @@ import javax.ws.rs.core.MediaType;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.RollingFileAppender;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.Security;
import org.qora.api.model.ActivitySummary;
import org.qora.api.model.NodeInfo;
import org.qora.block.BlockChain;
import org.qora.controller.Controller;
import org.qora.controller.Synchronizer.SynchronizationResult;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.data.account.MintingAccountData;
import org.qora.data.account.RewardShareData;
import org.qora.network.Network;
import org.qora.network.Peer;
import org.qora.network.PeerAddress;
import org.qora.utils.Base58;
import org.qora.utils.NTP;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
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.block.BlockChain;
import org.qortal.controller.Controller;
import org.qortal.controller.Synchronizer.SynchronizationResult;
import org.qortal.data.account.MintingAccountData;
import org.qortal.data.account.RewardShareData;
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.Base58;
import org.qortal.utils.NTP;
import com.google.common.collect.Lists;

12
src/main/java/org/qora/api/resource/AnnotationPostProcessor.java → src/main/java/org/qortal/api/resource/AnnotationPostProcessor.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.jaxrs2.Reader;
@ -21,11 +21,11 @@ import javax.ws.rs.Path;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.api.ApiError;
import org.qora.api.ApiErrorMessage;
import org.qora.api.ApiErrors;
import org.qora.api.ApiService;
import org.qora.globalization.Translator;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrorMessage;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiService;
import org.qortal.globalization.Translator;
public class AnnotationPostProcessor implements ReaderListener {

4
src/main/java/org/qora/api/resource/ApiDefinition.java → src/main/java/org/qortal/api/resource/ApiDefinition.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.extensions.Extension;
@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.tags.Tag;
@OpenAPIDefinition(
info = @Info( title = "Qora API", description = "NOTE: byte-arrays are encoded in Base58" ),
info = @Info( title = "Qortal API", description = "NOTE: byte-arrays are encoded in Base58" ),
tags = {
@Tag(name = "Addresses"),
@Tag(name = "Admin"),

4
src/main/java/org/qora/api/resource/ApiExceptionMapper.java → src/main/java/org/qortal/api/resource/ApiExceptionMapper.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@ -11,7 +11,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.glassfish.jersey.server.ParamException;
import org.qora.settings.Settings;
import org.qortal.settings.Settings;
@Provider
public class ApiExceptionMapper implements ExceptionMapper<RuntimeException> {

40
src/main/java/org/qora/api/resource/ArbitraryResource.java → src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -21,25 +21,25 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.resource.TransactionsResource.ConfirmationStatus;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.ArbitraryTransactionData.DataType;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.ArbitraryTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.ArbitraryTransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiException;
import org.qortal.api.ApiExceptionFactory;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.ArbitraryTransactionData.DataType;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.settings.Settings;
import org.qortal.transaction.ArbitraryTransaction;
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.ArbitraryTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/arbitrary")
@Tag(name = "Arbitrary")

72
src/main/java/org/qora/api/resource/AssetsResource.java → src/main/java/org/qortal/api/resource/AssetsResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -24,41 +24,41 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.AggregatedOrder;
import org.qora.api.model.TradeWithOrderInfo;
import org.qora.api.resource.TransactionsResource.ConfirmationStatus;
import org.qora.asset.Asset;
import org.qora.crypto.Crypto;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.account.AccountData;
import org.qora.data.asset.AssetData;
import org.qora.data.asset.OrderData;
import org.qora.data.asset.RecentTradeData;
import org.qora.data.asset.TradeData;
import org.qora.data.transaction.CancelAssetOrderTransactionData;
import org.qora.data.transaction.CreateAssetOrderTransactionData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.TransferAssetTransactionData;
import org.qora.data.transaction.UpdateAssetTransactionData;
import org.qora.repository.AccountRepository.BalanceOrdering;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.CancelAssetOrderTransactionTransformer;
import org.qora.transform.transaction.CreateAssetOrderTransactionTransformer;
import org.qora.transform.transaction.IssueAssetTransactionTransformer;
import org.qora.transform.transaction.TransferAssetTransactionTransformer;
import org.qora.transform.transaction.UpdateAssetTransactionTransformer;
import org.qora.utils.Base58;
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.AggregatedOrder;
import org.qortal.api.model.TradeWithOrderInfo;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.asset.Asset;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.account.AccountData;
import org.qortal.data.asset.AssetData;
import org.qortal.data.asset.OrderData;
import org.qortal.data.asset.RecentTradeData;
import org.qortal.data.asset.TradeData;
import org.qortal.data.transaction.CancelAssetOrderTransactionData;
import org.qortal.data.transaction.CreateAssetOrderTransactionData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferAssetTransactionData;
import org.qortal.data.transaction.UpdateAssetTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
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.CancelAssetOrderTransactionTransformer;
import org.qortal.transform.transaction.CreateAssetOrderTransactionTransformer;
import org.qortal.transform.transaction.IssueAssetTransactionTransformer;
import org.qortal.transform.transaction.TransferAssetTransactionTransformer;
import org.qortal.transform.transaction.UpdateAssetTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/assets")
@Tag(name = "Assets")

28
src/main/java/org/qora/api/resource/BlocksResource.java → src/main/java/org/qortal/api/resource/BlocksResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -20,19 +20,19 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.BlockMinterSummary;
import org.qora.crypto.Crypto;
import org.qora.data.account.AccountData;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.utils.Base58;
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.BlockMinterSummary;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountData;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.utils.Base58;
@Path("/blocks")
@Tag(name = "Blocks")

94
src/main/java/org/qora/api/resource/GroupsResource.java → src/main/java/org/qortal/api/resource/GroupsResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -22,52 +22,52 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.GroupMembers;
import org.qora.api.model.GroupMembers.MemberInfo;
import org.qora.crypto.Crypto;
import org.qora.data.group.GroupAdminData;
import org.qora.data.group.GroupBanData;
import org.qora.data.group.GroupData;
import org.qora.data.group.GroupInviteData;
import org.qora.data.group.GroupJoinRequestData;
import org.qora.data.group.GroupMemberData;
import org.qora.data.transaction.AddGroupAdminTransactionData;
import org.qora.data.transaction.CancelGroupInviteTransactionData;
import org.qora.data.transaction.CreateGroupTransactionData;
import org.qora.data.transaction.GroupApprovalTransactionData;
import org.qora.data.transaction.GroupBanTransactionData;
import org.qora.data.transaction.GroupInviteTransactionData;
import org.qora.data.transaction.GroupKickTransactionData;
import org.qora.data.transaction.CancelGroupBanTransactionData;
import org.qora.data.transaction.JoinGroupTransactionData;
import org.qora.data.transaction.LeaveGroupTransactionData;
import org.qora.data.transaction.RemoveGroupAdminTransactionData;
import org.qora.data.transaction.SetGroupTransactionData;
import org.qora.data.transaction.UpdateGroupTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.AddGroupAdminTransactionTransformer;
import org.qora.transform.transaction.CancelGroupInviteTransactionTransformer;
import org.qora.transform.transaction.CreateGroupTransactionTransformer;
import org.qora.transform.transaction.GroupApprovalTransactionTransformer;
import org.qora.transform.transaction.GroupBanTransactionTransformer;
import org.qora.transform.transaction.GroupInviteTransactionTransformer;
import org.qora.transform.transaction.GroupKickTransactionTransformer;
import org.qora.transform.transaction.CancelGroupBanTransactionTransformer;
import org.qora.transform.transaction.JoinGroupTransactionTransformer;
import org.qora.transform.transaction.LeaveGroupTransactionTransformer;
import org.qora.transform.transaction.RemoveGroupAdminTransactionTransformer;
import org.qora.transform.transaction.SetGroupTransactionTransformer;
import org.qora.transform.transaction.UpdateGroupTransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiExceptionFactory;
import org.qortal.api.model.GroupMembers;
import org.qortal.api.model.GroupMembers.MemberInfo;
import org.qortal.crypto.Crypto;
import org.qortal.data.group.GroupAdminData;
import org.qortal.data.group.GroupBanData;
import org.qortal.data.group.GroupData;
import org.qortal.data.group.GroupInviteData;
import org.qortal.data.group.GroupJoinRequestData;
import org.qortal.data.group.GroupMemberData;
import org.qortal.data.transaction.AddGroupAdminTransactionData;
import org.qortal.data.transaction.CancelGroupBanTransactionData;
import org.qortal.data.transaction.CancelGroupInviteTransactionData;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.GroupApprovalTransactionData;
import org.qortal.data.transaction.GroupBanTransactionData;
import org.qortal.data.transaction.GroupInviteTransactionData;
import org.qortal.data.transaction.GroupKickTransactionData;
import org.qortal.data.transaction.JoinGroupTransactionData;
import org.qortal.data.transaction.LeaveGroupTransactionData;
import org.qortal.data.transaction.RemoveGroupAdminTransactionData;
import org.qortal.data.transaction.SetGroupTransactionData;
import org.qortal.data.transaction.UpdateGroupTransactionData;
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.AddGroupAdminTransactionTransformer;
import org.qortal.transform.transaction.CancelGroupBanTransactionTransformer;
import org.qortal.transform.transaction.CancelGroupInviteTransactionTransformer;
import org.qortal.transform.transaction.CreateGroupTransactionTransformer;
import org.qortal.transform.transaction.GroupApprovalTransactionTransformer;
import org.qortal.transform.transaction.GroupBanTransactionTransformer;
import org.qortal.transform.transaction.GroupInviteTransactionTransformer;
import org.qortal.transform.transaction.GroupKickTransactionTransformer;
import org.qortal.transform.transaction.JoinGroupTransactionTransformer;
import org.qortal.transform.transaction.LeaveGroupTransactionTransformer;
import org.qortal.transform.transaction.RemoveGroupAdminTransactionTransformer;
import org.qortal.transform.transaction.SetGroupTransactionTransformer;
import org.qortal.transform.transaction.UpdateGroupTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/groups")
@Tag(name = "Groups")

50
src/main/java/org/qora/api/resource/NamesResource.java → src/main/java/org/qortal/api/resource/NamesResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -21,30 +21,30 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.NameSummary;
import org.qora.crypto.Crypto;
import org.qora.data.naming.NameData;
import org.qora.data.transaction.BuyNameTransactionData;
import org.qora.data.transaction.CancelSellNameTransactionData;
import org.qora.data.transaction.RegisterNameTransactionData;
import org.qora.data.transaction.SellNameTransactionData;
import org.qora.data.transaction.UpdateNameTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.BuyNameTransactionTransformer;
import org.qora.transform.transaction.CancelSellNameTransactionTransformer;
import org.qora.transform.transaction.RegisterNameTransactionTransformer;
import org.qora.transform.transaction.SellNameTransactionTransformer;
import org.qora.transform.transaction.UpdateNameTransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiExceptionFactory;
import org.qortal.api.model.NameSummary;
import org.qortal.crypto.Crypto;
import org.qortal.data.naming.NameData;
import org.qortal.data.transaction.BuyNameTransactionData;
import org.qortal.data.transaction.CancelSellNameTransactionData;
import org.qortal.data.transaction.RegisterNameTransactionData;
import org.qortal.data.transaction.SellNameTransactionData;
import org.qortal.data.transaction.UpdateNameTransactionData;
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.BuyNameTransactionTransformer;
import org.qortal.transform.transaction.CancelSellNameTransactionTransformer;
import org.qortal.transform.transaction.RegisterNameTransactionTransformer;
import org.qortal.transform.transaction.SellNameTransactionTransformer;
import org.qortal.transform.transaction.UpdateNameTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/names")
@Tag(name = "Names")

28
src/main/java/org/qora/api/resource/PaymentsResource.java → src/main/java/org/qortal/api/resource/PaymentsResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@ -13,19 +13,19 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiExceptionFactory;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.PaymentTransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiExceptionFactory;
import org.qortal.data.transaction.PaymentTransactionData;
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.PaymentTransactionTransformer;
import org.qortal.utils.Base58;
@Path("/payments")
@Tag(name = "Payments")

26
src/main/java/org/qora/api/resource/PeersResource.java → src/main/java/org/qortal/api/resource/PeersResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.ArraySchema;
@ -19,18 +19,18 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.Security;
import org.qora.api.model.ConnectedPeer;
import org.qora.data.network.PeerData;
import org.qora.network.Network;
import org.qora.network.PeerAddress;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
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.data.network.PeerData;
import org.qortal.network.Network;
import org.qortal.network.PeerAddress;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
@Path("/peers")
@Tag(name = "Peers")

40
src/main/java/org/qora/api/resource/TransactionsResource.java → src/main/java/org/qortal/api/resource/TransactionsResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -23,25 +23,25 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.account.PrivateKeyAccount;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiException;
import org.qora.api.ApiExceptionFactory;
import org.qora.api.model.SimpleTransactionSignRequest;
import org.qora.controller.Controller;
import org.qora.data.transaction.TransactionData;
import org.qora.globalization.Translator;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
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.SimpleTransactionSignRequest;
import org.qortal.controller.Controller;
import org.qortal.data.transaction.TransactionData;
import org.qortal.globalization.Translator;
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.TransactionType;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import com.google.common.primitives.Bytes;

26
src/main/java/org/qora/api/resource/UtilsResource.java → src/main/java/org/qortal/api/resource/UtilsResource.java
View File

@ -1,4 +1,4 @@
package org.qora.api.resource;
package org.qortal.api.resource;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.ArraySchema;
@ -23,18 +23,18 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.qora.account.PrivateKeyAccount;
import org.qora.api.ApiError;
import org.qora.api.ApiErrors;
import org.qora.api.ApiExceptionFactory;
import org.qora.crypto.Crypto;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.Transformer;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.transform.transaction.TransactionTransformer.Transformation;
import org.qora.utils.BIP39;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.api.ApiError;
import org.qortal.api.ApiErrors;
import org.qortal.api.ApiExceptionFactory;
import org.qortal.crypto.Crypto;
import org.qortal.settings.Settings;
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;
import com.google.common.primitives.Bytes;

14
src/main/java/org/qora/asset/Asset.java → src/main/java/org/qortal/asset/Asset.java
View File

@ -1,11 +1,11 @@
package org.qora.asset;
package org.qortal.asset;
import org.qora.data.asset.AssetData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.UpdateAssetTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.data.asset.AssetData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.UpdateAssetTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class Asset {

66
src/main/java/org/qora/asset/Order.java → src/main/java/org/qortal/asset/Order.java
View File

@ -1,4 +1,4 @@
package org.qora.asset;
package org.qortal.asset;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -9,16 +9,16 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.Account;
import org.qora.account.PublicKeyAccount;
import org.qora.block.BlockChain;
import org.qora.data.asset.AssetData;
import org.qora.data.asset.OrderData;
import org.qora.data.asset.TradeData;
import org.qora.repository.AssetRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.utils.Base58;
import org.qortal.account.Account;
import org.qortal.account.PublicKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.data.asset.AssetData;
import org.qortal.data.asset.OrderData;
import org.qortal.data.asset.TradeData;
import org.qortal.repository.AssetRepository;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.utils.Base58;
public class Order {
@ -33,7 +33,7 @@ public class Order {
private final long haveAssetId;
private final long wantAssetId;
/** Cache of price-pair units e.g. QORA/GOLD, but use getPricePair() instead! */
/** Cache of price-pair units e.g. QORT/GOLD, but use getPricePair() instead! */
private String cachedPricePair;
/** Cache of have-asset data - but use getHaveAsset() instead! */
@ -119,7 +119,7 @@ public class Order {
/**
* Returns price-pair in string form.
* <p>
* e.g. <tt>"QORA/GOLD"</tt>
* e.g. <tt>"QORT/GOLD"</tt>
*/
public String getPricePair() throws DataException {
if (cachedPricePair == null)
@ -128,11 +128,11 @@ public class Order {
return cachedPricePair;
}
/** Calculate price pair. (e.g. QORA/GOLD)
/** Calculate price pair. (e.g. QORT/GOLD)
* <p>
* Under 'new' pricing scheme, lowest-assetID asset is first,
* so if QORA has assetID 0 and GOLD has assetID 10, then
* the pricing pair is QORA/GOLD.
* so if QORT has assetID 0 and GOLD has assetID 10, then
* the pricing pair is QORT/GOLD.
* <p>
* This means the "amount" fields are expressed in terms
* of the higher-assetID asset. (e.g. GOLD)
@ -293,39 +293,39 @@ public class Order {
* Potential matching order example ("old"):
*
* Our order:
* haveAssetId=[GOLD], wantAssetId=0 (QORA), amount=40 (GOLD), price=486 (QORA/GOLD)
* This translates to "we have 40 GOLD and want QORA at a price of 486 QORA per GOLD"
* If our order matched, we'd end up with 40 * 486 = 19,440 QORA.
* haveAssetId=[GOLD], wantAssetId=0 (QORT), amount=40 (GOLD), price=486 (QORT/GOLD)
* This translates to "we have 40 GOLD and want QORT at a price of 486 QORT per GOLD"
* If our order matched, we'd end up with 40 * 486 = 19,440 QORT.
*
* Their order:
* haveAssetId=0 (QORA), wantAssetId=[GOLD], amount=20,000 (QORA), price=0.00205761 (GOLD/QORA)
* This translates to "they have 20,000 QORA and want GOLD at a price of 0.00205761 GOLD per QORA"
* haveAssetId=0 (QORT), wantAssetId=[GOLD], amount=20,000 (QORT), price=0.00205761 (GOLD/QORT)
* This translates to "they have 20,000 QORT and want GOLD at a price of 0.00205761 GOLD per QORT"
*
* Their price, converted into 'our' units of QORA/GOLD, is: 1 / 0.00205761 = 486.00074844 QORA/GOLD.
* This is better than our requested 486 QORA/GOLD so this order matches.
* Their price, converted into 'our' units of QORT/GOLD, is: 1 / 0.00205761 = 486.00074844 QORT/GOLD.
* This is better than our requested 486 QORT/GOLD so this order matches.
*
* Using their price, we end up with 40 * 486.00074844 = 19440.02993760 QORA. They end up with 40 GOLD.
* Using their price, we end up with 40 * 486.00074844 = 19440.02993760 QORT. They end up with 40 GOLD.
*
* If their order had 19,440 QORA left, only 19,440 * 0.00205761 = 39.99993840 GOLD would be traded.
* If their order had 19,440 QORT left, only 19,440 * 0.00205761 = 39.99993840 GOLD would be traded.
*/
/*
* Potential matching order example ("new"):
*
* Our order:
* haveAssetId=[GOLD], wantAssetId=0 (QORA), amount=40 (GOLD), price=486 (QORA/GOLD)
* This translates to "we have 40 GOLD and want QORA at a price of 486 QORA per GOLD"
* If our order matched, we'd end up with 19,440 QORA at a cost of 19,440 / 486 = 40 GOLD.
* haveAssetId=[GOLD], wantAssetId=0 (QORT), amount=40 (GOLD), price=486 (QORT/GOLD)
* This translates to "we have 40 GOLD and want QORT at a price of 486 QORT per GOLD"
* If our order matched, we'd end up with 19,440 QORT at a cost of 19,440 / 486 = 40 GOLD.
*
* Their order:
* haveAssetId=0 (QORA), wantAssetId=[GOLD], amount=40 (GOLD), price=486.00074844 (QORA/GOLD)
* This translates to "they have QORA and want GOLD at a price of 486.00074844 QORA per GOLD"
* haveAssetId=0 (QORT), wantAssetId=[GOLD], amount=40 (GOLD), price=486.00074844 (QORT/GOLD)
* This translates to "they have QORT and want GOLD at a price of 486.00074844 QORT per GOLD"
*
* Their price is better than our requested 486 QORA/GOLD so this order matches.
* Their price is better than our requested 486 QORT/GOLD so this order matches.
*
* Using their price, we end up with 40 * 486.00074844 = 19440.02993760 QORA. They end up with 40 GOLD.
* Using their price, we end up with 40 * 486.00074844 = 19440.02993760 QORT. They end up with 40 GOLD.
*
* If their order only had 36 GOLD left, only 36 * 486.00074844 = 17496.02694384 QORA would be traded.
* If their order only had 36 GOLD left, only 36 * 486.00074844 = 17496.02694384 QORT would be traded.
*/
BigDecimal ourPrice = this.orderData.getPrice();

18
src/main/java/org/qora/asset/Trade.java → src/main/java/org/qortal/asset/Trade.java
View File

@ -1,15 +1,15 @@
package org.qora.asset;
package org.qortal.asset;
import java.math.BigDecimal;
import org.qora.account.Account;
import org.qora.account.PublicKeyAccount;
import org.qora.block.BlockChain;
import org.qora.data.asset.OrderData;
import org.qora.data.asset.TradeData;
import org.qora.repository.AssetRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.Account;
import org.qortal.account.PublicKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.data.asset.OrderData;
import org.qortal.data.asset.TradeData;
import org.qortal.repository.AssetRepository;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class Trade {

26
src/main/java/org/qora/at/AT.java → src/main/java/org/qortal/at/AT.java
View File

@ -1,19 +1,19 @@
package org.qora.at;
package org.qortal.at;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.util.List;
import org.ciyam.at.MachineState;
import org.qora.asset.Asset;
import org.qora.crypto.Crypto;
import org.qora.data.at.ATData;
import org.qora.data.at.ATStateData;
import org.qora.data.transaction.DeployAtTransactionData;
import org.qora.repository.ATRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.transaction.AtTransaction;
import org.qortal.asset.Asset;
import org.qortal.crypto.Crypto;
import org.qortal.data.at.ATData;
import org.qortal.data.at.ATStateData;
import org.qortal.data.transaction.DeployAtTransactionData;
import org.qortal.repository.ATRepository;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.transaction.AtTransaction;
public class AT {
@ -60,7 +60,7 @@ public class AT {
this.atStateData = new ATStateData(atAddress, height, creation, stateData, stateHash, BigDecimal.ZERO.setScale(8));
} else {
// Legacy v1 AT
// We would deploy these in 'dead' state as they will never be run on Qora2
// We would deploy these in 'dead' state as they will never be run on Qortal
// but this breaks import from Qora1 so something else will have to mark them dead at hard-fork
// Extract code bytes length
@ -129,8 +129,8 @@ public class AT {
public List<AtTransaction> run(long blockTimestamp) throws DataException {
String atAddress = this.atData.getATAddress();
QoraATAPI api = new QoraATAPI(repository, this.atData, blockTimestamp);
QoraATLogger logger = new QoraATLogger();
QortalATAPI api = new QortalATAPI(repository, this.atData, blockTimestamp);
QortalATLogger logger = new QortalATLogger();
byte[] codeBytes = this.atData.getCodeBytes();

34
src/main/java/org/qora/at/BlockchainAPI.java → src/main/java/org/qortal/at/BlockchainAPI.java
View File

@ -1,4 +1,4 @@
package org.qora.at;
package org.qortal.at;
import static java.util.Arrays.stream;
import static java.util.stream.Collectors.toMap;
@ -9,25 +9,25 @@ import java.util.Map;
import org.ciyam.at.MachineState;
import org.ciyam.at.Timestamp;
import org.qora.account.Account;
import org.qora.block.Block;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.ATTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.BlockRepository;
import org.qora.repository.DataException;
import org.qora.transaction.Transaction;
import org.qortal.account.Account;
import org.qortal.block.Block;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.ATTransactionData;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.BlockRepository;
import org.qortal.repository.DataException;
import org.qortal.transaction.Transaction;
public enum BlockchainAPI {
QORA(0) {
QORTAL(0) {
@Override
public void putTransactionFromRecipientAfterTimestampInA(String recipient, Timestamp timestamp, MachineState state) {
int height = timestamp.blockHeight;
int sequence = timestamp.transactionSequence + 1;
QoraATAPI api = (QoraATAPI) state.getAPI();
QortalATAPI api = (QortalATAPI) state.getAPI();
BlockRepository blockRepository = api.repository.getBlockRepository();
try {
@ -59,11 +59,11 @@ public enum BlockchainAPI {
api.setA1(state, new Timestamp(height, timestamp.blockchainId, sequence).longValue());
// Hash transaction's signature into other three A fields for future verification that it's the same transaction
byte[] hash = QoraATAPI.sha192(transaction.getTransactionData().getSignature());
byte[] hash = QortalATAPI.sha192(transaction.getTransactionData().getSignature());
api.setA2(state, QoraATAPI.fromBytes(hash, 0));
api.setA3(state, QoraATAPI.fromBytes(hash, 8));
api.setA4(state, QoraATAPI.fromBytes(hash, 16));
api.setA2(state, QortalATAPI.fromBytes(hash, 0));
api.setA3(state, QortalATAPI.fromBytes(hash, 8));
api.setA4(state, QortalATAPI.fromBytes(hash, 16));
return;
}
@ -80,7 +80,7 @@ public enum BlockchainAPI {
@Override
public long getAmountFromTransactionInA(Timestamp timestamp, MachineState state) {
QoraATAPI api = (QoraATAPI) state.getAPI();
QortalATAPI api = (QortalATAPI) state.getAPI();
TransactionData transactionData = api.fetchTransaction(state);
switch (transactionData.getType()) {

56
src/main/java/org/qora/at/QoraATAPI.java → src/main/java/org/qortal/at/QortalATAPI.java
View File

@ -1,4 +1,4 @@
package org.qora.at;
package org.qortal.at;
import java.math.BigDecimal;
import java.security.MessageDigest;
@ -13,28 +13,28 @@ import org.ciyam.at.IllegalFunctionCodeException;
import org.ciyam.at.MachineState;
import org.ciyam.at.OpCode;
import org.ciyam.at.Timestamp;
import org.qora.account.Account;
import org.qora.account.GenesisAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.asset.Asset;
import org.qora.crypto.Crypto;
import org.qora.data.at.ATData;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.ATTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.MessageTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.transaction.AtTransaction;
import org.qortal.account.Account;
import org.qortal.account.GenesisAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.crypto.Crypto;
import org.qortal.data.at.ATData;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.ATTransactionData;
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.transaction.AtTransaction;
import com.google.common.primitives.Bytes;
public class QoraATAPI extends API {
public class QortalATAPI extends API {
// Useful constants
private static final BigDecimal FEE_PER_STEP = BigDecimal.valueOf(1.0).setScale(8); // 1 Qora per "step"
private static final BigDecimal FEE_PER_STEP = BigDecimal.valueOf(1.0).setScale(8); // 1 QORT per "step"
private static final int MAX_STEPS_PER_ROUND = 500;
private static final int STEPS_PER_FUNCTION_CALL = 10;
private static final int MINUTES_PER_BLOCK = 10;
@ -49,14 +49,14 @@ public class QoraATAPI extends API {
// Constructors
public QoraATAPI(Repository repository, ATData atData, long blockTimestamp) {
public QortalATAPI(Repository repository, ATData atData, long blockTimestamp) {
this.repository = repository;
this.atData = atData;
this.transactions = new ArrayList<>();
this.blockTimestamp = blockTimestamp;
}
// Methods specific to Qora AT processing, not inherited
// Methods specific to Qortal AT processing, not inherited
public List<AtTransaction> getTransactions() {
return this.transactions;
@ -333,19 +333,19 @@ public class QoraATAPI extends API {
@Override
public void platformSpecificPreExecuteCheck(int paramCount, boolean returnValueExpected, MachineState state, short rawFunctionCode)
throws IllegalFunctionCodeException {
QoraFunctionCode qoraFunctionCode = QoraFunctionCode.valueOf(rawFunctionCode);
QortalFunctionCode qortalFunctionCode = QortalFunctionCode.valueOf(rawFunctionCode);
if (qoraFunctionCode == null)
throw new IllegalFunctionCodeException("Unknown Qora function code 0x" + String.format("%04x", rawFunctionCode) + " encountered");
if (qortalFunctionCode == null)
throw new IllegalFunctionCodeException("Unknown Qortal function code 0x" + String.format("%04x", rawFunctionCode) + " encountered");
qoraFunctionCode.preExecuteCheck(2, true, state, rawFunctionCode);
qortalFunctionCode.preExecuteCheck(2, true, state, rawFunctionCode);
}
@Override
public void platformSpecificPostCheckExecute(FunctionData functionData, MachineState state, short rawFunctionCode) throws ExecutionException {
QoraFunctionCode qoraFunctionCode = QoraFunctionCode.valueOf(rawFunctionCode);
QortalFunctionCode qortalFunctionCode = QortalFunctionCode.valueOf(rawFunctionCode);
qoraFunctionCode.execute(functionData, state, rawFunctionCode);
qortalFunctionCode.execute(functionData, state, rawFunctionCode);
}
// Utility methods
@ -419,7 +419,9 @@ public class QoraATAPI extends API {
* As long as ATs are not allowed to generate that many per block, e.g. by limiting maximum steps per execution round, then we should be fine.
*/
return this.blockTimestamp + this.transactions.size();
// XXX THE ABOVE IS NO LONGER TRUE IN QORTAL!
// return this.blockTimestamp + this.transactions.size();
throw new RuntimeException("AT timestamp code not fixed!");
}
/** Returns AT account's lastReference, taking newly generated ATTransactions into account */

6
src/main/java/org/qora/at/QoraATLogger.java → src/main/java/org/qortal/at/QortalATLogger.java
View File

@ -1,11 +1,11 @@
package org.qora.at;
package org.qortal.at;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class QoraATLogger implements org.ciyam.at.LoggerInterface {
public class QortalATLogger implements org.ciyam.at.LoggerInterface {
// NOTE: We're logging on behalf of qora.at.AT, not ourselves!
// NOTE: We're logging on behalf of org.qortal.at.AT, not ourselves!
private static final Logger LOGGER = LogManager.getLogger(AT.class);
@Override

12
src/main/java/org/qora/at/QoraFunctionCode.java → src/main/java/org/qortal/at/QortalFunctionCode.java
View File

@ -1,4 +1,4 @@
package org.qora.at;
package org.qortal.at;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
@ -12,12 +12,12 @@ import org.ciyam.at.MachineState;
import org.ciyam.at.Timestamp;
/**
* Qora-specific CIYAM-AT Functions.
* Qortal-specific CIYAM-AT Functions.
* <p>
* Function codes need to be between 0x0500 and 0x06ff.
*
*/
public enum QoraFunctionCode {
public enum QortalFunctionCode {
/**
* <tt>0x0500</tt><br>
* Returns current BTC block's "timestamp"
@ -48,16 +48,16 @@ public enum QoraFunctionCode {
public final int paramCount;
public final boolean returnsValue;
private final static Map<Short, QoraFunctionCode> map = Arrays.stream(QoraFunctionCode.values())
private final static Map<Short, QortalFunctionCode> map = Arrays.stream(QortalFunctionCode.values())
.collect(Collectors.toMap(functionCode -> functionCode.value, functionCode -> functionCode));
private QoraFunctionCode(int value, int paramCount, boolean returnsValue) {
private QortalFunctionCode(int value, int paramCount, boolean returnsValue) {
this.value = (short) value;
this.paramCount = paramCount;
this.returnsValue = returnsValue;
}
public static QoraFunctionCode valueOf(int value) {
public static QortalFunctionCode valueOf(int value) {
return map.get((short) value);
}

72
src/main/java/org/qora/block/Block.java → src/main/java/org/qortal/block/Block.java
View File

@ -1,4 +1,4 @@
package org.qora.block;
package org.qortal.block;
import static java.util.Arrays.stream;
import static java.util.stream.Collectors.toMap;
@ -18,40 +18,40 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.asset.Asset;
import org.qora.at.AT;
import org.qora.block.BlockChain.BlockTimingByHeight;
import org.qora.block.BlockChain.ShareByLevel;
import org.qora.controller.Controller;
import org.qora.crypto.Crypto;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.account.AccountData;
import org.qora.data.account.QortFromQoraData;
import org.qora.data.account.RewardShareData;
import org.qora.data.at.ATData;
import org.qora.data.at.ATStateData;
import org.qora.data.block.BlockData;
import org.qora.data.block.BlockSummaryData;
import org.qora.data.block.BlockTransactionData;
import org.qora.data.network.OnlineAccountData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.ATRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.TransactionRepository;
import org.qora.transaction.AtTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ApprovalStatus;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
import org.qora.transform.Transformer;
import org.qora.transform.block.BlockTransformer;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.utils.Base58;
import org.qora.utils.NTP;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.at.AT;
import org.qortal.block.BlockChain.BlockTimingByHeight;
import org.qortal.block.BlockChain.ShareByLevel;
import org.qortal.controller.Controller;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.account.AccountData;
import org.qortal.data.account.QortFromQoraData;
import org.qortal.data.account.RewardShareData;
import org.qortal.data.at.ATData;
import org.qortal.data.at.ATStateData;
import org.qortal.data.block.BlockData;
import org.qortal.data.block.BlockSummaryData;
import org.qortal.data.block.BlockTransactionData;
import org.qortal.data.network.OnlineAccountData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.ATRepository;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.TransactionRepository;
import org.qortal.transaction.AtTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ApprovalStatus;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transform.TransformationException;
import org.qortal.transform.Transformer;
import org.qortal.transform.block.BlockTransformer;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import org.qortal.utils.NTP;
import org.roaringbitmap.IntIterator;
import com.google.common.primitives.Bytes;
@ -469,7 +469,7 @@ public class Block {
return 1;
else if (this.blockData.getTimestamp() < BlockChain.getInstance().getPowFixReleaseTimestamp())
return 2;
else if (this.blockData.getTimestamp() < BlockChain.getInstance().getQoraV2Timestamp())
else if (this.blockData.getTimestamp() < BlockChain.getInstance().getQortalTimestamp())
return 3;
else
return 4;

44
src/main/java/org/qora/block/BlockChain.java → src/main/java/org/qortal/block/BlockChain.java
View File

@ -1,4 +1,4 @@
package org.qora.block;
package org.qortal.block;
import java.io.File;
import java.io.FileNotFoundException;
@ -26,16 +26,16 @@ import org.apache.logging.log4j.Logger;
import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.qora.controller.Controller;
import org.qora.data.block.BlockData;
import org.qora.network.Network;
import org.qora.repository.BlockRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.utils.NTP;
import org.qora.utils.StringLongMapXmlAdapter;
import org.qortal.controller.Controller;
import org.qortal.data.block.BlockData;
import org.qortal.network.Network;
import org.qortal.repository.BlockRepository;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.settings.Settings;
import org.qortal.utils.NTP;
import org.qortal.utils.StringLongMapXmlAdapter;
/**
* Class representing the blockchain as a whole.
@ -71,15 +71,15 @@ public class BlockChain {
private GenesisBlock.GenesisInfo genesisInfo;
public enum FeatureTrigger {
messageHeight,
atHeight,
assetsTimestamp,
votingTimestamp,
arbitraryTimestamp,
powfixTimestamp,
v2Timestamp,
newAssetPricingTimestamp,
groupApprovalTimestamp;
messageHeight, // block height when MESSAGE transactions are enabled
atHeight, // block height when CIYAM automated transactions are enabled
assetsTimestamp, // timestamp when assets (issue/transfer/payments) are enabled
votingTimestamp, // timestamp when voting is enabled
arbitraryTimestamp, // timestamp when arbitrary transactions are enabled
powfixTimestamp, // timestamp when various legacy fixes come into effect
qortalTimestamp, // timestamp when Qortal changes come into effect
newAssetPricingTimestamp, // timestamp when new asset pricing comes into effect
groupApprovalTimestamp; // timestamp when transaction approval comes into effect
}
/** Map of which blockchain features are enabled when (height/timestamp) */
@ -368,8 +368,8 @@ public class BlockChain {
return featureTriggers.get("arbitraryTimestamp");
}
public long getQoraV2Timestamp() {
return featureTriggers.get("v2Timestamp");
public long getQortalTimestamp() {
return featureTriggers.get("qortalTimestamp");
}
public long getNewAssetPricingTimestamp() {

42
src/main/java/org/qora/block/BlockMinter.java → src/main/java/org/qortal/block/BlockMinter.java
View File

@ -1,4 +1,4 @@
package org.qora.block;
package org.qortal.block;
import java.math.BigInteger;
import java.util.ArrayList;
@ -10,26 +10,26 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.block.Block.ValidationResult;
import org.qora.controller.Controller;
import org.qora.data.account.MintingAccountData;
import org.qora.data.account.RewardShareData;
import org.qora.data.block.BlockData;
import org.qora.data.block.BlockSummaryData;
import org.qora.data.transaction.TransactionData;
import org.qora.network.Network;
import org.qora.network.Peer;
import org.qora.repository.BlockRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.Transaction;
import org.qora.utils.Base58;
import org.qora.utils.NTP;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.block.Block.ValidationResult;
import org.qortal.controller.Controller;
import org.qortal.data.account.MintingAccountData;
import org.qortal.data.account.RewardShareData;
import org.qortal.data.block.BlockData;
import org.qortal.data.block.BlockSummaryData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.network.Network;
import org.qortal.network.Peer;
import org.qortal.repository.BlockRepository;
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.utils.Base58;
import org.qortal.utils.NTP;
// Minting new blocks

34
src/main/java/org/qora/block/GenesisBlock.java → src/main/java/org/qortal/block/GenesisBlock.java
View File

@ -1,4 +1,4 @@
package org.qora.block;
package org.qortal.block;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -14,22 +14,22 @@ import javax.xml.bind.annotation.XmlAccessorType;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.Account;
import org.qora.account.GenesisAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.crypto.Crypto;
import org.qora.data.asset.AssetData;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ApprovalStatus;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import org.qortal.account.Account;
import org.qortal.account.GenesisAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.crypto.Crypto;
import org.qortal.data.asset.AssetData;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ApprovalStatus;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.TransactionTransformer;
import com.google.common.primitives.Bytes;
import com.google.common.primitives.Ints;

18
src/main/java/org/qora/controller/ArbitraryDataManager.java → src/main/java/org/qortal/controller/ArbitraryDataManager.java
View File

@ -1,4 +1,4 @@
package org.qora.controller;
package org.qortal.controller;
import java.util.Arrays;
import java.util.List;
@ -6,14 +6,14 @@ import java.util.Random;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.api.resource.TransactionsResource.ConfirmationStatus;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.ArbitraryTransaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.data.transaction.ArbitraryTransactionData;
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.ArbitraryTransaction;
import org.qortal.transaction.Transaction.TransactionType;
public class ArbitraryDataManager extends Thread {

26
src/main/java/org/qora/controller/AutoUpdate.java → src/main/java/org/qortal/controller/AutoUpdate.java
View File

@ -1,4 +1,4 @@
package org.qora.controller;
package org.qortal.controller;
import java.awt.TrayIcon.MessageType;
import java.io.IOException;
@ -17,18 +17,18 @@ import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.ApplyUpdate;
import org.qora.api.ApiRequest;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.gui.SysTray;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.settings.Settings;
import org.qora.transaction.ArbitraryTransaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.Transformer;
import org.qortal.ApplyUpdate;
import org.qortal.api.ApiRequest;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.gui.SysTray;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.settings.Settings;
import org.qortal.transaction.ArbitraryTransaction;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transform.Transformer;
import com.google.common.hash.HashCode;

120
src/main/java/org/qora/controller/Controller.java → src/main/java/org/qortal/controller/Controller.java
View File

@ -1,4 +1,4 @@
package org.qora.controller;
package org.qortal.controller;
import java.io.IOException;
import java.io.InputStream;
@ -24,64 +24,64 @@ 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.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.api.ApiService;
import org.qora.block.Block;
import org.qora.block.BlockChain;
import org.qora.block.BlockChain.BlockTimingByHeight;
import org.qora.block.BlockMinter;
import org.qora.controller.Synchronizer.SynchronizationResult;
import org.qora.crypto.Crypto;
import org.qora.data.account.MintingAccountData;
import org.qora.data.account.RewardShareData;
import org.qora.data.block.BlockData;
import org.qora.data.block.BlockSummaryData;
import org.qora.data.network.OnlineAccountData;
import org.qora.data.network.PeerChainTipData;
import org.qora.data.network.PeerData;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.ArbitraryTransactionData.DataType;
import org.qora.globalization.Translator;
import org.qora.data.transaction.TransactionData;
import org.qora.gui.Gui;
import org.qora.gui.SysTray;
import org.qora.network.Network;
import org.qora.network.Peer;
import org.qora.network.message.ArbitraryDataMessage;
import org.qora.network.message.BlockMessage;
import org.qora.network.message.BlockSummariesMessage;
import org.qora.network.message.GetArbitraryDataMessage;
import org.qora.network.message.GetBlockMessage;
import org.qora.network.message.GetBlockSummariesMessage;
import org.qora.network.message.GetOnlineAccountsMessage;
import org.qora.network.message.GetPeersMessage;
import org.qora.network.message.GetSignaturesMessage;
import org.qora.network.message.GetSignaturesV2Message;
import org.qora.network.message.GetTransactionMessage;
import org.qora.network.message.GetUnconfirmedTransactionsMessage;
import org.qora.network.message.HeightMessage;
import org.qora.network.message.HeightV2Message;
import org.qora.network.message.Message;
import org.qora.network.message.OnlineAccountsMessage;
import org.qora.network.message.SignaturesMessage;
import org.qora.network.message.TransactionMessage;
import org.qora.network.message.TransactionSignaturesMessage;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.settings.Settings;
import org.qora.transaction.ArbitraryTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.ui.UiService;
import org.qora.utils.Base58;
import org.qora.utils.ByteArray;
import org.qora.utils.NTP;
import org.qora.utils.Triple;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.api.ApiService;
import org.qortal.block.Block;
import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter;
import org.qortal.block.BlockChain.BlockTimingByHeight;
import org.qortal.controller.Synchronizer.SynchronizationResult;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.MintingAccountData;
import org.qortal.data.account.RewardShareData;
import org.qortal.data.block.BlockData;
import org.qortal.data.block.BlockSummaryData;
import org.qortal.data.network.OnlineAccountData;
import org.qortal.data.network.PeerChainTipData;
import org.qortal.data.network.PeerData;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.ArbitraryTransactionData.DataType;
import org.qortal.globalization.Translator;
import org.qortal.gui.Gui;
import org.qortal.gui.SysTray;
import org.qortal.network.Network;
import org.qortal.network.Peer;
import org.qortal.network.message.ArbitraryDataMessage;
import org.qortal.network.message.BlockMessage;
import org.qortal.network.message.BlockSummariesMessage;
import org.qortal.network.message.GetArbitraryDataMessage;
import org.qortal.network.message.GetBlockMessage;
import org.qortal.network.message.GetBlockSummariesMessage;
import org.qortal.network.message.GetOnlineAccountsMessage;
import org.qortal.network.message.GetPeersMessage;
import org.qortal.network.message.GetSignaturesMessage;
import org.qortal.network.message.GetSignaturesV2Message;
import org.qortal.network.message.GetTransactionMessage;
import org.qortal.network.message.GetUnconfirmedTransactionsMessage;
import org.qortal.network.message.HeightMessage;
import org.qortal.network.message.HeightV2Message;
import org.qortal.network.message.Message;
import org.qortal.network.message.OnlineAccountsMessage;
import org.qortal.network.message.SignaturesMessage;
import org.qortal.network.message.TransactionMessage;
import org.qortal.network.message.TransactionSignaturesMessage;
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;
import org.qortal.transaction.ArbitraryTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.ui.UiService;
import org.qortal.utils.Base58;
import org.qortal.utils.ByteArray;
import org.qortal.utils.NTP;
import org.qortal.utils.Triple;
import com.google.common.primitives.Longs;
@ -94,7 +94,7 @@ public class Controller extends Thread {
/** Controller start-up time (ms) taken using <tt>System.currentTimeMillis()</tt>. */
public static final long startTime = System.currentTimeMillis();
public static final String VERSION_PREFIX = "qora-core-";
public static final String VERSION_PREFIX = "qortal-";
private static final Logger LOGGER = LogManager.getLogger(Controller.class);
private static final long MISBEHAVIOUR_COOLOFF = 10 * 60 * 1000L; // ms

46
src/main/java/org/qora/controller/Synchronizer.java → src/main/java/org/qortal/controller/Synchronizer.java
View File

@ -1,4 +1,4 @@
package org.qora.controller;
package org.qortal.controller;
import java.math.BigInteger;
import java.text.DecimalFormat;
@ -10,28 +10,28 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.Account;
import org.qora.block.Block;
import org.qora.block.Block.ValidationResult;
import org.qora.data.block.BlockData;
import org.qora.data.block.BlockSummaryData;
import org.qora.data.network.PeerChainTipData;
import org.qora.data.transaction.TransactionData;
import org.qora.network.Peer;
import org.qora.network.message.BlockMessage;
import org.qora.network.message.BlockSummariesMessage;
import org.qora.network.message.GetBlockMessage;
import org.qora.network.message.GetBlockSummariesMessage;
import org.qora.network.message.GetSignaturesMessage;
import org.qora.network.message.GetSignaturesV2Message;
import org.qora.network.message.Message;
import org.qora.network.message.Message.MessageType;
import org.qora.network.message.SignaturesMessage;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.Transaction;
import org.qora.utils.Base58;
import org.qortal.account.Account;
import org.qortal.block.Block;
import org.qortal.block.Block.ValidationResult;
import org.qortal.data.block.BlockData;
import org.qortal.data.block.BlockSummaryData;
import org.qortal.data.network.PeerChainTipData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.network.Peer;
import org.qortal.network.message.BlockMessage;
import org.qortal.network.message.BlockSummariesMessage;
import org.qortal.network.message.GetBlockMessage;
import org.qortal.network.message.GetBlockSummariesMessage;
import org.qortal.network.message.GetSignaturesMessage;
import org.qortal.network.message.GetSignaturesV2Message;
import org.qortal.network.message.Message;
import org.qortal.network.message.SignaturesMessage;
import org.qortal.network.message.Message.MessageType;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.transaction.Transaction;
import org.qortal.utils.Base58;
public class Synchronizer {

4
src/main/java/org/qora/crosschain/BTC.java → src/main/java/org/qortal/crosschain/BTC.java
View File

@ -1,4 +1,4 @@
package org.qora.crosschain;
package org.qortal.crosschain;
import java.io.ByteArrayInputStream;
import java.io.DataOutputStream;
@ -43,7 +43,7 @@ import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.KeyChainGroup;
import org.bitcoinj.wallet.Wallet;
import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
import org.qora.settings.Settings;
import org.qortal.settings.Settings;
public class BTC {

2
src/main/java/org/qora/crypto/BouncyCastle25519.java → src/main/java/org/qortal/crypto/BouncyCastle25519.java
View File

@ -1,4 +1,4 @@
package org.qora.crypto;
package org.qortal.crypto;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;

2
src/main/java/org/qora/crypto/BrokenMD160.java → src/main/java/org/qortal/crypto/BrokenMD160.java
View File

@ -1,4 +1,4 @@
package org.qora.crypto;
package org.qortal.crypto;
/**
* <b>BROKEN RIPEMD160</b>

2
src/main/java/org/qora/crypto/Credentials.java → src/main/java/org/qortal/crypto/Credentials.java
View File

@ -1,4 +1,4 @@
package org.qora.crypto;
package org.qortal.crypto;
import java.io.File;
import java.io.FileInputStream;

8
src/main/java/org/qora/crypto/Crypto.java → src/main/java/org/qortal/crypto/Crypto.java
View File

@ -1,12 +1,12 @@
package org.qora.crypto;
package org.qortal.crypto;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import org.qora.account.Account;
import org.qora.block.BlockChain;
import org.qora.utils.Base58;
import org.qortal.account.Account;
import org.qortal.block.BlockChain;
import org.qortal.utils.Base58;
import com.google.common.primitives.Bytes;

2
src/main/java/org/qora/crypto/CryptoBytes.java → src/main/java/org/qortal/crypto/CryptoBytes.java
View File

@ -1,4 +1,4 @@
package org.qora.crypto;
package org.qortal.crypto;
//Punisher.NaCl;

2
src/main/java/org/qora/crypto/MemoryPoW.java → src/main/java/org/qortal/crypto/MemoryPoW.java
View File

@ -1,4 +1,4 @@
package org.qora.crypto;
package org.qortal.crypto;
import com.google.common.primitives.Bytes;

2
src/main/java/org/qora/data/PaymentData.java → src/main/java/org/qortal/data/PaymentData.java
View File

@ -1,4 +1,4 @@
package org.qora.data;
package org.qortal.data;
import java.math.BigDecimal;

2
src/main/java/org/qora/data/account/AccountBalanceData.java → src/main/java/org/qortal/data/account/AccountBalanceData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.account;
package org.qortal.data.account;
import java.math.BigDecimal;

4
src/main/java/org/qora/data/account/AccountData.java → src/main/java/org/qortal/data/account/AccountData.java
View File

@ -1,9 +1,9 @@
package org.qora.data.account;
package org.qortal.data.account;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.qora.group.Group;
import org.qortal.group.Group;
// All properties to be converted to JSON via JAXB
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/qora/data/account/MintingAccountData.java → src/main/java/org/qortal/data/account/MintingAccountData.java
View File

@ -1,12 +1,12 @@
package org.qora.data.account;
package org.qortal.data.account;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.qora.account.PrivateKeyAccount;
import org.qora.crypto.Crypto;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.crypto.Crypto;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.AccessMode;

2
src/main/java/org/qora/data/account/QortFromQoraData.java → src/main/java/org/qortal/data/account/QortFromQoraData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.account;
package org.qortal.data.account;
import java.math.BigDecimal;

4
src/main/java/org/qora/data/account/RewardShareData.java → src/main/java/org/qortal/data/account/RewardShareData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.account;
package org.qortal.data.account;
import java.math.BigDecimal;
@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.qora.crypto.Crypto;
import org.qortal.crypto.Crypto;
// All properties to be converted to JSON via JAXB
@XmlAccessorType(XmlAccessType.FIELD)

2
src/main/java/org/qora/data/asset/AssetData.java → src/main/java/org/qortal/data/asset/AssetData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.asset;
package org.qortal.data.asset;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

4
src/main/java/org/qora/data/asset/OrderData.java → src/main/java/org/qortal/data/asset/OrderData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.asset;
package org.qortal.data.asset;
import java.math.BigDecimal;
@ -6,7 +6,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.qora.crypto.Crypto;
import org.qortal.crypto.Crypto;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.AccessMode;

2
src/main/java/org/qora/data/asset/RecentTradeData.java → src/main/java/org/qortal/data/asset/RecentTradeData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.asset;
package org.qortal.data.asset;
import java.math.BigDecimal;

2
src/main/java/org/qora/data/asset/TradeData.java → src/main/java/org/qortal/data/asset/TradeData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.asset;
package org.qortal.data.asset;
import java.math.BigDecimal;

2
src/main/java/org/qora/data/at/ATData.java → src/main/java/org/qortal/data/at/ATData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.at;
package org.qortal.data.at;
import java.math.BigDecimal;

2
src/main/java/org/qora/data/at/ATStateData.java → src/main/java/org/qortal/data/at/ATStateData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.at;
package org.qortal.data.at;
import java.math.BigDecimal;

4
src/main/java/org/qora/data/block/BlockData.java → src/main/java/org/qortal/data/block/BlockData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.block;
package org.qortal.data.block;
import com.google.common.primitives.Bytes;
@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.qora.crypto.Crypto;
import org.qortal.crypto.Crypto;
// All properties to be converted to JSON via JAX-RS
@XmlAccessorType(XmlAccessType.FIELD)

4
src/main/java/org/qora/data/block/BlockSummaryData.java → src/main/java/org/qortal/data/block/BlockSummaryData.java
View File

@ -1,6 +1,6 @@
package org.qora.data.block;
package org.qortal.data.block;
import org.qora.transform.block.BlockTransformer;
import org.qortal.transform.block.BlockTransformer;
public class BlockSummaryData {

2
src/main/java/org/qora/data/block/BlockTransactionData.java → src/main/java/org/qortal/data/block/BlockTransactionData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.block;
package org.qortal.data.block;
public class BlockTransactionData {

2
src/main/java/org/qora/data/group/GroupAdminData.java → src/main/java/org/qortal/data/group/GroupAdminData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/data/group/GroupApprovalData.java → src/main/java/org/qortal/data/group/GroupApprovalData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/org/qora/data/group/GroupBanData.java → src/main/java/org/qortal/data/group/GroupBanData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

4
src/main/java/org/qora/data/group/GroupData.java → src/main/java/org/qortal/data/group/GroupData.java
View File

@ -1,10 +1,10 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlTransient;
import org.qora.group.Group.ApprovalThreshold;
import org.qortal.group.Group.ApprovalThreshold;
import io.swagger.v3.oas.annotations.media.Schema;

2
src/main/java/org/qora/data/group/GroupInviteData.java → src/main/java/org/qortal/data/group/GroupInviteData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/data/group/GroupJoinRequestData.java → src/main/java/org/qortal/data/group/GroupJoinRequestData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/data/group/GroupMemberData.java → src/main/java/org/qortal/data/group/GroupMemberData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.group;
package org.qortal.data.group;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
src/main/java/org/qora/data/naming/NameData.java → src/main/java/org/qortal/data/naming/NameData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.naming;
package org.qortal.data.naming;
import java.math.BigDecimal;

4
src/main/java/org/qora/data/network/OnlineAccountData.java → src/main/java/org/qortal/data/network/OnlineAccountData.java
View File

@ -1,10 +1,10 @@
package org.qora.data.network;
package org.qortal.data.network;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.qora.account.PublicKeyAccount;
import org.qortal.account.PublicKeyAccount;
// All properties to be converted to JSON via JAXB
@XmlAccessorType(XmlAccessType.FIELD)

2
src/main/java/org/qora/data/network/PeerChainTipData.java → src/main/java/org/qortal/data/network/PeerChainTipData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.network;
package org.qortal.data.network;
public class PeerChainTipData {

4
src/main/java/org/qora/data/network/PeerData.java → src/main/java/org/qortal/data/network/PeerData.java
View File

@ -1,11 +1,11 @@
package org.qora.data.network;
package org.qortal.data.network;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.qora.network.PeerAddress;
import org.qortal.network.PeerAddress;
import io.swagger.v3.oas.annotations.media.Schema;

9
src/main/java/org/qora/data/package-info.java → src/main/java/org/qortal/data/package-info.java
View File

@ -1,15 +1,16 @@
// This file (data/package-info.java) is used as a template!
// Only edit org/qortal/data/package-info.java
// Other package-info.java files are generated using above file
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(
type = byte[].class,
value = org.qora.api.Base58TypeAdapter.class
value = org.qortal.api.Base58TypeAdapter.class
), @XmlJavaTypeAdapter(
type = java.math.BigDecimal.class,
value = org.qora.api.BigDecimalTypeAdapter.class
value = org.qortal.api.BigDecimalTypeAdapter.class
)
})
package org.qora.data;
package org.qortal.data;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;

6
src/main/java/org/qora/data/transaction/ATTransactionData.java → src/main/java/org/qortal/data/transaction/ATTransactionData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.transaction;
package org.qortal.data.transaction;
import java.math.BigDecimal;
@ -6,8 +6,8 @@ import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.qora.account.GenesisAccount;
import org.qora.transaction.Transaction.TransactionType;
import org.qortal.account.GenesisAccount;
import org.qortal.transaction.Transaction.TransactionType;
import io.swagger.v3.oas.annotations.media.Schema;

8
src/main/java/org/qora/data/transaction/AccountFlagsTransactionData.java → src/main/java/org/qortal/data/transaction/AccountFlagsTransactionData.java
View File

@ -1,4 +1,4 @@
package org.qora.data.transaction;
package org.qortal.data.transaction;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAccessType;
@ -6,9 +6,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue;
import org.qora.account.GenesisAccount;
import org.qora.block.GenesisBlock;
import org.qora.transaction.Transaction.TransactionType;
import org.qortal.account.GenesisAccount;
import org.qortal.block.GenesisBlock;
import org.qortal.transaction.Transaction.TransactionType;
import io.swagger.v3.oas.annotations.media.Schema;

Some files were not shown because too many files have changed in this diff Show More