From e0e967383760f6a432d766bf4f5e748a3b9daaec Mon Sep 17 00:00:00 2001 From: catbref Date: Tue, 4 Feb 2020 12:11:37 +0000 Subject: [PATCH] Massive refactor to change 'qora' references to 'qortal'. 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! --- log4j2.properties | 2 +- pom.xml | 12 +- .../org/{qora => qortal}/ApplyUpdate.java | 8 +- .../java/org/{qora => qortal}/XorUpdate.java | 4 +- .../org/{qora => qortal}/account/Account.java | 20 +- .../account/GenesisAccount.java | 4 +- .../account/PrivateKeyAccount.java | 8 +- .../account/PublicKeyAccount.java | 8 +- .../org/{qora => qortal}/api/ApiError.java | 2 +- .../{qora => qortal}/api/ApiErrorHandler.java | 4 +- .../{qora => qortal}/api/ApiErrorMessage.java | 2 +- .../org/{qora => qortal}/api/ApiErrors.java | 2 +- .../{qora => qortal}/api/ApiException.java | 2 +- .../api/ApiExceptionFactory.java | 4 +- .../org/{qora => qortal}/api/ApiRequest.java | 2 +- .../org/{qora => qortal}/api/ApiService.java | 10 +- .../api/Base58TypeAdapter.java | 2 +- .../api/BigDecimalTypeAdapter.java | 2 +- .../org/{qora => qortal}/api/Constants.java | 2 +- .../org/{qora => qortal}/api/Security.java | 2 +- .../api/TransactionClassExtractor.java | 2 +- .../api/TransactionCountMapXmlAdapter.java | 4 +- .../api/TranslatableProperty.java | 2 +- .../api/model/ActivitySummary.java | 6 +- .../api/model/AggregatedOrder.java | 4 +- .../api/model/ApiOnlineAccount.java | 2 +- .../api/model/BlockMinterSummary.java | 4 +- .../api/model/ConnectedPeer.java | 10 +- .../api/model/GroupMembers.java | 2 +- .../api/model/NameSummary.java | 4 +- .../{qora => qortal}/api/model/NodeInfo.java | 2 +- .../api/model/RewardShareKeyRequest.java | 2 +- .../model/SimpleTransactionSignRequest.java | 2 +- .../api/model/TradeWithOrderInfo.java | 6 +- .../api/resource/AddressesResource.java | 52 ++-- .../api/resource/AdminResource.java | 46 ++-- .../api/resource/AnnotationPostProcessor.java | 12 +- .../api/resource/ApiDefinition.java | 4 +- .../api/resource/ApiExceptionMapper.java | 4 +- .../api/resource/ArbitraryResource.java | 40 +-- .../api/resource/AssetsResource.java | 72 ++--- .../api/resource/BlocksResource.java | 28 +- .../api/resource/GroupsResource.java | 94 +++---- .../api/resource/NamesResource.java | 50 ++-- .../api/resource/PaymentsResource.java | 28 +- .../api/resource/PeersResource.java | 26 +- .../api/resource/TransactionsResource.java | 40 +-- .../api/resource/UtilsResource.java | 26 +- .../org/{qora => qortal}/asset/Asset.java | 14 +- .../org/{qora => qortal}/asset/Order.java | 66 ++--- .../org/{qora => qortal}/asset/Trade.java | 18 +- src/main/java/org/{qora => qortal}/at/AT.java | 26 +- .../{qora => qortal}/at/BlockchainAPI.java | 34 +-- .../at/QortalATAPI.java} | 56 ++-- .../at/QortalATLogger.java} | 6 +- .../at/QortalFunctionCode.java} | 12 +- .../org/{qora => qortal}/block/Block.java | 72 ++--- .../{qora => qortal}/block/BlockChain.java | 44 +-- .../{qora => qortal}/block/BlockMinter.java | 42 +-- .../{qora => qortal}/block/GenesisBlock.java | 34 +-- .../controller/ArbitraryDataManager.java | 18 +- .../controller/AutoUpdate.java | 26 +- .../controller/Controller.java | 120 ++++---- .../controller/Synchronizer.java | 46 ++-- .../org/{qora => qortal}/crosschain/BTC.java | 4 +- .../crypto/BouncyCastle25519.java | 2 +- .../{qora => qortal}/crypto/BrokenMD160.java | 2 +- .../{qora => qortal}/crypto/Credentials.java | 2 +- .../org/{qora => qortal}/crypto/Crypto.java | 8 +- .../{qora => qortal}/crypto/CryptoBytes.java | 2 +- .../{qora => qortal}/crypto/MemoryPoW.java | 2 +- .../{qora => qortal}/data/PaymentData.java | 2 +- .../data/account/AccountBalanceData.java | 2 +- .../data/account/AccountData.java | 4 +- .../data/account/MintingAccountData.java | 6 +- .../data/account/QortFromQoraData.java | 2 +- .../data/account/RewardShareData.java | 4 +- .../data/asset/AssetData.java | 2 +- .../data/asset/OrderData.java | 4 +- .../data/asset/RecentTradeData.java | 2 +- .../data/asset/TradeData.java | 2 +- .../org/{qora => qortal}/data/at/ATData.java | 2 +- .../{qora => qortal}/data/at/ATStateData.java | 2 +- .../data/block/BlockData.java | 4 +- .../data/block/BlockSummaryData.java | 4 +- .../data/block/BlockTransactionData.java | 2 +- .../data/group/GroupAdminData.java | 2 +- .../data/group/GroupApprovalData.java | 2 +- .../data/group/GroupBanData.java | 2 +- .../data/group/GroupData.java | 4 +- .../data/group/GroupInviteData.java | 2 +- .../data/group/GroupJoinRequestData.java | 2 +- .../data/group/GroupMemberData.java | 2 +- .../data/naming/NameData.java | 2 +- .../data/network/OnlineAccountData.java | 4 +- .../data/network/PeerChainTipData.java | 2 +- .../data/network/PeerData.java | 4 +- .../{qora => qortal}/data/package-info.java | 9 +- .../data/transaction/ATTransactionData.java | 6 +- .../AccountFlagsTransactionData.java | 8 +- .../AccountLevelTransactionData.java | 8 +- .../AddGroupAdminTransactionData.java | 4 +- .../transaction/ArbitraryTransactionData.java | 6 +- .../data/transaction/BaseTransactionData.java | 4 +- .../transaction/BuyNameTransactionData.java | 6 +- .../CancelAssetOrderTransactionData.java | 6 +- .../CancelGroupBanTransactionData.java | 4 +- .../CancelGroupInviteTransactionData.java | 4 +- .../CancelSellNameTransactionData.java | 4 +- .../CreateAssetOrderTransactionData.java | 6 +- .../CreateGroupTransactionData.java | 6 +- .../CreatePollTransactionData.java | 8 +- .../transaction/DeployAtTransactionData.java | 4 +- .../transaction/GenesisTransactionData.java | 8 +- .../GroupApprovalTransactionData.java | 4 +- .../transaction/GroupBanTransactionData.java | 4 +- .../GroupInviteTransactionData.java | 4 +- .../transaction/GroupKickTransactionData.java | 4 +- .../IssueAssetTransactionData.java | 8 +- .../transaction/JoinGroupTransactionData.java | 4 +- .../LeaveGroupTransactionData.java | 4 +- .../transaction/MessageTransactionData.java | 6 +- .../MultiPaymentTransactionData.java | 8 +- .../transaction/PaymentTransactionData.java | 6 +- .../RegisterNameTransactionData.java | 4 +- .../RemoveGroupAdminTransactionData.java | 4 +- .../RewardShareTransactionData.java | 4 +- .../transaction/SellNameTransactionData.java | 6 +- .../transaction/SetGroupTransactionData.java | 4 +- .../data/transaction/TransactionData.java | 8 +- .../TransferAssetTransactionData.java | 4 +- .../TransferPrivsTransactionData.java | 4 +- .../UpdateAssetTransactionData.java | 4 +- .../UpdateGroupTransactionData.java | 6 +- .../UpdateNameTransactionData.java | 4 +- .../VoteOnPollTransactionData.java | 4 +- .../data/voting/PollData.java | 2 +- .../data/voting/PollOptionData.java | 2 +- .../data/voting/VoteOnPollData.java | 2 +- .../globalization/BIP39WordList.java | 2 +- .../globalization/Translator.java | 2 +- .../org/{qora => qortal}/group/Group.java | 48 ++-- .../java/org/{qora => qortal}/gui/Gui.java | 2 +- .../org/{qora => qortal}/gui/SplashFrame.java | 2 +- .../org/{qora => qortal}/gui/SysTray.java | 12 +- .../org/{qora => qortal}/naming/Name.java | 26 +- .../{qora => qortal}/network/Handshake.java | 18 +- .../org/{qora => qortal}/network/Network.java | 54 ++-- .../org/{qora => qortal}/network/Peer.java | 28 +- .../{qora => qortal}/network/PeerAddress.java | 4 +- .../org/{qora => qortal}/network/Proof.java | 4 +- .../network/message/ArbitraryDataMessage.java | 4 +- .../network/message/BlockMessage.java | 16 +- .../message/BlockSummariesMessage.java | 8 +- .../message/GetArbitraryDataMessage.java | 4 +- .../network/message/GetBlockMessage.java | 4 +- .../message/GetBlockSummariesMessage.java | 6 +- .../message/GetOnlineAccountsMessage.java | 6 +- .../network/message/GetPeersMessage.java | 2 +- .../network/message/GetSignaturesMessage.java | 4 +- .../message/GetSignaturesV2Message.java | 6 +- .../message/GetTransactionMessage.java | 4 +- .../GetUnconfirmedTransactionsMessage.java | 2 +- .../network/message/HeightMessage.java | 2 +- .../network/message/HeightV2Message.java | 6 +- .../network/message/Message.java | 6 +- .../message/OnlineAccountsMessage.java | 6 +- .../network/message/PeerIdMessage.java | 4 +- .../network/message/PeerVerifyMessage.java | 4 +- .../network/message/PeersMessage.java | 2 +- .../network/message/PeersV2Message.java | 6 +- .../network/message/PingMessage.java | 2 +- .../network/message/ProofMessage.java | 2 +- .../network/message/SignaturesMessage.java | 4 +- .../network/message/TransactionMessage.java | 8 +- .../message/TransactionSignaturesMessage.java | 4 +- .../message/VerificationCodesMessage.java | 4 +- .../network/message/VersionMessage.java | 4 +- .../org/{qora => qortal}/payment/Payment.java | 28 +- .../repository/ATRepository.java | 6 +- .../repository/AccountRepository.java | 12 +- .../repository/ArbitraryRepository.java | 4 +- .../repository/AssetRepository.java | 10 +- .../repository/BlockRepository.java | 12 +- .../repository/DataException.java | 2 +- .../repository/GroupRepository.java | 14 +- .../repository/NameRepository.java | 4 +- .../repository/NetworkRepository.java | 6 +- .../repository/Repository.java | 2 +- .../repository/RepositoryFactory.java | 2 +- .../repository/RepositoryManager.java | 2 +- .../repository/TransactionRepository.java | 14 +- .../repository/VotingRepository.java | 6 +- .../repository/hsqldb/HSQLDBATRepository.java | 10 +- .../hsqldb/HSQLDBAccountRepository.java | 16 +- .../hsqldb/HSQLDBArbitraryRepository.java | 18 +- .../hsqldb/HSQLDBAssetRepository.java | 14 +- .../hsqldb/HSQLDBBlockRepository.java | 24 +- .../hsqldb/HSQLDBDatabaseUpdates.java | 188 ++++++------- .../hsqldb/HSQLDBGroupRepository.java | 20 +- .../hsqldb/HSQLDBNameRepository.java | 8 +- .../hsqldb/HSQLDBNetworkRepository.java | 10 +- .../repository/hsqldb/HSQLDBRepository.java | 32 +-- .../hsqldb/HSQLDBRepositoryFactory.java | 8 +- .../repository/hsqldb/HSQLDBSaver.java | 2 +- .../hsqldb/HSQLDBVotingRepository.java | 12 +- ...QLDBAccountFlagsTransactionRepository.java | 14 +- ...QLDBAccountLevelTransactionRepository.java | 14 +- ...LDBAddGroupAdminTransactionRepository.java | 14 +- .../HSQLDBArbitraryTransactionRepository.java | 18 +- .../HSQLDBAtTransactionRepository.java | 14 +- .../HSQLDBBuyNameTransactionRepository.java | 14 +- ...CancelAssetOrderTransactionRepository.java | 14 +- ...DBCancelGroupBanTransactionRepository.java | 14 +- ...ancelGroupInviteTransactionRepository.java | 14 +- ...DBCancelSellNameTransactionRepository.java | 14 +- ...CreateAssetOrderTransactionRepository.java | 14 +- ...SQLDBCreateGroupTransactionRepository.java | 16 +- ...HSQLDBCreatePollTransactionRepository.java | 16 +- .../HSQLDBDeployAtTransactionRepository.java | 14 +- .../HSQLDBGenesisTransactionRepository.java | 14 +- ...LDBGroupApprovalTransactionRepository.java | 14 +- .../HSQLDBGroupBanTransactionRepository.java | 14 +- ...SQLDBGroupInviteTransactionRepository.java | 14 +- .../HSQLDBGroupKickTransactionRepository.java | 14 +- ...HSQLDBIssueAssetTransactionRepository.java | 14 +- .../HSQLDBJoinGroupTransactionRepository.java | 14 +- ...HSQLDBLeaveGroupTransactionRepository.java | 14 +- .../HSQLDBMessageTransactionRepository.java | 14 +- ...QLDBMultiPaymentTransactionRepository.java | 16 +- .../HSQLDBPaymentTransactionRepository.java | 14 +- ...QLDBRegisterNameTransactionRepository.java | 14 +- ...RemoveGroupAdminTransactionRepository.java | 14 +- ...SQLDBRewardShareTransactionRepository.java | 14 +- .../HSQLDBSellNameTransactionRepository.java | 14 +- .../HSQLDBSetGroupTransactionRepository.java | 14 +- .../HSQLDBTransactionRepository.java | 34 +-- ...LDBTransferAssetTransactionRepository.java | 14 +- ...LDBTransferPrivsTransactionRepository.java | 14 +- ...SQLDBUpdateAssetTransactionRepository.java | 14 +- ...SQLDBUpdateGroupTransactionRepository.java | 16 +- ...HSQLDBUpdateNameTransactionRepository.java | 14 +- ...HSQLDBVoteOnPollTransactionRepository.java | 14 +- .../{qora => qortal}/settings/Settings.java | 4 +- .../transaction/AccountFlagsTransaction.java | 16 +- .../transaction/AccountLevelTransaction.java | 18 +- .../transaction/AddGroupAdminTransaction.java | 20 +- .../transaction/ArbitraryTransaction.java | 24 +- .../transaction/AtTransaction.java | 28 +- .../transaction/BuyNameTransaction.java | 20 +- .../CancelAssetOrderTransaction.java | 26 +- .../CancelGroupBanTransaction.java | 22 +- .../CancelGroupInviteTransaction.java | 22 +- .../CancelSellNameTransaction.java | 20 +- .../CreateAssetOrderTransaction.java | 50 ++-- .../transaction/CreateGroupTransaction.java | 18 +- .../transaction/CreatePollTransaction.java | 24 +- .../transaction/DeployAtTransaction.java | 28 +- .../transaction/GenesisTransaction.java | 20 +- .../transaction/GroupApprovalTransaction.java | 16 +- .../transaction/GroupBanTransaction.java | 22 +- .../transaction/GroupInviteTransaction.java | 20 +- .../transaction/GroupKickTransaction.java | 24 +- .../transaction/IssueAssetTransaction.java | 26 +- .../transaction/JoinGroupTransaction.java | 18 +- .../transaction/LeaveGroupTransaction.java | 20 +- .../transaction/MessageTransaction.java | 28 +- .../transaction/MultiPaymentTransaction.java | 24 +- .../transaction/PaymentTransaction.java | 26 +- .../transaction/RegisterNameTransaction.java | 22 +- .../RemoveGroupAdminTransaction.java | 22 +- .../transaction/RewardShareTransaction.java | 24 +- .../transaction/SellNameTransaction.java | 20 +- .../transaction/SetGroupTransaction.java | 16 +- .../transaction/Transaction.java | 48 ++-- .../transaction/TransferAssetTransaction.java | 32 +-- .../transaction/TransferPrivsTransaction.java | 22 +- .../transaction/UpdateAssetTransaction.java | 24 +- .../transaction/UpdateGroupTransaction.java | 22 +- .../transaction/UpdateNameTransaction.java | 22 +- .../transaction/VoteOnPollTransaction.java | 28 +- .../transform/PaymentTransformer.java | 6 +- .../transform/TransformationException.java | 2 +- .../transform/Transformer.java | 2 +- .../transform/block/BlockTransformer.java | 32 +-- .../AccountFlagsTransactionTransformer.java | 18 +- .../AccountLevelTransactionTransformer.java | 18 +- .../AddGroupAdminTransactionTransformer.java | 18 +- .../ArbitraryTransactionTransformer.java | 32 +-- .../transaction/AtTransactionTransformer.java | 10 +- .../BuyNameTransactionTransformer.java | 20 +- ...ancelAssetOrderTransactionTransformer.java | 18 +- .../CancelGroupBanTransactionTransformer.java | 18 +- ...ncelGroupInviteTransactionTransformer.java | 18 +- .../CancelSellNameTransactionTransformer.java | 20 +- ...reateAssetOrderTransactionTransformer.java | 20 +- .../CreateGroupTransactionTransformer.java | 22 +- .../CreatePollTransactionTransformer.java | 30 +- .../DeployAtTransactionTransformer.java | 26 +- .../GenesisTransactionTransformer.java | 30 +- .../GroupApprovalTransactionTransformer.java | 18 +- .../GroupBanTransactionTransformer.java | 20 +- .../GroupInviteTransactionTransformer.java | 18 +- .../GroupKickTransactionTransformer.java | 20 +- .../IssueAssetTransactionTransformer.java | 28 +- .../JoinGroupTransactionTransformer.java | 18 +- .../LeaveGroupTransactionTransformer.java | 18 +- .../MessageTransactionTransformer.java | 24 +- .../MultiPaymentTransactionTransformer.java | 24 +- .../PaymentTransactionTransformer.java | 18 +- .../RegisterNameTransactionTransformer.java | 20 +- ...emoveGroupAdminTransactionTransformer.java | 18 +- .../RewardShareTransactionTransformer.java | 18 +- .../SellNameTransactionTransformer.java | 20 +- .../SetGroupTransactionTransformer.java | 18 +- .../transaction/TransactionTransformer.java | 20 +- .../TransferAssetTransactionTransformer.java | 18 +- .../TransferPrivsTransactionTransformer.java | 18 +- .../UpdateAssetTransactionTransformer.java | 20 +- .../UpdateGroupTransactionTransformer.java | 22 +- .../UpdateNameTransactionTransformer.java | 20 +- .../VoteOnPollTransactionTransformer.java | 20 +- .../ui/DownloadResourceService.java | 2 +- .../org/{qora => qortal}/ui/UiService.java | 4 +- .../org/{qora => qortal}/utils/BIP39.java | 4 +- .../org/{qora => qortal}/utils/Base58.java | 2 +- .../{qora => qortal}/utils/BitTwiddling.java | 2 +- .../org/{qora => qortal}/utils/ByteArray.java | 2 +- .../utils/ExecuteProduceConsume.java | 2 +- .../java/org/{qora => qortal}/utils/NTP.java | 4 +- .../java/org/{qora => qortal}/utils/Pair.java | 2 +- .../{qora => qortal}/utils/Serialization.java | 6 +- .../utils/StringLongMapXmlAdapter.java | 2 +- .../org/{qora => qortal}/utils/Triple.java | 2 +- .../org/{qora => qortal}/utils/URLViewer.java | 2 +- .../org/{qora => qortal}/voting/Poll.java | 10 +- src/main/resources/blockchain.json | 260 ++++++++++++++---- .../test/AccountBalanceTests.java | 38 +-- .../org/{qora => qortal}/test/BlockTests.java | 40 +-- .../{qora => qortal}/test/ByteArrayTests.java | 4 +- .../test/ChainWeightTests.java | 22 +- .../test/CompatibilityTests.java | 20 +- .../{qora => qortal}/test/CryptoTests.java | 14 +- .../org/{qora => qortal}/test/EPCTests.java | 4 +- .../org/{qora => qortal}/test/GuiTests.java | 6 +- .../{qora => qortal}/test/MemoryPoWTests.java | 4 +- .../test/RepositoryTests.java | 18 +- .../test/SerializationTests.java | 24 +- .../test/TransferPrivsTests.java | 34 +-- .../test/api/AddressesApiTests.java | 6 +- .../test/api/AdminApiTests.java | 6 +- .../test/api/AssetsApiTests.java | 14 +- .../test/api/BlockApiTests.java | 6 +- .../test/api/GroupApiTests.java | 6 +- .../test/api/TransactionsApiTests.java | 10 +- .../test/apps/BTCACCTTests.java | 16 +- .../test/apps/DecodeOnlineAccounts.java | 24 +- .../{qora => qortal}/test/apps/NTPTests.java | 2 +- .../{qora => qortal}/test/apps/ProxyTest.java | 5 +- .../test/apps/RewardShareKeys.java | 8 +- .../test/apps/SettingsTests.java | 8 +- .../test/apps/SyncReport.java | 2 +- .../{qora => qortal}/test/apps/VanityGen.java | 10 +- .../test/apps/WindowsTimeServiceTests.java | 2 +- .../test/apps/brokenmd160.java | 4 +- .../{qora => qortal}/test/apps/orphan.java | 16 +- .../test/assets/CancellingTests.java | 19 +- .../test/assets/GranularityTests.java | 8 +- .../test/assets/MixedPricingTests.java | 6 +- .../test/assets/NewTradingTests.java | 17 +- .../test/assets/OldTradingTests.java | 17 +- .../test/common/AccountUtils.java | 18 +- .../test/common/ApiCommon.java | 4 +- .../test/common/AssetUtils.java | 33 +-- .../test/common/BlockUtils.java | 16 +- .../{qora => qortal}/test/common/Common.java | 26 +- .../test/common/FakePeer.java | 4 +- .../test/common/GroupUtils.java | 24 +- .../test/common/ObjectUtils.java | 2 +- .../test/common/PeerMessage.java | 6 +- .../test/common/TestAccount.java | 8 +- .../test/common/TransactionUtils.java | 18 +- .../AccountFlagsTestTransaction.java | 12 +- .../AccountLevelTestTransaction.java | 12 +- .../AddGroupAdminTestTransaction.java | 12 +- .../transaction/ArbitraryTestTransaction.java | 18 +- .../common/transaction/AtTestTransaction.java | 16 +- .../transaction/BuyNameTestTransaction.java | 12 +- .../CancelAssetOrderTestTransaction.java | 12 +- .../CancelGroupBanTestTransaction.java | 12 +- .../CancelGroupInviteTestTransaction.java | 12 +- .../CancelSellNameTestTransaction.java | 12 +- .../CreateAssetOrderTestTransaction.java | 14 +- .../CreateGroupTestTransaction.java | 14 +- .../CreatePollTestTransaction.java | 14 +- .../transaction/DeployAtTestTransaction.java | 14 +- .../transaction/GenesisTestTransaction.java | 12 +- .../GroupApprovalTestTransaction.java | 12 +- .../transaction/GroupBanTestTransaction.java | 12 +- .../GroupInviteTestTransaction.java | 12 +- .../transaction/GroupKickTestTransaction.java | 12 +- .../IssueAssetTestTransaction.java | 14 +- .../transaction/JoinGroupTestTransaction.java | 12 +- .../LeaveGroupTestTransaction.java | 12 +- .../transaction/MessageTestTransaction.java | 14 +- .../MultiPaymentTestTransaction.java | 16 +- .../transaction/PaymentTestTransaction.java | 12 +- .../RegisterNameTestTransaction.java | 12 +- .../RemoveGroupAdminTestTransaction.java | 12 +- .../RewardShareTestTransaction.java | 12 +- .../transaction/SellNameTestTransaction.java | 12 +- .../transaction/SetGroupTestTransaction.java | 12 +- .../common/transaction/TestTransaction.java | 12 +- .../TransferAssetTestTransaction.java | 14 +- .../TransferPrivsTestTransaction.java | 12 +- .../UpdateAssetTestTransaction.java | 14 +- .../UpdateGroupTestTransaction.java | 14 +- .../UpdateNameTestTransaction.java | 12 +- .../VoteOnPollTestTransaction.java | 12 +- .../test/group/GroupApprovalTests.java | 38 +-- .../test/minting/RewardShareTests.java | 28 +- .../test/minting/RewardTests.java | 28 +- .../test/naming/BuySellTests.java | 28 +- src/test/resources/demo-node-ui.html | 4 +- src/test/resources/test-chain-v1.json | 2 +- src/test/resources/test-chain-v2-minting.json | 2 +- .../resources/test-chain-v2-qora-holder.json | 2 +- src/test/resources/test-chain-v2.json | 2 +- 428 files changed, 3175 insertions(+), 3011 deletions(-) rename src/main/java/org/{qora => qortal}/ApplyUpdate.java (97%) rename src/main/java/org/{qora => qortal}/XorUpdate.java (95%) rename src/main/java/org/{qora => qortal}/account/Account.java (95%) rename src/main/java/org/{qora => qortal}/account/GenesisAccount.java (81%) rename src/main/java/org/{qora => qortal}/account/PrivateKeyAccount.java (94%) rename src/main/java/org/{qora => qortal}/account/PublicKeyAccount.java (90%) rename src/main/java/org/{qora => qortal}/api/ApiError.java (99%) rename src/main/java/org/{qora => qortal}/api/ApiErrorHandler.java (95%) rename src/main/java/org/{qora => qortal}/api/ApiErrorMessage.java (94%) rename src/main/java/org/{qora => qortal}/api/ApiErrors.java (95%) rename src/main/java/org/{qora => qortal}/api/ApiException.java (97%) rename src/main/java/org/{qora => qortal}/api/ApiExceptionFactory.java (89%) rename src/main/java/org/{qora => qortal}/api/ApiRequest.java (99%) rename src/main/java/org/{qora => qortal}/api/ApiService.java (95%) rename src/main/java/org/{qora => qortal}/api/Base58TypeAdapter.java (94%) rename src/main/java/org/{qora => qortal}/api/BigDecimalTypeAdapter.java (95%) rename src/main/java/org/{qora => qortal}/api/Constants.java (99%) rename src/main/java/org/{qora => qortal}/api/Security.java (96%) rename src/main/java/org/{qora => qortal}/api/TransactionClassExtractor.java (94%) rename src/main/java/org/{qora => qortal}/api/TransactionCountMapXmlAdapter.java (94%) rename src/main/java/org/{qora => qortal}/api/TranslatableProperty.java (86%) rename src/main/java/org/{qora => qortal}/api/model/ActivitySummary.java (82%) rename src/main/java/org/{qora => qortal}/api/model/AggregatedOrder.java (94%) rename src/main/java/org/{qora => qortal}/api/model/ApiOnlineAccount.java (97%) rename src/main/java/org/{qora => qortal}/api/model/BlockMinterSummary.java (94%) rename src/main/java/org/{qora => qortal}/api/model/ConnectedPeer.java (89%) rename src/main/java/org/{qora => qortal}/api/model/GroupMembers.java (97%) rename src/main/java/org/{qora => qortal}/api/model/NameSummary.java (88%) rename src/main/java/org/{qora => qortal}/api/model/NodeInfo.java (90%) rename src/main/java/org/{qora => qortal}/api/model/RewardShareKeyRequest.java (93%) rename src/main/java/org/{qora => qortal}/api/model/SimpleTransactionSignRequest.java (94%) rename src/main/java/org/{qora => qortal}/api/model/TradeWithOrderInfo.java (91%) rename src/main/java/org/{qora => qortal}/api/resource/AddressesResource.java (92%) rename src/main/java/org/{qora => qortal}/api/resource/AdminResource.java (94%) rename src/main/java/org/{qora => qortal}/api/resource/AnnotationPostProcessor.java (95%) rename src/main/java/org/{qora => qortal}/api/resource/ApiDefinition.java (85%) rename src/main/java/org/{qora => qortal}/api/resource/ApiExceptionMapper.java (94%) rename src/main/java/org/{qora => qortal}/api/resource/ArbitraryResource.java (87%) rename src/main/java/org/{qora => qortal}/api/resource/AssetsResource.java (94%) rename src/main/java/org/{qora => qortal}/api/resource/BlocksResource.java (96%) rename src/main/java/org/{qora => qortal}/api/resource/GroupsResource.java (92%) rename src/main/java/org/{qora => qortal}/api/resource/NamesResource.java (90%) rename src/main/java/org/{qora => qortal}/api/resource/PaymentsResource.java (77%) rename src/main/java/org/{qora => qortal}/api/resource/PeersResource.java (92%) rename src/main/java/org/{qora => qortal}/api/resource/TransactionsResource.java (95%) rename src/main/java/org/{qora => qortal}/api/resource/UtilsResource.java (95%) rename src/main/java/org/{qora => qortal}/asset/Asset.java (94%) rename src/main/java/org/{qora => qortal}/asset/Order.java (91%) rename src/main/java/org/{qora => qortal}/asset/Trade.java (93%) rename src/main/java/org/{qora => qortal}/at/AT.java (90%) rename src/main/java/org/{qora => qortal}/at/BlockchainAPI.java (80%) rename src/main/java/org/{qora/at/QoraATAPI.java => qortal/at/QortalATAPI.java} (90%) rename src/main/java/org/{qora/at/QoraATLogger.java => qortal/at/QortalATLogger.java} (70%) rename src/main/java/org/{qora/at/QoraFunctionCode.java => qortal/at/QortalFunctionCode.java} (91%) rename src/main/java/org/{qora => qortal}/block/Block.java (97%) rename src/main/java/org/{qora => qortal}/block/BlockChain.java (93%) rename src/main/java/org/{qora => qortal}/block/BlockMinter.java (93%) rename src/main/java/org/{qora => qortal}/block/GenesisBlock.java (94%) rename src/main/java/org/{qora => qortal}/controller/ArbitraryDataManager.java (84%) rename src/main/java/org/{qora => qortal}/controller/AutoUpdate.java (93%) rename src/main/java/org/{qora => qortal}/controller/Controller.java (95%) rename src/main/java/org/{qora => qortal}/controller/Synchronizer.java (94%) rename src/main/java/org/{qora => qortal}/crosschain/BTC.java (99%) rename src/main/java/org/{qora => qortal}/crypto/BouncyCastle25519.java (99%) rename src/main/java/org/{qora => qortal}/crypto/BrokenMD160.java (99%) rename src/main/java/org/{qora => qortal}/crypto/Credentials.java (98%) rename src/main/java/org/{qora => qortal}/crypto/Crypto.java (97%) rename src/main/java/org/{qora => qortal}/crypto/CryptoBytes.java (97%) rename src/main/java/org/{qora => qortal}/crypto/MemoryPoW.java (98%) rename src/main/java/org/{qora => qortal}/data/PaymentData.java (96%) rename src/main/java/org/{qora => qortal}/data/account/AccountBalanceData.java (97%) rename src/main/java/org/{qora => qortal}/data/account/AccountData.java (97%) rename src/main/java/org/{qora => qortal}/data/account/MintingAccountData.java (93%) rename src/main/java/org/{qora => qortal}/data/account/QortFromQoraData.java (97%) rename src/main/java/org/{qora => qortal}/data/account/RewardShareData.java (95%) rename src/main/java/org/{qora => qortal}/data/asset/AssetData.java (98%) rename src/main/java/org/{qora => qortal}/data/asset/OrderData.java (98%) rename src/main/java/org/{qora => qortal}/data/asset/RecentTradeData.java (97%) rename src/main/java/org/{qora => qortal}/data/asset/TradeData.java (99%) rename src/main/java/org/{qora => qortal}/data/at/ATData.java (99%) rename src/main/java/org/{qora => qortal}/data/at/ATStateData.java (98%) rename src/main/java/org/{qora => qortal}/data/block/BlockData.java (98%) rename src/main/java/org/{qora => qortal}/data/block/BlockSummaryData.java (94%) rename src/main/java/org/{qora => qortal}/data/block/BlockTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/group/GroupAdminData.java (97%) rename src/main/java/org/{qora => qortal}/data/group/GroupApprovalData.java (86%) rename src/main/java/org/{qora => qortal}/data/group/GroupBanData.java (98%) rename src/main/java/org/{qora => qortal}/data/group/GroupData.java (97%) rename src/main/java/org/{qora => qortal}/data/group/GroupInviteData.java (97%) rename src/main/java/org/{qora => qortal}/data/group/GroupJoinRequestData.java (97%) rename src/main/java/org/{qora => qortal}/data/group/GroupMemberData.java (97%) rename src/main/java/org/{qora => qortal}/data/naming/NameData.java (98%) rename src/main/java/org/{qora => qortal}/data/network/OnlineAccountData.java (92%) rename src/main/java/org/{qora => qortal}/data/network/PeerChainTipData.java (96%) rename src/main/java/org/{qora => qortal}/data/network/PeerData.java (96%) rename src/main/java/org/{qora => qortal}/data/package-info.java (52%) rename src/main/java/org/{qora => qortal}/data/transaction/ATTransactionData.java (91%) rename src/main/java/org/{qora => qortal}/data/transaction/AccountFlagsTransactionData.java (94%) rename src/main/java/org/{qora => qortal}/data/transaction/AccountLevelTransactionData.java (92%) rename src/main/java/org/{qora => qortal}/data/transaction/AddGroupAdminTransactionData.java (94%) rename src/main/java/org/{qora => qortal}/data/transaction/ArbitraryTransactionData.java (94%) rename src/main/java/org/{qora => qortal}/data/transaction/BaseTransactionData.java (90%) rename src/main/java/org/{qora => qortal}/data/transaction/BuyNameTransactionData.java (94%) rename src/main/java/org/{qora => qortal}/data/transaction/CancelAssetOrderTransactionData.java (91%) rename src/main/java/org/{qora => qortal}/data/transaction/CancelGroupBanTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/CancelGroupInviteTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/CancelSellNameTransactionData.java (92%) rename src/main/java/org/{qora => qortal}/data/transaction/CreateAssetOrderTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/CreateGroupTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/CreatePollTransactionData.java (87%) rename src/main/java/org/{qora => qortal}/data/transaction/DeployAtTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/GenesisTransactionData.java (90%) rename src/main/java/org/{qora => qortal}/data/transaction/GroupApprovalTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/GroupBanTransactionData.java (97%) rename src/main/java/org/{qora => qortal}/data/transaction/GroupInviteTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/GroupKickTransactionData.java (97%) rename src/main/java/org/{qora => qortal}/data/transaction/IssueAssetTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/JoinGroupTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/LeaveGroupTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/MessageTransactionData.java (93%) rename src/main/java/org/{qora => qortal}/data/transaction/MultiPaymentTransactionData.java (87%) rename src/main/java/org/{qora => qortal}/data/transaction/PaymentTransactionData.java (91%) rename src/main/java/org/{qora => qortal}/data/transaction/RegisterNameTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/RemoveGroupAdminTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/RewardShareTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/SellNameTransactionData.java (91%) rename src/main/java/org/{qora => qortal}/data/transaction/SetGroupTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/TransactionData.java (97%) rename src/main/java/org/{qora => qortal}/data/transaction/TransferAssetTransactionData.java (95%) rename src/main/java/org/{qora => qortal}/data/transaction/TransferPrivsTransactionData.java (97%) rename src/main/java/org/{qora => qortal}/data/transaction/UpdateAssetTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/UpdateGroupTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/UpdateNameTransactionData.java (96%) rename src/main/java/org/{qora => qortal}/data/transaction/VoteOnPollTransactionData.java (94%) rename src/main/java/org/{qora => qortal}/data/voting/PollData.java (97%) rename src/main/java/org/{qora => qortal}/data/voting/PollOptionData.java (93%) rename src/main/java/org/{qora => qortal}/data/voting/VoteOnPollData.java (94%) rename src/main/java/org/{qora => qortal}/globalization/BIP39WordList.java (97%) rename src/main/java/org/{qora => qortal}/globalization/Translator.java (98%) rename src/main/java/org/{qora => qortal}/group/Group.java (96%) rename src/main/java/org/{qora => qortal}/gui/Gui.java (99%) rename src/main/java/org/{qora => qortal}/gui/SplashFrame.java (98%) rename src/main/java/org/{qora => qortal}/gui/SysTray.java (96%) rename src/main/java/org/{qora => qortal}/naming/Name.java (92%) rename src/main/java/org/{qora => qortal}/network/Handshake.java (95%) rename src/main/java/org/{qora => qortal}/network/Network.java (96%) rename src/main/java/org/{qora => qortal}/network/Peer.java (95%) rename src/main/java/org/{qora => qortal}/network/PeerAddress.java (98%) rename src/main/java/org/{qora => qortal}/network/Proof.java (97%) rename src/main/java/org/{qora => qortal}/network/message/ArbitraryDataMessage.java (95%) rename src/main/java/org/{qora => qortal}/network/message/BlockMessage.java (86%) rename src/main/java/org/{qora => qortal}/network/message/BlockSummariesMessage.java (92%) rename src/main/java/org/{qora => qortal}/network/message/GetArbitraryDataMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/GetBlockMessage.java (92%) rename src/main/java/org/{qora => qortal}/network/message/GetBlockSummariesMessage.java (92%) rename src/main/java/org/{qora => qortal}/network/message/GetOnlineAccountsMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/GetPeersMessage.java (92%) rename src/main/java/org/{qora => qortal}/network/message/GetSignaturesMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/GetSignaturesV2Message.java (92%) rename src/main/java/org/{qora => qortal}/network/message/GetTransactionMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/GetUnconfirmedTransactionsMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/HeightMessage.java (96%) rename src/main/java/org/{qora => qortal}/network/message/HeightV2Message.java (93%) rename src/main/java/org/{qora => qortal}/network/message/Message.java (98%) rename src/main/java/org/{qora => qortal}/network/message/OnlineAccountsMessage.java (94%) rename src/main/java/org/{qora => qortal}/network/message/PeerIdMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/PeerVerifyMessage.java (93%) rename src/main/java/org/{qora => qortal}/network/message/PeersMessage.java (98%) rename src/main/java/org/{qora => qortal}/network/message/PeersV2Message.java (95%) rename src/main/java/org/{qora => qortal}/network/message/PingMessage.java (92%) rename src/main/java/org/{qora => qortal}/network/message/ProofMessage.java (97%) rename src/main/java/org/{qora => qortal}/network/message/SignaturesMessage.java (94%) rename src/main/java/org/{qora => qortal}/network/message/TransactionMessage.java (83%) rename src/main/java/org/{qora => qortal}/network/message/TransactionSignaturesMessage.java (95%) rename src/main/java/org/{qora => qortal}/network/message/VerificationCodesMessage.java (96%) rename src/main/java/org/{qora => qortal}/network/message/VersionMessage.java (95%) rename src/main/java/org/{qora => qortal}/payment/Payment.java (94%) rename src/main/java/org/{qora => qortal}/repository/ATRepository.java (96%) rename src/main/java/org/{qora => qortal}/repository/AccountRepository.java (95%) rename src/main/java/org/{qora => qortal}/repository/ArbitraryRepository.java (79%) rename src/main/java/org/{qora => qortal}/repository/AssetRepository.java (94%) rename src/main/java/org/{qora => qortal}/repository/BlockRepository.java (95%) rename src/main/java/org/{qora => qortal}/repository/DataException.java (92%) rename src/main/java/org/{qora => qortal}/repository/GroupRepository.java (94%) rename src/main/java/org/{qora => qortal}/repository/NameRepository.java (93%) rename src/main/java/org/{qora => qortal}/repository/NetworkRepository.java (73%) rename src/main/java/org/{qora => qortal}/repository/Repository.java (96%) rename src/main/java/org/{qora => qortal}/repository/RepositoryFactory.java (89%) rename src/main/java/org/{qora => qortal}/repository/RepositoryManager.java (97%) rename src/main/java/org/{qora => qortal}/repository/TransactionRepository.java (95%) rename src/main/java/org/{qora => qortal}/repository/VotingRepository.java (85%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBATRepository.java (97%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBAccountRepository.java (98%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBArbitraryRepository.java (92%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBAssetRepository.java (98%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBBlockRepository.java (96%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBDatabaseUpdates.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBGroupRepository.java (98%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBNameRepository.java (98%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBNetworkRepository.java (93%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBRepository.java (96%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBRepositoryFactory.java (96%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBSaver.java (99%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/HSQLDBVotingRepository.java (95%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java (85%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java (80%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java (82%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java (80%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java (88%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java (87%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java (85%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java (87%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java (82%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java (82%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java (81%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java (82%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBTransactionRepository.java (97%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java (88%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java (86%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java (83%) rename src/main/java/org/{qora => qortal}/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java (84%) rename src/main/java/org/{qora => qortal}/settings/Settings.java (99%) rename src/main/java/org/{qora => qortal}/transaction/AccountFlagsTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transaction/AccountLevelTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/AddGroupAdminTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/ArbitraryTransaction.java (92%) rename src/main/java/org/{qora => qortal}/transaction/AtTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transaction/BuyNameTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/CancelAssetOrderTransaction.java (84%) rename src/main/java/org/{qora => qortal}/transaction/CancelGroupBanTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/CancelGroupInviteTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/CancelSellNameTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/CreateAssetOrderTransaction.java (82%) rename src/main/java/org/{qora => qortal}/transaction/CreateGroupTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transaction/CreatePollTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/DeployAtTransaction.java (93%) rename src/main/java/org/{qora => qortal}/transaction/GenesisTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/GroupApprovalTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transaction/GroupBanTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/GroupInviteTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/GroupKickTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/IssueAssetTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/JoinGroupTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/LeaveGroupTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/MessageTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/MultiPaymentTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transaction/PaymentTransaction.java (86%) rename src/main/java/org/{qora => qortal}/transaction/RegisterNameTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/RemoveGroupAdminTransaction.java (88%) rename src/main/java/org/{qora => qortal}/transaction/RewardShareTransaction.java (95%) rename src/main/java/org/{qora => qortal}/transaction/SellNameTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/SetGroupTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/Transaction.java (96%) rename src/main/java/org/{qora => qortal}/transaction/TransferAssetTransaction.java (89%) rename src/main/java/org/{qora => qortal}/transaction/TransferPrivsTransaction.java (95%) rename src/main/java/org/{qora => qortal}/transaction/UpdateAssetTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/UpdateGroupTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/UpdateNameTransaction.java (90%) rename src/main/java/org/{qora => qortal}/transaction/VoteOnPollTransaction.java (91%) rename src/main/java/org/{qora => qortal}/transform/PaymentTransformer.java (95%) rename src/main/java/org/{qora => qortal}/transform/TransformationException.java (93%) rename src/main/java/org/{qora => qortal}/transform/Transformer.java (95%) rename src/main/java/org/{qora => qortal}/transform/block/BlockTransformer.java (96%) rename src/main/java/org/{qora => qortal}/transform/transaction/AccountFlagsTransactionTransformer.java (88%) rename src/main/java/org/{qora => qortal}/transform/transaction/AccountLevelTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/AddGroupAdminTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/ArbitraryTransactionTransformer.java (90%) rename src/main/java/org/{qora => qortal}/transform/transaction/AtTransactionTransformer.java (91%) rename src/main/java/org/{qora => qortal}/transform/transaction/BuyNameTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/CancelAssetOrderTransactionTransformer.java (85%) rename src/main/java/org/{qora => qortal}/transform/transaction/CancelGroupBanTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/CancelGroupInviteTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/CancelSellNameTransactionTransformer.java (85%) rename src/main/java/org/{qora => qortal}/transform/transaction/CreateAssetOrderTransactionTransformer.java (91%) rename src/main/java/org/{qora => qortal}/transform/transaction/CreateGroupTransactionTransformer.java (90%) rename src/main/java/org/{qora => qortal}/transform/transaction/CreatePollTransactionTransformer.java (90%) rename src/main/java/org/{qora => qortal}/transform/transaction/DeployAtTransactionTransformer.java (92%) rename src/main/java/org/{qora => qortal}/transform/transaction/GenesisTransactionTransformer.java (81%) rename src/main/java/org/{qora => qortal}/transform/transaction/GroupApprovalTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/GroupBanTransactionTransformer.java (88%) rename src/main/java/org/{qora => qortal}/transform/transaction/GroupInviteTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/GroupKickTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/IssueAssetTransactionTransformer.java (91%) rename src/main/java/org/{qora => qortal}/transform/transaction/JoinGroupTransactionTransformer.java (84%) rename src/main/java/org/{qora => qortal}/transform/transaction/LeaveGroupTransactionTransformer.java (84%) rename src/main/java/org/{qora => qortal}/transform/transaction/MessageTransactionTransformer.java (89%) rename src/main/java/org/{qora => qortal}/transform/transaction/MultiPaymentTransactionTransformer.java (88%) rename src/main/java/org/{qora => qortal}/transform/transaction/PaymentTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/RegisterNameTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/RemoveGroupAdminTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/RewardShareTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/SellNameTransactionTransformer.java (86%) rename src/main/java/org/{qora => qortal}/transform/transaction/SetGroupTransactionTransformer.java (85%) rename src/main/java/org/{qora => qortal}/transform/transaction/TransactionTransformer.java (96%) rename src/main/java/org/{qora => qortal}/transform/transaction/TransferAssetTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/TransferPrivsTransactionTransformer.java (85%) rename src/main/java/org/{qora => qortal}/transform/transaction/UpdateAssetTransactionTransformer.java (89%) rename src/main/java/org/{qora => qortal}/transform/transaction/UpdateGroupTransactionTransformer.java (90%) rename src/main/java/org/{qora => qortal}/transform/transaction/UpdateNameTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/transform/transaction/VoteOnPollTransactionTransformer.java (87%) rename src/main/java/org/{qora => qortal}/ui/DownloadResourceService.java (98%) rename src/main/java/org/{qora => qortal}/ui/UiService.java (98%) rename src/main/java/org/{qora => qortal}/utils/BIP39.java (96%) rename src/main/java/org/{qora => qortal}/utils/Base58.java (99%) rename src/main/java/org/{qora => qortal}/utils/BitTwiddling.java (94%) rename src/main/java/org/{qora => qortal}/utils/ByteArray.java (97%) rename src/main/java/org/{qora => qortal}/utils/ExecuteProduceConsume.java (99%) rename src/main/java/org/{qora => qortal}/utils/NTP.java (99%) rename src/main/java/org/{qora => qortal}/utils/Pair.java (96%) rename src/main/java/org/{qora => qortal}/utils/Serialization.java (96%) rename src/main/java/org/{qora => qortal}/utils/StringLongMapXmlAdapter.java (98%) rename src/main/java/org/{qora => qortal}/utils/Triple.java (94%) rename src/main/java/org/{qora => qortal}/utils/URLViewer.java (96%) rename src/main/java/org/{qora => qortal}/voting/Poll.java (90%) rename src/test/java/org/{qora => qortal}/test/AccountBalanceTests.java (93%) rename src/test/java/org/{qora => qortal}/test/BlockTests.java (84%) rename src/test/java/org/{qora => qortal}/test/ByteArrayTests.java (98%) rename src/test/java/org/{qora => qortal}/test/ChainWeightTests.java (94%) rename src/test/java/org/{qora => qortal}/test/CompatibilityTests.java (88%) rename src/test/java/org/{qora => qortal}/test/CryptoTests.java (97%) rename src/test/java/org/{qora => qortal}/test/EPCTests.java (98%) rename src/test/java/org/{qora => qortal}/test/GuiTests.java (85%) rename src/test/java/org/{qora => qortal}/test/MemoryPoWTests.java (93%) rename src/test/java/org/{qora => qortal}/test/RepositoryTests.java (92%) rename src/test/java/org/{qora => qortal}/test/SerializationTests.java (90%) rename src/test/java/org/{qora => qortal}/test/TransferPrivsTests.java (95%) rename src/test/java/org/{qora => qortal}/test/api/AddressesApiTests.java (92%) rename src/test/java/org/{qora => qortal}/test/api/AdminApiTests.java (80%) rename src/test/java/org/{qora => qortal}/test/api/AssetsApiTests.java (94%) rename src/test/java/org/{qora => qortal}/test/api/BlockApiTests.java (90%) rename src/test/java/org/{qora => qortal}/test/api/GroupApiTests.java (93%) rename src/test/java/org/{qora => qortal}/test/api/TransactionsApiTests.java (89%) rename src/test/java/org/{qora => qortal}/test/apps/BTCACCTTests.java (96%) rename src/test/java/org/{qora => qortal}/test/apps/DecodeOnlineAccounts.java (84%) rename src/test/java/org/{qora => qortal}/test/apps/NTPTests.java (99%) rename src/test/java/org/{qora => qortal}/test/apps/ProxyTest.java (93%) rename src/test/java/org/{qora => qortal}/test/apps/RewardShareKeys.java (91%) rename src/test/java/org/{qora => qortal}/test/apps/SettingsTests.java (93%) rename src/test/java/org/{qora => qortal}/test/apps/SyncReport.java (99%) rename src/test/java/org/{qora => qortal}/test/apps/VanityGen.java (93%) rename src/test/java/org/{qora => qortal}/test/apps/WindowsTimeServiceTests.java (98%) rename src/test/java/org/{qora => qortal}/test/apps/brokenmd160.java (87%) rename src/test/java/org/{qora => qortal}/test/apps/orphan.java (77%) rename src/test/java/org/{qora => qortal}/test/assets/CancellingTests.java (97%) rename src/test/java/org/{qora => qortal}/test/assets/GranularityTests.java (95%) rename src/test/java/org/{qora => qortal}/test/assets/MixedPricingTests.java (81%) rename src/test/java/org/{qora => qortal}/test/assets/NewTradingTests.java (98%) rename src/test/java/org/{qora => qortal}/test/assets/OldTradingTests.java (96%) rename src/test/java/org/{qora => qortal}/test/common/AccountUtils.java (90%) rename src/test/java/org/{qora => qortal}/test/common/ApiCommon.java (94%) rename src/test/java/org/{qora => qortal}/test/common/AssetUtils.java (90%) rename src/test/java/org/{qora => qortal}/test/common/BlockUtils.java (85%) rename src/test/java/org/{qora => qortal}/test/common/Common.java (94%) rename src/test/java/org/{qora => qortal}/test/common/FakePeer.java (97%) rename src/test/java/org/{qora => qortal}/test/common/GroupUtils.java (83%) rename src/test/java/org/{qora => qortal}/test/common/ObjectUtils.java (95%) rename src/test/java/org/{qora => qortal}/test/common/PeerMessage.java (72%) rename src/test/java/org/{qora => qortal}/test/common/TestAccount.java (78%) rename src/test/java/org/{qora => qortal}/test/common/TransactionUtils.java (84%) rename src/test/java/org/{qora => qortal}/test/common/transaction/AccountFlagsTestTransaction.java (58%) rename src/test/java/org/{qora => qortal}/test/common/transaction/AccountLevelTestTransaction.java (58%) rename src/test/java/org/{qora => qortal}/test/common/transaction/AddGroupAdminTestTransaction.java (55%) rename src/test/java/org/{qora => qortal}/test/common/transaction/ArbitraryTestTransaction.java (65%) rename src/test/java/org/{qora => qortal}/test/common/transaction/AtTestTransaction.java (65%) rename src/test/java/org/{qora => qortal}/test/common/transaction/BuyNameTestTransaction.java (63%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CancelAssetOrderTestTransaction.java (58%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CancelGroupBanTestTransaction.java (55%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CancelGroupInviteTestTransaction.java (55%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CancelSellNameTestTransaction.java (52%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CreateAssetOrderTestTransaction.java (61%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CreateGroupTestTransaction.java (68%) rename src/test/java/org/{qora => qortal}/test/common/transaction/CreatePollTestTransaction.java (70%) rename src/test/java/org/{qora => qortal}/test/common/transaction/DeployAtTestTransaction.java (70%) rename src/test/java/org/{qora => qortal}/test/common/transaction/GenesisTestTransaction.java (59%) rename src/test/java/org/{qora => qortal}/test/common/transaction/GroupApprovalTestTransaction.java (62%) rename src/test/java/org/{qora => qortal}/test/common/transaction/GroupBanTestTransaction.java (61%) rename src/test/java/org/{qora => qortal}/test/common/transaction/GroupInviteTestTransaction.java (58%) rename src/test/java/org/{qora => qortal}/test/common/transaction/GroupKickTestTransaction.java (58%) rename src/test/java/org/{qora => qortal}/test/common/transaction/IssueAssetTestTransaction.java (68%) rename src/test/java/org/{qora => qortal}/test/common/transaction/JoinGroupTestTransaction.java (52%) rename src/test/java/org/{qora => qortal}/test/common/transaction/LeaveGroupTestTransaction.java (52%) rename src/test/java/org/{qora => qortal}/test/common/transaction/MessageTestTransaction.java (66%) rename src/test/java/org/{qora => qortal}/test/common/transaction/MultiPaymentTestTransaction.java (63%) rename src/test/java/org/{qora => qortal}/test/common/transaction/PaymentTestTransaction.java (59%) rename src/test/java/org/{qora => qortal}/test/common/transaction/RegisterNameTestTransaction.java (62%) rename src/test/java/org/{qora => qortal}/test/common/transaction/RemoveGroupAdminTestTransaction.java (55%) rename src/test/java/org/{qora => qortal}/test/common/transaction/RewardShareTestTransaction.java (65%) rename src/test/java/org/{qora => qortal}/test/common/transaction/SellNameTestTransaction.java (61%) rename src/test/java/org/{qora => qortal}/test/common/transaction/SetGroupTestTransaction.java (53%) rename src/test/java/org/{qora => qortal}/test/common/transaction/TestTransaction.java (67%) rename src/test/java/org/{qora => qortal}/test/common/transaction/TransferAssetTestTransaction.java (59%) rename src/test/java/org/{qora => qortal}/test/common/transaction/TransferPrivsTestTransaction.java (53%) rename src/test/java/org/{qora => qortal}/test/common/transaction/UpdateAssetTestTransaction.java (59%) rename src/test/java/org/{qora => qortal}/test/common/transaction/UpdateGroupTestTransaction.java (67%) rename src/test/java/org/{qora => qortal}/test/common/transaction/UpdateNameTestTransaction.java (63%) rename src/test/java/org/{qora => qortal}/test/common/transaction/VoteOnPollTestTransaction.java (61%) rename src/test/java/org/{qora => qortal}/test/group/GroupApprovalTests.java (96%) rename src/test/java/org/{qora => qortal}/test/minting/RewardShareTests.java (93%) rename src/test/java/org/{qora => qortal}/test/minting/RewardTests.java (92%) rename src/test/java/org/{qora => qortal}/test/naming/BuySellTests.java (92%) diff --git a/log4j2.properties b/log4j2.properties index c7c3f2b4..e66999aa 100644 --- a/log4j2.properties +++ b/log4j2.properties @@ -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 diff --git a/pom.xml b/pom.xml index 19485797..e59bf97a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.qora + org.qortal qortal 1.0 jar @@ -191,12 +191,12 @@ - org.qora.data.** - + org.qortal.data.** + - org.qora.api.model** - + org.qortal.api.model** + ${project.build.directory}/generated-sources/package-info @@ -283,7 +283,7 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - org.qora.controller.Controller + org.qortal.controller.Controller . .. diff --git a/src/main/java/org/qora/ApplyUpdate.java b/src/main/java/org/qortal/ApplyUpdate.java similarity index 97% rename from src/main/java/org/qora/ApplyUpdate.java rename to src/main/java/org/qortal/ApplyUpdate.java index 00ff022a..74c57a37 100644 --- a/src/main/java/org/qora/ApplyUpdate.java +++ b/src/main/java/org/qortal/ApplyUpdate.java @@ -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 { diff --git a/src/main/java/org/qora/XorUpdate.java b/src/main/java/org/qortal/XorUpdate.java similarity index 95% rename from src/main/java/org/qora/XorUpdate.java rename to src/main/java/org/qortal/XorUpdate.java index 553f8b44..9880f1de 100644 --- a/src/main/java/org/qora/XorUpdate.java +++ b/src/main/java/org/qortal/XorUpdate.java @@ -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 { diff --git a/src/main/java/org/qora/account/Account.java b/src/main/java/org/qortal/account/Account.java similarity index 95% rename from src/main/java/org/qora/account/Account.java rename to src/main/java/org/qortal/account/Account.java index 9bb29f4e..85fc47d2 100644 --- a/src/main/java/org/qora/account/Account.java +++ b/src/main/java/org/qortal/account/Account.java @@ -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 { diff --git a/src/main/java/org/qora/account/GenesisAccount.java b/src/main/java/org/qortal/account/GenesisAccount.java similarity index 81% rename from src/main/java/org/qora/account/GenesisAccount.java rename to src/main/java/org/qortal/account/GenesisAccount.java index d7d83936..5077322d 100644 --- a/src/main/java/org/qora/account/GenesisAccount.java +++ b/src/main/java/org/qortal/account/GenesisAccount.java @@ -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 { diff --git a/src/main/java/org/qora/account/PrivateKeyAccount.java b/src/main/java/org/qortal/account/PrivateKeyAccount.java similarity index 94% rename from src/main/java/org/qora/account/PrivateKeyAccount.java rename to src/main/java/org/qortal/account/PrivateKeyAccount.java index 5b5413d0..d19de210 100644 --- a/src/main/java/org/qora/account/PrivateKeyAccount.java +++ b/src/main/java/org/qortal/account/PrivateKeyAccount.java @@ -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 { diff --git a/src/main/java/org/qora/account/PublicKeyAccount.java b/src/main/java/org/qortal/account/PublicKeyAccount.java similarity index 90% rename from src/main/java/org/qora/account/PublicKeyAccount.java rename to src/main/java/org/qortal/account/PublicKeyAccount.java index 16ae163f..63739704 100644 --- a/src/main/java/org/qora/account/PublicKeyAccount.java +++ b/src/main/java/org/qortal/account/PublicKeyAccount.java @@ -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 { diff --git a/src/main/java/org/qora/api/ApiError.java b/src/main/java/org/qortal/api/ApiError.java similarity index 99% rename from src/main/java/org/qora/api/ApiError.java rename to src/main/java/org/qortal/api/ApiError.java index 00caed35..91257515 100644 --- a/src/main/java/org/qora/api/ApiError.java +++ b/src/main/java/org/qortal/api/ApiError.java @@ -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; diff --git a/src/main/java/org/qora/api/ApiErrorHandler.java b/src/main/java/org/qortal/api/ApiErrorHandler.java similarity index 95% rename from src/main/java/org/qora/api/ApiErrorHandler.java rename to src/main/java/org/qortal/api/ApiErrorHandler.java index b5d4fb35..38aef3c1 100644 --- a/src/main/java/org/qora/api/ApiErrorHandler.java +++ b/src/main/java/org/qortal/api/ApiErrorHandler.java @@ -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 { diff --git a/src/main/java/org/qora/api/ApiErrorMessage.java b/src/main/java/org/qortal/api/ApiErrorMessage.java similarity index 94% rename from src/main/java/org/qora/api/ApiErrorMessage.java rename to src/main/java/org/qortal/api/ApiErrorMessage.java index d347bd2f..1bc19abe 100644 --- a/src/main/java/org/qora/api/ApiErrorMessage.java +++ b/src/main/java/org/qortal/api/ApiErrorMessage.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/org/qora/api/ApiErrors.java b/src/main/java/org/qortal/api/ApiErrors.java similarity index 95% rename from src/main/java/org/qora/api/ApiErrors.java rename to src/main/java/org/qortal/api/ApiErrors.java index 5ec3c5b0..5f6780f0 100644 --- a/src/main/java/org/qora/api/ApiErrors.java +++ b/src/main/java/org/qortal/api/ApiErrors.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/qora/api/ApiException.java b/src/main/java/org/qortal/api/ApiException.java similarity index 97% rename from src/main/java/org/qora/api/ApiException.java rename to src/main/java/org/qortal/api/ApiException.java index 28d00551..4f9665c7 100644 --- a/src/main/java/org/qora/api/ApiException.java +++ b/src/main/java/org/qortal/api/ApiException.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/src/main/java/org/qora/api/ApiExceptionFactory.java b/src/main/java/org/qortal/api/ApiExceptionFactory.java similarity index 89% rename from src/main/java/org/qora/api/ApiExceptionFactory.java rename to src/main/java/org/qortal/api/ApiExceptionFactory.java index 409fe52c..e66c6e84 100644 --- a/src/main/java/org/qora/api/ApiExceptionFactory.java +++ b/src/main/java/org/qortal/api/ApiExceptionFactory.java @@ -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; diff --git a/src/main/java/org/qora/api/ApiRequest.java b/src/main/java/org/qortal/api/ApiRequest.java similarity index 99% rename from src/main/java/org/qora/api/ApiRequest.java rename to src/main/java/org/qortal/api/ApiRequest.java index 48d8565d..f5f5b4ce 100644 --- a/src/main/java/org/qora/api/ApiRequest.java +++ b/src/main/java/org/qortal/api/ApiRequest.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/qora/api/ApiService.java b/src/main/java/org/qortal/api/ApiService.java similarity index 95% rename from src/main/java/org/qora/api/ApiService.java rename to src/main/java/org/qortal/api/ApiService.java index 9f7f2cf0..3231d7f8 100644 --- a/src/main/java/org/qora/api/ApiService.java +++ b/src/main/java/org/qortal/api/ApiService.java @@ -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); diff --git a/src/main/java/org/qora/api/Base58TypeAdapter.java b/src/main/java/org/qortal/api/Base58TypeAdapter.java similarity index 94% rename from src/main/java/org/qora/api/Base58TypeAdapter.java rename to src/main/java/org/qortal/api/Base58TypeAdapter.java index f97affb7..4b292a2a 100644 --- a/src/main/java/org/qora/api/Base58TypeAdapter.java +++ b/src/main/java/org/qortal/api/Base58TypeAdapter.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/src/main/java/org/qora/api/BigDecimalTypeAdapter.java b/src/main/java/org/qortal/api/BigDecimalTypeAdapter.java similarity index 95% rename from src/main/java/org/qora/api/BigDecimalTypeAdapter.java rename to src/main/java/org/qortal/api/BigDecimalTypeAdapter.java index 528f9a94..fae55d0a 100644 --- a/src/main/java/org/qora/api/BigDecimalTypeAdapter.java +++ b/src/main/java/org/qortal/api/BigDecimalTypeAdapter.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/api/Constants.java b/src/main/java/org/qortal/api/Constants.java similarity index 99% rename from src/main/java/org/qora/api/Constants.java rename to src/main/java/org/qortal/api/Constants.java index 4156a606..e74a0059 100644 --- a/src/main/java/org/qora/api/Constants.java +++ b/src/main/java/org/qortal/api/Constants.java @@ -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; diff --git a/src/main/java/org/qora/api/Security.java b/src/main/java/org/qortal/api/Security.java similarity index 96% rename from src/main/java/org/qora/api/Security.java rename to src/main/java/org/qortal/api/Security.java index 000d731a..2449f781 100644 --- a/src/main/java/org/qora/api/Security.java +++ b/src/main/java/org/qortal/api/Security.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/src/main/java/org/qora/api/TransactionClassExtractor.java b/src/main/java/org/qortal/api/TransactionClassExtractor.java similarity index 94% rename from src/main/java/org/qora/api/TransactionClassExtractor.java rename to src/main/java/org/qortal/api/TransactionClassExtractor.java index 83108b66..cdae5500 100644 --- a/src/main/java/org/qora/api/TransactionClassExtractor.java +++ b/src/main/java/org/qortal/api/TransactionClassExtractor.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; import org.eclipse.persistence.descriptors.ClassExtractor; import org.eclipse.persistence.sessions.Record; diff --git a/src/main/java/org/qora/api/TransactionCountMapXmlAdapter.java b/src/main/java/org/qortal/api/TransactionCountMapXmlAdapter.java similarity index 94% rename from src/main/java/org/qora/api/TransactionCountMapXmlAdapter.java rename to src/main/java/org/qortal/api/TransactionCountMapXmlAdapter.java index 1be6a61a..bb2b4d8c 100644 --- a/src/main/java/org/qora/api/TransactionCountMapXmlAdapter.java +++ b/src/main/java/org/qortal/api/TransactionCountMapXmlAdapter.java @@ -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> { diff --git a/src/main/java/org/qora/api/TranslatableProperty.java b/src/main/java/org/qortal/api/TranslatableProperty.java similarity index 86% rename from src/main/java/org/qora/api/TranslatableProperty.java rename to src/main/java/org/qortal/api/TranslatableProperty.java index ea5c4e46..5b995f38 100644 --- a/src/main/java/org/qora/api/TranslatableProperty.java +++ b/src/main/java/org/qortal/api/TranslatableProperty.java @@ -1,4 +1,4 @@ -package org.qora.api; +package org.qortal.api; interface TranslatableProperty { public String keyName(); diff --git a/src/main/java/org/qora/api/model/ActivitySummary.java b/src/main/java/org/qortal/api/model/ActivitySummary.java similarity index 82% rename from src/main/java/org/qora/api/model/ActivitySummary.java rename to src/main/java/org/qortal/api/model/ActivitySummary.java index 37cb566d..27b5ed8d 100644 --- a/src/main/java/org/qora/api/model/ActivitySummary.java +++ b/src/main/java/org/qortal/api/model/ActivitySummary.java @@ -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 { diff --git a/src/main/java/org/qora/api/model/AggregatedOrder.java b/src/main/java/org/qortal/api/model/AggregatedOrder.java similarity index 94% rename from src/main/java/org/qora/api/model/AggregatedOrder.java rename to src/main/java/org/qortal/api/model/AggregatedOrder.java index f6323014..e0e9e30a 100644 --- a/src/main/java/org/qora/api/model/AggregatedOrder.java +++ b/src/main/java/org/qortal/api/model/AggregatedOrder.java @@ -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 { diff --git a/src/main/java/org/qora/api/model/ApiOnlineAccount.java b/src/main/java/org/qortal/api/model/ApiOnlineAccount.java similarity index 97% rename from src/main/java/org/qora/api/model/ApiOnlineAccount.java rename to src/main/java/org/qortal/api/model/ApiOnlineAccount.java index 94f1f998..08b697aa 100644 --- a/src/main/java/org/qora/api/model/ApiOnlineAccount.java +++ b/src/main/java/org/qortal/api/model/ApiOnlineAccount.java @@ -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; diff --git a/src/main/java/org/qora/api/model/BlockMinterSummary.java b/src/main/java/org/qortal/api/model/BlockMinterSummary.java similarity index 94% rename from src/main/java/org/qora/api/model/BlockMinterSummary.java rename to src/main/java/org/qortal/api/model/BlockMinterSummary.java index 862160b0..570d7580 100644 --- a/src/main/java/org/qora/api/model/BlockMinterSummary.java +++ b/src/main/java/org/qortal/api/model/BlockMinterSummary.java @@ -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 { diff --git a/src/main/java/org/qora/api/model/ConnectedPeer.java b/src/main/java/org/qortal/api/model/ConnectedPeer.java similarity index 89% rename from src/main/java/org/qora/api/model/ConnectedPeer.java rename to src/main/java/org/qortal/api/model/ConnectedPeer.java index 6234cd54..0926f9a4 100644 --- a/src/main/java/org/qora/api/model/ConnectedPeer.java +++ b/src/main/java/org/qortal/api/model/ConnectedPeer.java @@ -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; diff --git a/src/main/java/org/qora/api/model/GroupMembers.java b/src/main/java/org/qortal/api/model/GroupMembers.java similarity index 97% rename from src/main/java/org/qora/api/model/GroupMembers.java rename to src/main/java/org/qortal/api/model/GroupMembers.java index 2437eae6..1cd13efa 100644 --- a/src/main/java/org/qora/api/model/GroupMembers.java +++ b/src/main/java/org/qortal/api/model/GroupMembers.java @@ -1,4 +1,4 @@ -package org.qora.api.model; +package org.qortal.api.model; import java.util.List; diff --git a/src/main/java/org/qora/api/model/NameSummary.java b/src/main/java/org/qortal/api/model/NameSummary.java similarity index 88% rename from src/main/java/org/qora/api/model/NameSummary.java rename to src/main/java/org/qortal/api/model/NameSummary.java index dd3c267d..1e2caa87 100644 --- a/src/main/java/org/qora/api/model/NameSummary.java +++ b/src/main/java/org/qortal/api/model/NameSummary.java @@ -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 { diff --git a/src/main/java/org/qora/api/model/NodeInfo.java b/src/main/java/org/qortal/api/model/NodeInfo.java similarity index 90% rename from src/main/java/org/qora/api/model/NodeInfo.java rename to src/main/java/org/qortal/api/model/NodeInfo.java index 8daec172..51cf2ae3 100644 --- a/src/main/java/org/qora/api/model/NodeInfo.java +++ b/src/main/java/org/qortal/api/model/NodeInfo.java @@ -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; diff --git a/src/main/java/org/qora/api/model/RewardShareKeyRequest.java b/src/main/java/org/qortal/api/model/RewardShareKeyRequest.java similarity index 93% rename from src/main/java/org/qora/api/model/RewardShareKeyRequest.java rename to src/main/java/org/qortal/api/model/RewardShareKeyRequest.java index c1396724..9448dba0 100644 --- a/src/main/java/org/qora/api/model/RewardShareKeyRequest.java +++ b/src/main/java/org/qortal/api/model/RewardShareKeyRequest.java @@ -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; diff --git a/src/main/java/org/qora/api/model/SimpleTransactionSignRequest.java b/src/main/java/org/qortal/api/model/SimpleTransactionSignRequest.java similarity index 94% rename from src/main/java/org/qora/api/model/SimpleTransactionSignRequest.java rename to src/main/java/org/qortal/api/model/SimpleTransactionSignRequest.java index 65780fe0..2ee80289 100644 --- a/src/main/java/org/qora/api/model/SimpleTransactionSignRequest.java +++ b/src/main/java/org/qortal/api/model/SimpleTransactionSignRequest.java @@ -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; diff --git a/src/main/java/org/qora/api/model/TradeWithOrderInfo.java b/src/main/java/org/qortal/api/model/TradeWithOrderInfo.java similarity index 91% rename from src/main/java/org/qora/api/model/TradeWithOrderInfo.java rename to src/main/java/org/qortal/api/model/TradeWithOrderInfo.java index 0d9451ce..f773487b 100644 --- a/src/main/java/org/qora/api/model/TradeWithOrderInfo.java +++ b/src/main/java/org/qortal/api/model/TradeWithOrderInfo.java @@ -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; diff --git a/src/main/java/org/qora/api/resource/AddressesResource.java b/src/main/java/org/qortal/api/resource/AddressesResource.java similarity index 92% rename from src/main/java/org/qora/api/resource/AddressesResource.java rename to src/main/java/org/qortal/api/resource/AddressesResource.java index 5d7a4d86..26108d92 100644 --- a/src/main/java/org/qora/api/resource/AddressesResource.java +++ b/src/main/java/org/qortal/api/resource/AddressesResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/AdminResource.java b/src/main/java/org/qortal/api/resource/AdminResource.java similarity index 94% rename from src/main/java/org/qora/api/resource/AdminResource.java rename to src/main/java/org/qortal/api/resource/AdminResource.java index b27bc326..974af3c9 100644 --- a/src/main/java/org/qora/api/resource/AdminResource.java +++ b/src/main/java/org/qortal/api/resource/AdminResource.java @@ -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; diff --git a/src/main/java/org/qora/api/resource/AnnotationPostProcessor.java b/src/main/java/org/qortal/api/resource/AnnotationPostProcessor.java similarity index 95% rename from src/main/java/org/qora/api/resource/AnnotationPostProcessor.java rename to src/main/java/org/qortal/api/resource/AnnotationPostProcessor.java index 1e113dae..7b4a1ab2 100644 --- a/src/main/java/org/qora/api/resource/AnnotationPostProcessor.java +++ b/src/main/java/org/qortal/api/resource/AnnotationPostProcessor.java @@ -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 { diff --git a/src/main/java/org/qora/api/resource/ApiDefinition.java b/src/main/java/org/qortal/api/resource/ApiDefinition.java similarity index 85% rename from src/main/java/org/qora/api/resource/ApiDefinition.java rename to src/main/java/org/qortal/api/resource/ApiDefinition.java index eeff19fa..52b6ade0 100644 --- a/src/main/java/org/qora/api/resource/ApiDefinition.java +++ b/src/main/java/org/qortal/api/resource/ApiDefinition.java @@ -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"), diff --git a/src/main/java/org/qora/api/resource/ApiExceptionMapper.java b/src/main/java/org/qortal/api/resource/ApiExceptionMapper.java similarity index 94% rename from src/main/java/org/qora/api/resource/ApiExceptionMapper.java rename to src/main/java/org/qortal/api/resource/ApiExceptionMapper.java index 150e11af..d0f7ada7 100644 --- a/src/main/java/org/qora/api/resource/ApiExceptionMapper.java +++ b/src/main/java/org/qortal/api/resource/ApiExceptionMapper.java @@ -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 { diff --git a/src/main/java/org/qora/api/resource/ArbitraryResource.java b/src/main/java/org/qortal/api/resource/ArbitraryResource.java similarity index 87% rename from src/main/java/org/qora/api/resource/ArbitraryResource.java rename to src/main/java/org/qortal/api/resource/ArbitraryResource.java index d4c03deb..26604318 100644 --- a/src/main/java/org/qora/api/resource/ArbitraryResource.java +++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/AssetsResource.java b/src/main/java/org/qortal/api/resource/AssetsResource.java similarity index 94% rename from src/main/java/org/qora/api/resource/AssetsResource.java rename to src/main/java/org/qortal/api/resource/AssetsResource.java index ed75b383..0cf97899 100644 --- a/src/main/java/org/qora/api/resource/AssetsResource.java +++ b/src/main/java/org/qortal/api/resource/AssetsResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/BlocksResource.java b/src/main/java/org/qortal/api/resource/BlocksResource.java similarity index 96% rename from src/main/java/org/qora/api/resource/BlocksResource.java rename to src/main/java/org/qortal/api/resource/BlocksResource.java index c1664086..b8b4715e 100644 --- a/src/main/java/org/qora/api/resource/BlocksResource.java +++ b/src/main/java/org/qortal/api/resource/BlocksResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/GroupsResource.java b/src/main/java/org/qortal/api/resource/GroupsResource.java similarity index 92% rename from src/main/java/org/qora/api/resource/GroupsResource.java rename to src/main/java/org/qortal/api/resource/GroupsResource.java index ae0ffa0c..4ffd7549 100644 --- a/src/main/java/org/qora/api/resource/GroupsResource.java +++ b/src/main/java/org/qortal/api/resource/GroupsResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/NamesResource.java b/src/main/java/org/qortal/api/resource/NamesResource.java similarity index 90% rename from src/main/java/org/qora/api/resource/NamesResource.java rename to src/main/java/org/qortal/api/resource/NamesResource.java index 20c6c44a..2497c716 100644 --- a/src/main/java/org/qora/api/resource/NamesResource.java +++ b/src/main/java/org/qortal/api/resource/NamesResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/PaymentsResource.java b/src/main/java/org/qortal/api/resource/PaymentsResource.java similarity index 77% rename from src/main/java/org/qora/api/resource/PaymentsResource.java rename to src/main/java/org/qortal/api/resource/PaymentsResource.java index 8442c7b3..111a3fee 100644 --- a/src/main/java/org/qora/api/resource/PaymentsResource.java +++ b/src/main/java/org/qortal/api/resource/PaymentsResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/PeersResource.java b/src/main/java/org/qortal/api/resource/PeersResource.java similarity index 92% rename from src/main/java/org/qora/api/resource/PeersResource.java rename to src/main/java/org/qortal/api/resource/PeersResource.java index 9193218d..1afdbb41 100644 --- a/src/main/java/org/qora/api/resource/PeersResource.java +++ b/src/main/java/org/qortal/api/resource/PeersResource.java @@ -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") diff --git a/src/main/java/org/qora/api/resource/TransactionsResource.java b/src/main/java/org/qortal/api/resource/TransactionsResource.java similarity index 95% rename from src/main/java/org/qora/api/resource/TransactionsResource.java rename to src/main/java/org/qortal/api/resource/TransactionsResource.java index 7e0cb784..77544d08 100644 --- a/src/main/java/org/qora/api/resource/TransactionsResource.java +++ b/src/main/java/org/qortal/api/resource/TransactionsResource.java @@ -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; diff --git a/src/main/java/org/qora/api/resource/UtilsResource.java b/src/main/java/org/qortal/api/resource/UtilsResource.java similarity index 95% rename from src/main/java/org/qora/api/resource/UtilsResource.java rename to src/main/java/org/qortal/api/resource/UtilsResource.java index 8e75172c..cc492a2f 100644 --- a/src/main/java/org/qora/api/resource/UtilsResource.java +++ b/src/main/java/org/qortal/api/resource/UtilsResource.java @@ -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; diff --git a/src/main/java/org/qora/asset/Asset.java b/src/main/java/org/qortal/asset/Asset.java similarity index 94% rename from src/main/java/org/qora/asset/Asset.java rename to src/main/java/org/qortal/asset/Asset.java index 381ef933..26ca54ae 100644 --- a/src/main/java/org/qora/asset/Asset.java +++ b/src/main/java/org/qortal/asset/Asset.java @@ -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 { diff --git a/src/main/java/org/qora/asset/Order.java b/src/main/java/org/qortal/asset/Order.java similarity index 91% rename from src/main/java/org/qora/asset/Order.java rename to src/main/java/org/qortal/asset/Order.java index 1675d82f..4bc40ba1 100644 --- a/src/main/java/org/qora/asset/Order.java +++ b/src/main/java/org/qortal/asset/Order.java @@ -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. *

- * e.g. "QORA/GOLD" + * e.g. "QORT/GOLD" */ 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) *

* 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. *

* 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(); diff --git a/src/main/java/org/qora/asset/Trade.java b/src/main/java/org/qortal/asset/Trade.java similarity index 93% rename from src/main/java/org/qora/asset/Trade.java rename to src/main/java/org/qortal/asset/Trade.java index 74f18560..1f29cdc2 100644 --- a/src/main/java/org/qora/asset/Trade.java +++ b/src/main/java/org/qortal/asset/Trade.java @@ -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 { diff --git a/src/main/java/org/qora/at/AT.java b/src/main/java/org/qortal/at/AT.java similarity index 90% rename from src/main/java/org/qora/at/AT.java rename to src/main/java/org/qortal/at/AT.java index fcdfc208..a59970b3 100644 --- a/src/main/java/org/qora/at/AT.java +++ b/src/main/java/org/qortal/at/AT.java @@ -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 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(); diff --git a/src/main/java/org/qora/at/BlockchainAPI.java b/src/main/java/org/qortal/at/BlockchainAPI.java similarity index 80% rename from src/main/java/org/qora/at/BlockchainAPI.java rename to src/main/java/org/qortal/at/BlockchainAPI.java index 60db2337..2e91a0f6 100644 --- a/src/main/java/org/qora/at/BlockchainAPI.java +++ b/src/main/java/org/qortal/at/BlockchainAPI.java @@ -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()) { diff --git a/src/main/java/org/qora/at/QoraATAPI.java b/src/main/java/org/qortal/at/QortalATAPI.java similarity index 90% rename from src/main/java/org/qora/at/QoraATAPI.java rename to src/main/java/org/qortal/at/QortalATAPI.java index e001f919..8995c506 100644 --- a/src/main/java/org/qora/at/QoraATAPI.java +++ b/src/main/java/org/qortal/at/QortalATAPI.java @@ -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 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 */ diff --git a/src/main/java/org/qora/at/QoraATLogger.java b/src/main/java/org/qortal/at/QortalATLogger.java similarity index 70% rename from src/main/java/org/qora/at/QoraATLogger.java rename to src/main/java/org/qortal/at/QortalATLogger.java index cc4bf527..df01247a 100644 --- a/src/main/java/org/qora/at/QoraATLogger.java +++ b/src/main/java/org/qortal/at/QortalATLogger.java @@ -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 diff --git a/src/main/java/org/qora/at/QoraFunctionCode.java b/src/main/java/org/qortal/at/QortalFunctionCode.java similarity index 91% rename from src/main/java/org/qora/at/QoraFunctionCode.java rename to src/main/java/org/qortal/at/QortalFunctionCode.java index b2b63d78..f7d089cf 100644 --- a/src/main/java/org/qora/at/QoraFunctionCode.java +++ b/src/main/java/org/qortal/at/QortalFunctionCode.java @@ -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. *

* Function codes need to be between 0x0500 and 0x06ff. * */ -public enum QoraFunctionCode { +public enum QortalFunctionCode { /** * 0x0500
* 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 map = Arrays.stream(QoraFunctionCode.values()) + private final static Map 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); } diff --git a/src/main/java/org/qora/block/Block.java b/src/main/java/org/qortal/block/Block.java similarity index 97% rename from src/main/java/org/qora/block/Block.java rename to src/main/java/org/qortal/block/Block.java index 5f2dd015..56f58d37 100644 --- a/src/main/java/org/qora/block/Block.java +++ b/src/main/java/org/qortal/block/Block.java @@ -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; diff --git a/src/main/java/org/qora/block/BlockChain.java b/src/main/java/org/qortal/block/BlockChain.java similarity index 93% rename from src/main/java/org/qora/block/BlockChain.java rename to src/main/java/org/qortal/block/BlockChain.java index 3cdac273..305d9e4a 100644 --- a/src/main/java/org/qora/block/BlockChain.java +++ b/src/main/java/org/qortal/block/BlockChain.java @@ -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() { diff --git a/src/main/java/org/qora/block/BlockMinter.java b/src/main/java/org/qortal/block/BlockMinter.java similarity index 93% rename from src/main/java/org/qora/block/BlockMinter.java rename to src/main/java/org/qortal/block/BlockMinter.java index 29752be7..2f27a9dc 100644 --- a/src/main/java/org/qora/block/BlockMinter.java +++ b/src/main/java/org/qortal/block/BlockMinter.java @@ -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 diff --git a/src/main/java/org/qora/block/GenesisBlock.java b/src/main/java/org/qortal/block/GenesisBlock.java similarity index 94% rename from src/main/java/org/qora/block/GenesisBlock.java rename to src/main/java/org/qortal/block/GenesisBlock.java index 9aa600e2..92f2d551 100644 --- a/src/main/java/org/qora/block/GenesisBlock.java +++ b/src/main/java/org/qortal/block/GenesisBlock.java @@ -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; diff --git a/src/main/java/org/qora/controller/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/ArbitraryDataManager.java similarity index 84% rename from src/main/java/org/qora/controller/ArbitraryDataManager.java rename to src/main/java/org/qortal/controller/ArbitraryDataManager.java index 893b915e..61447dbc 100644 --- a/src/main/java/org/qora/controller/ArbitraryDataManager.java +++ b/src/main/java/org/qortal/controller/ArbitraryDataManager.java @@ -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 { diff --git a/src/main/java/org/qora/controller/AutoUpdate.java b/src/main/java/org/qortal/controller/AutoUpdate.java similarity index 93% rename from src/main/java/org/qora/controller/AutoUpdate.java rename to src/main/java/org/qortal/controller/AutoUpdate.java index 77236d6d..21c7ecc0 100644 --- a/src/main/java/org/qora/controller/AutoUpdate.java +++ b/src/main/java/org/qortal/controller/AutoUpdate.java @@ -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; diff --git a/src/main/java/org/qora/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java similarity index 95% rename from src/main/java/org/qora/controller/Controller.java rename to src/main/java/org/qortal/controller/Controller.java index 18219bed..6018d662 100644 --- a/src/main/java/org/qora/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -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 System.currentTimeMillis(). */ 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 diff --git a/src/main/java/org/qora/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java similarity index 94% rename from src/main/java/org/qora/controller/Synchronizer.java rename to src/main/java/org/qortal/controller/Synchronizer.java index 63add6af..08056727 100644 --- a/src/main/java/org/qora/controller/Synchronizer.java +++ b/src/main/java/org/qortal/controller/Synchronizer.java @@ -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 { diff --git a/src/main/java/org/qora/crosschain/BTC.java b/src/main/java/org/qortal/crosschain/BTC.java similarity index 99% rename from src/main/java/org/qora/crosschain/BTC.java rename to src/main/java/org/qortal/crosschain/BTC.java index 2ff9efaf..17b5cc66 100644 --- a/src/main/java/org/qora/crosschain/BTC.java +++ b/src/main/java/org/qortal/crosschain/BTC.java @@ -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 { diff --git a/src/main/java/org/qora/crypto/BouncyCastle25519.java b/src/main/java/org/qortal/crypto/BouncyCastle25519.java similarity index 99% rename from src/main/java/org/qora/crypto/BouncyCastle25519.java rename to src/main/java/org/qortal/crypto/BouncyCastle25519.java index 39ad534b..1a2e0de9 100644 --- a/src/main/java/org/qora/crypto/BouncyCastle25519.java +++ b/src/main/java/org/qortal/crypto/BouncyCastle25519.java @@ -1,4 +1,4 @@ -package org.qora.crypto; +package org.qortal.crypto; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/org/qora/crypto/BrokenMD160.java b/src/main/java/org/qortal/crypto/BrokenMD160.java similarity index 99% rename from src/main/java/org/qora/crypto/BrokenMD160.java rename to src/main/java/org/qortal/crypto/BrokenMD160.java index 90ff6ec9..f1dc149b 100644 --- a/src/main/java/org/qora/crypto/BrokenMD160.java +++ b/src/main/java/org/qortal/crypto/BrokenMD160.java @@ -1,4 +1,4 @@ -package org.qora.crypto; +package org.qortal.crypto; /** * BROKEN RIPEMD160 diff --git a/src/main/java/org/qora/crypto/Credentials.java b/src/main/java/org/qortal/crypto/Credentials.java similarity index 98% rename from src/main/java/org/qora/crypto/Credentials.java rename to src/main/java/org/qortal/crypto/Credentials.java index 2892e803..8fee58b2 100644 --- a/src/main/java/org/qora/crypto/Credentials.java +++ b/src/main/java/org/qortal/crypto/Credentials.java @@ -1,4 +1,4 @@ -package org.qora.crypto; +package org.qortal.crypto; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/org/qora/crypto/Crypto.java b/src/main/java/org/qortal/crypto/Crypto.java similarity index 97% rename from src/main/java/org/qora/crypto/Crypto.java rename to src/main/java/org/qortal/crypto/Crypto.java index 07766bd1..36c06585 100644 --- a/src/main/java/org/qora/crypto/Crypto.java +++ b/src/main/java/org/qortal/crypto/Crypto.java @@ -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; diff --git a/src/main/java/org/qora/crypto/CryptoBytes.java b/src/main/java/org/qortal/crypto/CryptoBytes.java similarity index 97% rename from src/main/java/org/qora/crypto/CryptoBytes.java rename to src/main/java/org/qortal/crypto/CryptoBytes.java index 13393f2b..b9366a98 100644 --- a/src/main/java/org/qora/crypto/CryptoBytes.java +++ b/src/main/java/org/qortal/crypto/CryptoBytes.java @@ -1,4 +1,4 @@ -package org.qora.crypto; +package org.qortal.crypto; //Punisher.NaCl; diff --git a/src/main/java/org/qora/crypto/MemoryPoW.java b/src/main/java/org/qortal/crypto/MemoryPoW.java similarity index 98% rename from src/main/java/org/qora/crypto/MemoryPoW.java rename to src/main/java/org/qortal/crypto/MemoryPoW.java index 1948d71c..1d1bf339 100644 --- a/src/main/java/org/qora/crypto/MemoryPoW.java +++ b/src/main/java/org/qortal/crypto/MemoryPoW.java @@ -1,4 +1,4 @@ -package org.qora.crypto; +package org.qortal.crypto; import com.google.common.primitives.Bytes; diff --git a/src/main/java/org/qora/data/PaymentData.java b/src/main/java/org/qortal/data/PaymentData.java similarity index 96% rename from src/main/java/org/qora/data/PaymentData.java rename to src/main/java/org/qortal/data/PaymentData.java index 424ef5a5..8dbcc58f 100644 --- a/src/main/java/org/qora/data/PaymentData.java +++ b/src/main/java/org/qortal/data/PaymentData.java @@ -1,4 +1,4 @@ -package org.qora.data; +package org.qortal.data; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/account/AccountBalanceData.java b/src/main/java/org/qortal/data/account/AccountBalanceData.java similarity index 97% rename from src/main/java/org/qora/data/account/AccountBalanceData.java rename to src/main/java/org/qortal/data/account/AccountBalanceData.java index 25c4f557..be4f69d9 100644 --- a/src/main/java/org/qora/data/account/AccountBalanceData.java +++ b/src/main/java/org/qortal/data/account/AccountBalanceData.java @@ -1,4 +1,4 @@ -package org.qora.data.account; +package org.qortal.data.account; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/account/AccountData.java b/src/main/java/org/qortal/data/account/AccountData.java similarity index 97% rename from src/main/java/org/qora/data/account/AccountData.java rename to src/main/java/org/qortal/data/account/AccountData.java index eca8d150..4d662f04 100644 --- a/src/main/java/org/qora/data/account/AccountData.java +++ b/src/main/java/org/qortal/data/account/AccountData.java @@ -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) diff --git a/src/main/java/org/qora/data/account/MintingAccountData.java b/src/main/java/org/qortal/data/account/MintingAccountData.java similarity index 93% rename from src/main/java/org/qora/data/account/MintingAccountData.java rename to src/main/java/org/qortal/data/account/MintingAccountData.java index e9bfeb4f..a47ca5a1 100644 --- a/src/main/java/org/qora/data/account/MintingAccountData.java +++ b/src/main/java/org/qortal/data/account/MintingAccountData.java @@ -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; diff --git a/src/main/java/org/qora/data/account/QortFromQoraData.java b/src/main/java/org/qortal/data/account/QortFromQoraData.java similarity index 97% rename from src/main/java/org/qora/data/account/QortFromQoraData.java rename to src/main/java/org/qortal/data/account/QortFromQoraData.java index fec69f4d..97219d1e 100644 --- a/src/main/java/org/qora/data/account/QortFromQoraData.java +++ b/src/main/java/org/qortal/data/account/QortFromQoraData.java @@ -1,4 +1,4 @@ -package org.qora.data.account; +package org.qortal.data.account; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/account/RewardShareData.java b/src/main/java/org/qortal/data/account/RewardShareData.java similarity index 95% rename from src/main/java/org/qora/data/account/RewardShareData.java rename to src/main/java/org/qortal/data/account/RewardShareData.java index 92f3de16..6c3d7078 100644 --- a/src/main/java/org/qora/data/account/RewardShareData.java +++ b/src/main/java/org/qortal/data/account/RewardShareData.java @@ -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) diff --git a/src/main/java/org/qora/data/asset/AssetData.java b/src/main/java/org/qortal/data/asset/AssetData.java similarity index 98% rename from src/main/java/org/qora/data/asset/AssetData.java rename to src/main/java/org/qortal/data/asset/AssetData.java index f38859da..b094686d 100644 --- a/src/main/java/org/qora/data/asset/AssetData.java +++ b/src/main/java/org/qortal/data/asset/AssetData.java @@ -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; diff --git a/src/main/java/org/qora/data/asset/OrderData.java b/src/main/java/org/qortal/data/asset/OrderData.java similarity index 98% rename from src/main/java/org/qora/data/asset/OrderData.java rename to src/main/java/org/qortal/data/asset/OrderData.java index 32067290..9314c220 100644 --- a/src/main/java/org/qora/data/asset/OrderData.java +++ b/src/main/java/org/qortal/data/asset/OrderData.java @@ -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; diff --git a/src/main/java/org/qora/data/asset/RecentTradeData.java b/src/main/java/org/qortal/data/asset/RecentTradeData.java similarity index 97% rename from src/main/java/org/qora/data/asset/RecentTradeData.java rename to src/main/java/org/qortal/data/asset/RecentTradeData.java index dbc49ce5..6b126a53 100644 --- a/src/main/java/org/qora/data/asset/RecentTradeData.java +++ b/src/main/java/org/qortal/data/asset/RecentTradeData.java @@ -1,4 +1,4 @@ -package org.qora.data.asset; +package org.qortal.data.asset; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/asset/TradeData.java b/src/main/java/org/qortal/data/asset/TradeData.java similarity index 99% rename from src/main/java/org/qora/data/asset/TradeData.java rename to src/main/java/org/qortal/data/asset/TradeData.java index 1e438710..a5b1b460 100644 --- a/src/main/java/org/qora/data/asset/TradeData.java +++ b/src/main/java/org/qortal/data/asset/TradeData.java @@ -1,4 +1,4 @@ -package org.qora.data.asset; +package org.qortal.data.asset; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/at/ATData.java b/src/main/java/org/qortal/data/at/ATData.java similarity index 99% rename from src/main/java/org/qora/data/at/ATData.java rename to src/main/java/org/qortal/data/at/ATData.java index 48ba5c75..0ab73bdc 100644 --- a/src/main/java/org/qora/data/at/ATData.java +++ b/src/main/java/org/qortal/data/at/ATData.java @@ -1,4 +1,4 @@ -package org.qora.data.at; +package org.qortal.data.at; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/at/ATStateData.java b/src/main/java/org/qortal/data/at/ATStateData.java similarity index 98% rename from src/main/java/org/qora/data/at/ATStateData.java rename to src/main/java/org/qortal/data/at/ATStateData.java index ce859e55..aa8cf4cd 100644 --- a/src/main/java/org/qora/data/at/ATStateData.java +++ b/src/main/java/org/qortal/data/at/ATStateData.java @@ -1,4 +1,4 @@ -package org.qora.data.at; +package org.qortal.data.at; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/block/BlockData.java b/src/main/java/org/qortal/data/block/BlockData.java similarity index 98% rename from src/main/java/org/qora/data/block/BlockData.java rename to src/main/java/org/qortal/data/block/BlockData.java index 20c41e0d..ac216f4f 100644 --- a/src/main/java/org/qora/data/block/BlockData.java +++ b/src/main/java/org/qortal/data/block/BlockData.java @@ -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) diff --git a/src/main/java/org/qora/data/block/BlockSummaryData.java b/src/main/java/org/qortal/data/block/BlockSummaryData.java similarity index 94% rename from src/main/java/org/qora/data/block/BlockSummaryData.java rename to src/main/java/org/qortal/data/block/BlockSummaryData.java index aaa945b9..5599c959 100644 --- a/src/main/java/org/qora/data/block/BlockSummaryData.java +++ b/src/main/java/org/qortal/data/block/BlockSummaryData.java @@ -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 { diff --git a/src/main/java/org/qora/data/block/BlockTransactionData.java b/src/main/java/org/qortal/data/block/BlockTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/block/BlockTransactionData.java rename to src/main/java/org/qortal/data/block/BlockTransactionData.java index 68303677..6fdbfb08 100644 --- a/src/main/java/org/qora/data/block/BlockTransactionData.java +++ b/src/main/java/org/qortal/data/block/BlockTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.block; +package org.qortal.data.block; public class BlockTransactionData { diff --git a/src/main/java/org/qora/data/group/GroupAdminData.java b/src/main/java/org/qortal/data/group/GroupAdminData.java similarity index 97% rename from src/main/java/org/qora/data/group/GroupAdminData.java rename to src/main/java/org/qortal/data/group/GroupAdminData.java index d107bfb2..b9fea54b 100644 --- a/src/main/java/org/qora/data/group/GroupAdminData.java +++ b/src/main/java/org/qortal/data/group/GroupAdminData.java @@ -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; diff --git a/src/main/java/org/qora/data/group/GroupApprovalData.java b/src/main/java/org/qortal/data/group/GroupApprovalData.java similarity index 86% rename from src/main/java/org/qora/data/group/GroupApprovalData.java rename to src/main/java/org/qortal/data/group/GroupApprovalData.java index 20487a0e..f1470c1d 100644 --- a/src/main/java/org/qora/data/group/GroupApprovalData.java +++ b/src/main/java/org/qortal/data/group/GroupApprovalData.java @@ -1,4 +1,4 @@ -package org.qora.data.group; +package org.qortal.data.group; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/qora/data/group/GroupBanData.java b/src/main/java/org/qortal/data/group/GroupBanData.java similarity index 98% rename from src/main/java/org/qora/data/group/GroupBanData.java rename to src/main/java/org/qortal/data/group/GroupBanData.java index aec4bc02..5e2abe52 100644 --- a/src/main/java/org/qora/data/group/GroupBanData.java +++ b/src/main/java/org/qortal/data/group/GroupBanData.java @@ -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; diff --git a/src/main/java/org/qora/data/group/GroupData.java b/src/main/java/org/qortal/data/group/GroupData.java similarity index 97% rename from src/main/java/org/qora/data/group/GroupData.java rename to src/main/java/org/qortal/data/group/GroupData.java index b9392a7b..170f678b 100644 --- a/src/main/java/org/qora/data/group/GroupData.java +++ b/src/main/java/org/qortal/data/group/GroupData.java @@ -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; diff --git a/src/main/java/org/qora/data/group/GroupInviteData.java b/src/main/java/org/qortal/data/group/GroupInviteData.java similarity index 97% rename from src/main/java/org/qora/data/group/GroupInviteData.java rename to src/main/java/org/qortal/data/group/GroupInviteData.java index 4722103a..50c0a8c2 100644 --- a/src/main/java/org/qora/data/group/GroupInviteData.java +++ b/src/main/java/org/qortal/data/group/GroupInviteData.java @@ -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; diff --git a/src/main/java/org/qora/data/group/GroupJoinRequestData.java b/src/main/java/org/qortal/data/group/GroupJoinRequestData.java similarity index 97% rename from src/main/java/org/qora/data/group/GroupJoinRequestData.java rename to src/main/java/org/qortal/data/group/GroupJoinRequestData.java index ff902aa9..b084aa66 100644 --- a/src/main/java/org/qora/data/group/GroupJoinRequestData.java +++ b/src/main/java/org/qortal/data/group/GroupJoinRequestData.java @@ -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; diff --git a/src/main/java/org/qora/data/group/GroupMemberData.java b/src/main/java/org/qortal/data/group/GroupMemberData.java similarity index 97% rename from src/main/java/org/qora/data/group/GroupMemberData.java rename to src/main/java/org/qortal/data/group/GroupMemberData.java index 6d9b7d6e..87b1ae41 100644 --- a/src/main/java/org/qora/data/group/GroupMemberData.java +++ b/src/main/java/org/qortal/data/group/GroupMemberData.java @@ -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; diff --git a/src/main/java/org/qora/data/naming/NameData.java b/src/main/java/org/qortal/data/naming/NameData.java similarity index 98% rename from src/main/java/org/qora/data/naming/NameData.java rename to src/main/java/org/qortal/data/naming/NameData.java index ae4bc547..90fa7cca 100644 --- a/src/main/java/org/qora/data/naming/NameData.java +++ b/src/main/java/org/qortal/data/naming/NameData.java @@ -1,4 +1,4 @@ -package org.qora.data.naming; +package org.qortal.data.naming; import java.math.BigDecimal; diff --git a/src/main/java/org/qora/data/network/OnlineAccountData.java b/src/main/java/org/qortal/data/network/OnlineAccountData.java similarity index 92% rename from src/main/java/org/qora/data/network/OnlineAccountData.java rename to src/main/java/org/qortal/data/network/OnlineAccountData.java index d7375760..04ae92f9 100644 --- a/src/main/java/org/qora/data/network/OnlineAccountData.java +++ b/src/main/java/org/qortal/data/network/OnlineAccountData.java @@ -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) diff --git a/src/main/java/org/qora/data/network/PeerChainTipData.java b/src/main/java/org/qortal/data/network/PeerChainTipData.java similarity index 96% rename from src/main/java/org/qora/data/network/PeerChainTipData.java rename to src/main/java/org/qortal/data/network/PeerChainTipData.java index d2a944a2..d8dbbad4 100644 --- a/src/main/java/org/qora/data/network/PeerChainTipData.java +++ b/src/main/java/org/qortal/data/network/PeerChainTipData.java @@ -1,4 +1,4 @@ -package org.qora.data.network; +package org.qortal.data.network; public class PeerChainTipData { diff --git a/src/main/java/org/qora/data/network/PeerData.java b/src/main/java/org/qortal/data/network/PeerData.java similarity index 96% rename from src/main/java/org/qora/data/network/PeerData.java rename to src/main/java/org/qortal/data/network/PeerData.java index 56f36e19..3362ff11 100644 --- a/src/main/java/org/qora/data/network/PeerData.java +++ b/src/main/java/org/qortal/data/network/PeerData.java @@ -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; diff --git a/src/main/java/org/qora/data/package-info.java b/src/main/java/org/qortal/data/package-info.java similarity index 52% rename from src/main/java/org/qora/data/package-info.java rename to src/main/java/org/qortal/data/package-info.java index efb02e00..20732a0d 100644 --- a/src/main/java/org/qora/data/package-info.java +++ b/src/main/java/org/qortal/data/package-info.java @@ -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; diff --git a/src/main/java/org/qora/data/transaction/ATTransactionData.java b/src/main/java/org/qortal/data/transaction/ATTransactionData.java similarity index 91% rename from src/main/java/org/qora/data/transaction/ATTransactionData.java rename to src/main/java/org/qortal/data/transaction/ATTransactionData.java index 81957019..c2e81886 100644 --- a/src/main/java/org/qora/data/transaction/ATTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/ATTransactionData.java @@ -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; diff --git a/src/main/java/org/qora/data/transaction/AccountFlagsTransactionData.java b/src/main/java/org/qortal/data/transaction/AccountFlagsTransactionData.java similarity index 94% rename from src/main/java/org/qora/data/transaction/AccountFlagsTransactionData.java rename to src/main/java/org/qortal/data/transaction/AccountFlagsTransactionData.java index 51ecff1a..994cb840 100644 --- a/src/main/java/org/qora/data/transaction/AccountFlagsTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/AccountFlagsTransactionData.java @@ -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; diff --git a/src/main/java/org/qora/data/transaction/AccountLevelTransactionData.java b/src/main/java/org/qortal/data/transaction/AccountLevelTransactionData.java similarity index 92% rename from src/main/java/org/qora/data/transaction/AccountLevelTransactionData.java rename to src/main/java/org/qortal/data/transaction/AccountLevelTransactionData.java index f465d7d0..3385ca8c 100644 --- a/src/main/java/org/qora/data/transaction/AccountLevelTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/AccountLevelTransactionData.java @@ -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; diff --git a/src/main/java/org/qora/data/transaction/AddGroupAdminTransactionData.java b/src/main/java/org/qortal/data/transaction/AddGroupAdminTransactionData.java similarity index 94% rename from src/main/java/org/qora/data/transaction/AddGroupAdminTransactionData.java rename to src/main/java/org/qortal/data/transaction/AddGroupAdminTransactionData.java index 0dc152e0..3c2930b6 100644 --- a/src/main/java/org/qora/data/transaction/AddGroupAdminTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/AddGroupAdminTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/ArbitraryTransactionData.java b/src/main/java/org/qortal/data/transaction/ArbitraryTransactionData.java similarity index 94% rename from src/main/java/org/qora/data/transaction/ArbitraryTransactionData.java rename to src/main/java/org/qortal/data/transaction/ArbitraryTransactionData.java index e2078e59..945767c9 100644 --- a/src/main/java/org/qora/data/transaction/ArbitraryTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/ArbitraryTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.util.List; @@ -7,8 +7,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.data.PaymentData; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.data.PaymentData; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/BaseTransactionData.java b/src/main/java/org/qortal/data/transaction/BaseTransactionData.java similarity index 90% rename from src/main/java/org/qora/data/transaction/BaseTransactionData.java rename to src/main/java/org/qortal/data/transaction/BaseTransactionData.java index 86da7b44..da56797e 100644 --- a/src/main/java/org/qora/data/transaction/BaseTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/BaseTransactionData.java @@ -1,8 +1,8 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; -import org.qora.transaction.Transaction.ApprovalStatus; +import org.qortal.transaction.Transaction.ApprovalStatus; public class BaseTransactionData extends TransactionData { diff --git a/src/main/java/org/qora/data/transaction/BuyNameTransactionData.java b/src/main/java/org/qortal/data/transaction/BuyNameTransactionData.java similarity index 94% rename from src/main/java/org/qora/data/transaction/BuyNameTransactionData.java rename to src/main/java/org/qortal/data/transaction/BuyNameTransactionData.java index c5b1ce53..f6545118 100644 --- a/src/main/java/org/qora/data/transaction/BuyNameTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/BuyNameTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; @@ -8,7 +8,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; @@ -25,7 +25,7 @@ public class BuyNameTransactionData extends TransactionData { @Schema(description = "selling price", example = "123.456") @XmlJavaTypeAdapter( type = BigDecimal.class, - value = org.qora.api.BigDecimalTypeAdapter.class + value = org.qortal.api.BigDecimalTypeAdapter.class ) private BigDecimal amount; @Schema(description = "seller's address", example = "QgV4s3xnzLhVBEJxcYui4u4q11yhUHsd9v") diff --git a/src/main/java/org/qora/data/transaction/CancelAssetOrderTransactionData.java b/src/main/java/org/qortal/data/transaction/CancelAssetOrderTransactionData.java similarity index 91% rename from src/main/java/org/qora/data/transaction/CancelAssetOrderTransactionData.java rename to src/main/java/org/qortal/data/transaction/CancelAssetOrderTransactionData.java index 54ffb738..5582d5a5 100644 --- a/src/main/java/org/qora/data/transaction/CancelAssetOrderTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CancelAssetOrderTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/CancelGroupBanTransactionData.java b/src/main/java/org/qortal/data/transaction/CancelGroupBanTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/CancelGroupBanTransactionData.java rename to src/main/java/org/qortal/data/transaction/CancelGroupBanTransactionData.java index 44800bbe..20af8321 100644 --- a/src/main/java/org/qora/data/transaction/CancelGroupBanTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CancelGroupBanTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/CancelGroupInviteTransactionData.java b/src/main/java/org/qortal/data/transaction/CancelGroupInviteTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/CancelGroupInviteTransactionData.java rename to src/main/java/org/qortal/data/transaction/CancelGroupInviteTransactionData.java index a2d2df45..3b3405c5 100644 --- a/src/main/java/org/qora/data/transaction/CancelGroupInviteTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CancelGroupInviteTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/CancelSellNameTransactionData.java b/src/main/java/org/qortal/data/transaction/CancelSellNameTransactionData.java similarity index 92% rename from src/main/java/org/qora/data/transaction/CancelSellNameTransactionData.java rename to src/main/java/org/qortal/data/transaction/CancelSellNameTransactionData.java index 2ce01daa..ff3d0a08 100644 --- a/src/main/java/org/qora/data/transaction/CancelSellNameTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CancelSellNameTransactionData.java @@ -1,10 +1,10 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/CreateAssetOrderTransactionData.java b/src/main/java/org/qortal/data/transaction/CreateAssetOrderTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/CreateAssetOrderTransactionData.java rename to src/main/java/org/qortal/data/transaction/CreateAssetOrderTransactionData.java index 29696976..6c6966f6 100644 --- a/src/main/java/org/qora/data/transaction/CreateAssetOrderTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CreateAssetOrderTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; @@ -7,8 +7,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import org.qora.block.BlockChain; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.block.BlockChain; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.AccessMode; diff --git a/src/main/java/org/qora/data/transaction/CreateGroupTransactionData.java b/src/main/java/org/qortal/data/transaction/CreateGroupTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/CreateGroupTransactionData.java rename to src/main/java/org/qortal/data/transaction/CreateGroupTransactionData.java index 7e7555d2..0ef6383b 100644 --- a/src/main/java/org/qora/data/transaction/CreateGroupTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CreateGroupTransactionData.java @@ -1,12 +1,12 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.AccessMode; diff --git a/src/main/java/org/qora/data/transaction/CreatePollTransactionData.java b/src/main/java/org/qortal/data/transaction/CreatePollTransactionData.java similarity index 87% rename from src/main/java/org/qora/data/transaction/CreatePollTransactionData.java rename to src/main/java/org/qortal/data/transaction/CreatePollTransactionData.java index 21831304..4df7d79d 100644 --- a/src/main/java/org/qora/data/transaction/CreatePollTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/CreatePollTransactionData.java @@ -1,13 +1,13 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.data.voting.PollOptionData; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.data.voting.PollOptionData; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/DeployAtTransactionData.java b/src/main/java/org/qortal/data/transaction/DeployAtTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/DeployAtTransactionData.java rename to src/main/java/org/qortal/data/transaction/DeployAtTransactionData.java index 58634a21..75557a30 100644 --- a/src/main/java/org/qora/data/transaction/DeployAtTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/DeployAtTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/GenesisTransactionData.java b/src/main/java/org/qortal/data/transaction/GenesisTransactionData.java similarity index 90% rename from src/main/java/org/qora/data/transaction/GenesisTransactionData.java rename to src/main/java/org/qortal/data/transaction/GenesisTransactionData.java index 83302b5e..3e644a70 100644 --- a/src/main/java/org/qora/data/transaction/GenesisTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/GenesisTransactionData.java @@ -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.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.asset.Asset; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.asset.Asset; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; @@ -45,7 +45,7 @@ public class GenesisTransactionData extends TransactionData { this.assetId = assetId; } - /** From repository (V1, where asset locked to QORA) */ + /** From repository (V1, where asset locked to QORT) */ public GenesisTransactionData(BaseTransactionData baseTransactionData, String recipient, BigDecimal amount) { this(baseTransactionData, recipient, amount, Asset.QORT); } diff --git a/src/main/java/org/qora/data/transaction/GroupApprovalTransactionData.java b/src/main/java/org/qortal/data/transaction/GroupApprovalTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/GroupApprovalTransactionData.java rename to src/main/java/org/qortal/data/transaction/GroupApprovalTransactionData.java index 53f76c96..fbf764de 100644 --- a/src/main/java/org/qora/data/transaction/GroupApprovalTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/GroupApprovalTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/GroupBanTransactionData.java b/src/main/java/org/qortal/data/transaction/GroupBanTransactionData.java similarity index 97% rename from src/main/java/org/qora/data/transaction/GroupBanTransactionData.java rename to src/main/java/org/qortal/data/transaction/GroupBanTransactionData.java index acc8b4ea..18b89f73 100644 --- a/src/main/java/org/qora/data/transaction/GroupBanTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/GroupBanTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/GroupInviteTransactionData.java b/src/main/java/org/qortal/data/transaction/GroupInviteTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/GroupInviteTransactionData.java rename to src/main/java/org/qortal/data/transaction/GroupInviteTransactionData.java index 3856f23a..bc1b515e 100644 --- a/src/main/java/org/qora/data/transaction/GroupInviteTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/GroupInviteTransactionData.java @@ -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,7 +6,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/GroupKickTransactionData.java b/src/main/java/org/qortal/data/transaction/GroupKickTransactionData.java similarity index 97% rename from src/main/java/org/qora/data/transaction/GroupKickTransactionData.java rename to src/main/java/org/qortal/data/transaction/GroupKickTransactionData.java index 299efc8a..aba68a15 100644 --- a/src/main/java/org/qora/data/transaction/GroupKickTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/GroupKickTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/IssueAssetTransactionData.java b/src/main/java/org/qortal/data/transaction/IssueAssetTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/IssueAssetTransactionData.java rename to src/main/java/org/qortal/data/transaction/IssueAssetTransactionData.java index 1f6c0d94..c2b06f0f 100644 --- a/src/main/java/org/qora/data/transaction/IssueAssetTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/IssueAssetTransactionData.java @@ -1,13 +1,13 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; 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; import io.swagger.v3.oas.annotations.media.Schema.AccessMode; diff --git a/src/main/java/org/qora/data/transaction/JoinGroupTransactionData.java b/src/main/java/org/qortal/data/transaction/JoinGroupTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/JoinGroupTransactionData.java rename to src/main/java/org/qortal/data/transaction/JoinGroupTransactionData.java index fced52a9..b64324ca 100644 --- a/src/main/java/org/qora/data/transaction/JoinGroupTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/JoinGroupTransactionData.java @@ -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,7 +6,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/LeaveGroupTransactionData.java b/src/main/java/org/qortal/data/transaction/LeaveGroupTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/LeaveGroupTransactionData.java rename to src/main/java/org/qortal/data/transaction/LeaveGroupTransactionData.java index 36fbedd6..46c6742d 100644 --- a/src/main/java/org/qora/data/transaction/LeaveGroupTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/LeaveGroupTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/MessageTransactionData.java b/src/main/java/org/qortal/data/transaction/MessageTransactionData.java similarity index 93% rename from src/main/java/org/qora/data/transaction/MessageTransactionData.java rename to src/main/java/org/qortal/data/transaction/MessageTransactionData.java index db5f3e08..a9849fc7 100644 --- a/src/main/java/org/qora/data/transaction/MessageTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/MessageTransactionData.java @@ -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.asset.Asset; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.asset.Asset; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/MultiPaymentTransactionData.java b/src/main/java/org/qortal/data/transaction/MultiPaymentTransactionData.java similarity index 87% rename from src/main/java/org/qora/data/transaction/MultiPaymentTransactionData.java rename to src/main/java/org/qortal/data/transaction/MultiPaymentTransactionData.java index c960c591..027116f5 100644 --- a/src/main/java/org/qora/data/transaction/MultiPaymentTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/MultiPaymentTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.util.List; @@ -6,9 +6,9 @@ import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.data.PaymentData; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.data.PaymentData; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/PaymentTransactionData.java b/src/main/java/org/qortal/data/transaction/PaymentTransactionData.java similarity index 91% rename from src/main/java/org/qora/data/transaction/PaymentTransactionData.java rename to src/main/java/org/qortal/data/transaction/PaymentTransactionData.java index 84f858dc..2cbe1fb5 100644 --- a/src/main/java/org/qora/data/transaction/PaymentTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/PaymentTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; 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.adapters.XmlJavaTypeAdapter; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; @@ -24,7 +24,7 @@ public class PaymentTransactionData extends TransactionData { @Schema(description = "amount to send", example = "123.456") @XmlJavaTypeAdapter( type = BigDecimal.class, - value = org.qora.api.BigDecimalTypeAdapter.class + value = org.qortal.api.BigDecimalTypeAdapter.class ) private BigDecimal amount; diff --git a/src/main/java/org/qora/data/transaction/RegisterNameTransactionData.java b/src/main/java/org/qortal/data/transaction/RegisterNameTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/RegisterNameTransactionData.java rename to src/main/java/org/qortal/data/transaction/RegisterNameTransactionData.java index 3c4d7f10..37cc65d2 100644 --- a/src/main/java/org/qora/data/transaction/RegisterNameTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/RegisterNameTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/RemoveGroupAdminTransactionData.java b/src/main/java/org/qortal/data/transaction/RemoveGroupAdminTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/RemoveGroupAdminTransactionData.java rename to src/main/java/org/qortal/data/transaction/RemoveGroupAdminTransactionData.java index d18e8cbe..4501488d 100644 --- a/src/main/java/org/qora/data/transaction/RemoveGroupAdminTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/RemoveGroupAdminTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/RewardShareTransactionData.java b/src/main/java/org/qortal/data/transaction/RewardShareTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/RewardShareTransactionData.java rename to src/main/java/org/qortal/data/transaction/RewardShareTransactionData.java index ab79111b..224957f6 100644 --- a/src/main/java/org/qora/data/transaction/RewardShareTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/RewardShareTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; @@ -8,7 +8,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/SellNameTransactionData.java b/src/main/java/org/qortal/data/transaction/SellNameTransactionData.java similarity index 91% rename from src/main/java/org/qora/data/transaction/SellNameTransactionData.java rename to src/main/java/org/qortal/data/transaction/SellNameTransactionData.java index b59cdb19..aad7fbd8 100644 --- a/src/main/java/org/qora/data/transaction/SellNameTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/SellNameTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; 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.adapters.XmlJavaTypeAdapter; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; @@ -24,7 +24,7 @@ public class SellNameTransactionData extends TransactionData { @Schema(description = "selling price", example = "123.456") @XmlJavaTypeAdapter( type = BigDecimal.class, - value = org.qora.api.BigDecimalTypeAdapter.class + value = org.qortal.api.BigDecimalTypeAdapter.class ) private BigDecimal amount; diff --git a/src/main/java/org/qora/data/transaction/SetGroupTransactionData.java b/src/main/java/org/qortal/data/transaction/SetGroupTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/SetGroupTransactionData.java rename to src/main/java/org/qortal/data/transaction/SetGroupTransactionData.java index e068dd70..f971bb08 100644 --- a/src/main/java/org/qora/data/transaction/SetGroupTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/SetGroupTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; 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.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/TransactionData.java b/src/main/java/org/qortal/data/transaction/TransactionData.java similarity index 97% rename from src/main/java/org/qora/data/transaction/TransactionData.java rename to src/main/java/org/qortal/data/transaction/TransactionData.java index 50b92fb8..a5d25b88 100644 --- a/src/main/java/org/qora/data/transaction/TransactionData.java +++ b/src/main/java/org/qortal/data/transaction/TransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; import java.math.BigInteger; @@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorNode; -import org.qora.crypto.Crypto; -import org.qora.transaction.Transaction.ApprovalStatus; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.crypto.Crypto; +import org.qortal.transaction.Transaction.ApprovalStatus; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.AccessMode; diff --git a/src/main/java/org/qora/data/transaction/TransferAssetTransactionData.java b/src/main/java/org/qortal/data/transaction/TransferAssetTransactionData.java similarity index 95% rename from src/main/java/org/qora/data/transaction/TransferAssetTransactionData.java rename to src/main/java/org/qortal/data/transaction/TransferAssetTransactionData.java index 411191e2..b1392ca3 100644 --- a/src/main/java/org/qora/data/transaction/TransferAssetTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/TransferAssetTransactionData.java @@ -1,4 +1,4 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import java.math.BigDecimal; @@ -6,7 +6,7 @@ import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.AccessMode; diff --git a/src/main/java/org/qora/data/transaction/TransferPrivsTransactionData.java b/src/main/java/org/qortal/data/transaction/TransferPrivsTransactionData.java similarity index 97% rename from src/main/java/org/qora/data/transaction/TransferPrivsTransactionData.java rename to src/main/java/org/qortal/data/transaction/TransferPrivsTransactionData.java index 3d4ac28f..bd2ea5bb 100644 --- a/src/main/java/org/qora/data/transaction/TransferPrivsTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/TransferPrivsTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/UpdateAssetTransactionData.java b/src/main/java/org/qortal/data/transaction/UpdateAssetTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/UpdateAssetTransactionData.java rename to src/main/java/org/qortal/data/transaction/UpdateAssetTransactionData.java index 69c1e799..70c3a969 100644 --- a/src/main/java/org/qora/data/transaction/UpdateAssetTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/UpdateAssetTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/UpdateGroupTransactionData.java b/src/main/java/org/qortal/data/transaction/UpdateGroupTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/UpdateGroupTransactionData.java rename to src/main/java/org/qortal/data/transaction/UpdateGroupTransactionData.java index 066da097..871a8339 100644 --- a/src/main/java/org/qora/data/transaction/UpdateGroupTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/UpdateGroupTransactionData.java @@ -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,8 +6,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.eclipse.persistence.oxm.annotations.XmlDiscriminatorValue; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/UpdateNameTransactionData.java b/src/main/java/org/qortal/data/transaction/UpdateNameTransactionData.java similarity index 96% rename from src/main/java/org/qora/data/transaction/UpdateNameTransactionData.java rename to src/main/java/org/qortal/data/transaction/UpdateNameTransactionData.java index 3974d40a..70c7404d 100644 --- a/src/main/java/org/qora/data/transaction/UpdateNameTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/UpdateNameTransactionData.java @@ -1,11 +1,11 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/transaction/VoteOnPollTransactionData.java b/src/main/java/org/qortal/data/transaction/VoteOnPollTransactionData.java similarity index 94% rename from src/main/java/org/qora/data/transaction/VoteOnPollTransactionData.java rename to src/main/java/org/qortal/data/transaction/VoteOnPollTransactionData.java index 620b8446..6145d741 100644 --- a/src/main/java/org/qora/data/transaction/VoteOnPollTransactionData.java +++ b/src/main/java/org/qortal/data/transaction/VoteOnPollTransactionData.java @@ -1,10 +1,10 @@ -package org.qora.data.transaction; +package org.qortal.data.transaction; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.TransactionType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/data/voting/PollData.java b/src/main/java/org/qortal/data/voting/PollData.java similarity index 97% rename from src/main/java/org/qora/data/voting/PollData.java rename to src/main/java/org/qortal/data/voting/PollData.java index 8723bfce..4af62087 100644 --- a/src/main/java/org/qora/data/voting/PollData.java +++ b/src/main/java/org/qortal/data/voting/PollData.java @@ -1,4 +1,4 @@ -package org.qora.data.voting; +package org.qortal.data.voting; import java.util.List; diff --git a/src/main/java/org/qora/data/voting/PollOptionData.java b/src/main/java/org/qortal/data/voting/PollOptionData.java similarity index 93% rename from src/main/java/org/qora/data/voting/PollOptionData.java rename to src/main/java/org/qortal/data/voting/PollOptionData.java index fc085f3d..dff9ecf2 100644 --- a/src/main/java/org/qora/data/voting/PollOptionData.java +++ b/src/main/java/org/qortal/data/voting/PollOptionData.java @@ -1,4 +1,4 @@ -package org.qora.data.voting; +package org.qortal.data.voting; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/org/qora/data/voting/VoteOnPollData.java b/src/main/java/org/qortal/data/voting/VoteOnPollData.java similarity index 94% rename from src/main/java/org/qora/data/voting/VoteOnPollData.java rename to src/main/java/org/qortal/data/voting/VoteOnPollData.java index a7fd532a..47c06a54 100644 --- a/src/main/java/org/qora/data/voting/VoteOnPollData.java +++ b/src/main/java/org/qortal/data/voting/VoteOnPollData.java @@ -1,4 +1,4 @@ -package org.qora.data.voting; +package org.qortal.data.voting; public class VoteOnPollData { diff --git a/src/main/java/org/qora/globalization/BIP39WordList.java b/src/main/java/org/qortal/globalization/BIP39WordList.java similarity index 97% rename from src/main/java/org/qora/globalization/BIP39WordList.java rename to src/main/java/org/qortal/globalization/BIP39WordList.java index 134170d0..f5228b2c 100644 --- a/src/main/java/org/qora/globalization/BIP39WordList.java +++ b/src/main/java/org/qortal/globalization/BIP39WordList.java @@ -1,4 +1,4 @@ -package org.qora.globalization; +package org.qortal.globalization; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/qora/globalization/Translator.java b/src/main/java/org/qortal/globalization/Translator.java similarity index 98% rename from src/main/java/org/qora/globalization/Translator.java rename to src/main/java/org/qortal/globalization/Translator.java index a5b6836e..955f95cb 100644 --- a/src/main/java/org/qora/globalization/Translator.java +++ b/src/main/java/org/qortal/globalization/Translator.java @@ -1,4 +1,4 @@ -package org.qora.globalization; +package org.qortal.globalization; import java.util.HashMap; import java.util.Locale; diff --git a/src/main/java/org/qora/group/Group.java b/src/main/java/org/qortal/group/Group.java similarity index 96% rename from src/main/java/org/qora/group/Group.java rename to src/main/java/org/qortal/group/Group.java index bb182b60..f00be199 100644 --- a/src/main/java/org/qora/group/Group.java +++ b/src/main/java/org/qortal/group/Group.java @@ -1,4 +1,4 @@ -package org.qora.group; +package org.qortal.group; import static java.util.Arrays.stream; import static java.util.stream.Collectors.toMap; @@ -6,29 +6,29 @@ import static java.util.stream.Collectors.toMap; import java.util.Arrays; import java.util.Map; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -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.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.TransactionData; -import org.qora.data.transaction.UpdateGroupTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.GroupRepository; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +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.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.TransactionData; +import org.qortal.data.transaction.UpdateGroupTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.GroupRepository; +import org.qortal.repository.Repository; public class Group { diff --git a/src/main/java/org/qora/gui/Gui.java b/src/main/java/org/qortal/gui/Gui.java similarity index 99% rename from src/main/java/org/qora/gui/Gui.java rename to src/main/java/org/qortal/gui/Gui.java index 864046cb..118718e2 100644 --- a/src/main/java/org/qora/gui/Gui.java +++ b/src/main/java/org/qortal/gui/Gui.java @@ -1,4 +1,4 @@ -package org.qora.gui; +package org.qortal.gui; import java.awt.GraphicsEnvironment; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/qora/gui/SplashFrame.java b/src/main/java/org/qortal/gui/SplashFrame.java similarity index 98% rename from src/main/java/org/qora/gui/SplashFrame.java rename to src/main/java/org/qortal/gui/SplashFrame.java index dbf1f0c5..e0859030 100644 --- a/src/main/java/org/qora/gui/SplashFrame.java +++ b/src/main/java/org/qortal/gui/SplashFrame.java @@ -1,4 +1,4 @@ -package org.qora.gui; +package org.qortal.gui; import java.awt.BorderLayout; import java.awt.Image; diff --git a/src/main/java/org/qora/gui/SysTray.java b/src/main/java/org/qortal/gui/SysTray.java similarity index 96% rename from src/main/java/org/qora/gui/SysTray.java rename to src/main/java/org/qortal/gui/SysTray.java index 8235abd7..70b7d1f0 100644 --- a/src/main/java/org/qora/gui/SysTray.java +++ b/src/main/java/org/qortal/gui/SysTray.java @@ -1,4 +1,4 @@ -package org.qora.gui; +package org.qortal.gui; import java.awt.AWTError; import java.awt.AWTException; @@ -27,11 +27,11 @@ import javax.swing.event.PopupMenuListener; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.controller.Controller; -import org.qora.globalization.Translator; -import org.qora.settings.Settings; -import org.qora.ui.UiService; -import org.qora.utils.URLViewer; +import org.qortal.controller.Controller; +import org.qortal.globalization.Translator; +import org.qortal.settings.Settings; +import org.qortal.ui.UiService; +import org.qortal.utils.URLViewer; public class SysTray { diff --git a/src/main/java/org/qora/naming/Name.java b/src/main/java/org/qortal/naming/Name.java similarity index 92% rename from src/main/java/org/qora/naming/Name.java rename to src/main/java/org/qortal/naming/Name.java index 2741258c..f16c51fd 100644 --- a/src/main/java/org/qora/naming/Name.java +++ b/src/main/java/org/qortal/naming/Name.java @@ -1,17 +1,17 @@ -package org.qora.naming; +package org.qortal.naming; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -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.TransactionData; -import org.qora.data.transaction.UpdateNameTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +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.TransactionData; +import org.qortal.data.transaction.UpdateNameTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class Name { diff --git a/src/main/java/org/qora/network/Handshake.java b/src/main/java/org/qortal/network/Handshake.java similarity index 95% rename from src/main/java/org/qora/network/Handshake.java rename to src/main/java/org/qortal/network/Handshake.java index 67af9cd7..b82c75e4 100644 --- a/src/main/java/org/qora/network/Handshake.java +++ b/src/main/java/org/qortal/network/Handshake.java @@ -1,17 +1,17 @@ -package org.qora.network; +package org.qortal.network; import java.util.Arrays; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.controller.Controller; -import org.qora.network.message.Message; -import org.qora.network.message.Message.MessageType; -import org.qora.network.message.PeerIdMessage; -import org.qora.network.message.PeerVerifyMessage; -import org.qora.network.message.ProofMessage; -import org.qora.network.message.VerificationCodesMessage; -import org.qora.network.message.VersionMessage; +import org.qortal.controller.Controller; +import org.qortal.network.message.Message; +import org.qortal.network.message.PeerIdMessage; +import org.qortal.network.message.PeerVerifyMessage; +import org.qortal.network.message.ProofMessage; +import org.qortal.network.message.VerificationCodesMessage; +import org.qortal.network.message.VersionMessage; +import org.qortal.network.message.Message.MessageType; public enum Handshake { STARTED(null) { diff --git a/src/main/java/org/qora/network/Network.java b/src/main/java/org/qortal/network/Network.java similarity index 96% rename from src/main/java/org/qora/network/Network.java rename to src/main/java/org/qortal/network/Network.java index b4ff9d44..424c6802 100644 --- a/src/main/java/org/qora/network/Network.java +++ b/src/main/java/org/qortal/network/Network.java @@ -1,4 +1,4 @@ -package org.qora.network; +package org.qortal.network; import java.io.IOException; import java.net.Inet6Address; @@ -33,30 +33,30 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.block.BlockChain; -import org.qora.controller.Controller; -import org.qora.data.block.BlockData; -import org.qora.data.network.PeerData; -import org.qora.data.transaction.TransactionData; -import org.qora.network.message.GetPeersMessage; -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.Message.MessageType; -import org.qora.network.message.PeerVerifyMessage; -import org.qora.network.message.PeersMessage; -import org.qora.network.message.PeersV2Message; -import org.qora.network.message.PingMessage; -import org.qora.network.message.TransactionMessage; -import org.qora.network.message.TransactionSignaturesMessage; -import org.qora.network.message.VerificationCodesMessage; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.settings.Settings; -import org.qora.utils.ExecuteProduceConsume; -import org.qora.utils.NTP; +import org.qortal.block.BlockChain; +import org.qortal.controller.Controller; +import org.qortal.data.block.BlockData; +import org.qortal.data.network.PeerData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.network.message.GetPeersMessage; +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.PeerVerifyMessage; +import org.qortal.network.message.PeersMessage; +import org.qortal.network.message.PeersV2Message; +import org.qortal.network.message.PingMessage; +import org.qortal.network.message.TransactionMessage; +import org.qortal.network.message.TransactionSignaturesMessage; +import org.qortal.network.message.VerificationCodesMessage; +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.settings.Settings; +import org.qortal.utils.ExecuteProduceConsume; +import org.qortal.utils.NTP; // For managing peers public class Network { @@ -954,7 +954,7 @@ public class Network { try { InetAddress address = InetAddress.getByName(peerData.getAddress().getHost()); - // Don't send 'local' addresses if peer is not 'local'. e.g. don't send localhost:9084 to node4.qora.org + // Don't send 'local' addresses if peer is not 'local'. e.g. don't send localhost:9084 to node4.qortal.org if (!peer.getIsLocal() && Peer.isAddressLocal(address)) continue; @@ -980,7 +980,7 @@ public class Network { if (address instanceof Inet6Address) continue; - // Don't send 'local' addresses if peer is not 'local'. e.g. don't send localhost:9084 to node4.qora.org + // Don't send 'local' addresses if peer is not 'local'. e.g. don't send localhost:9084 to node4.qortal.org if (!peer.getIsLocal() && !Peer.isAddressLocal(address)) continue; diff --git a/src/main/java/org/qora/network/Peer.java b/src/main/java/org/qortal/network/Peer.java similarity index 95% rename from src/main/java/org/qora/network/Peer.java rename to src/main/java/org/qortal/network/Peer.java index 66655772..34a4f570 100644 --- a/src/main/java/org/qora/network/Peer.java +++ b/src/main/java/org/qortal/network/Peer.java @@ -1,4 +1,4 @@ -package org.qora.network; +package org.qortal.network; import java.io.IOException; import java.net.InetAddress; @@ -20,17 +20,16 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.controller.Controller; -import org.qora.data.network.PeerChainTipData; -import org.qora.data.network.PeerData; -import org.qora.network.message.Message; -import org.qora.network.message.Message.MessageException; -import org.qora.network.message.Message.MessageType; -import org.qora.settings.Settings; -import org.qora.utils.ExecuteProduceConsume; -import org.qora.utils.NTP; -import org.qora.network.message.PingMessage; -import org.qora.network.message.VersionMessage; +import org.qortal.data.network.PeerChainTipData; +import org.qortal.data.network.PeerData; +import org.qortal.network.message.Message; +import org.qortal.network.message.PingMessage; +import org.qortal.network.message.VersionMessage; +import org.qortal.network.message.Message.MessageException; +import org.qortal.network.message.Message.MessageType; +import org.qortal.settings.Settings; +import org.qortal.utils.ExecuteProduceConsume; +import org.qortal.utils.NTP; import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; @@ -53,6 +52,9 @@ public class Peer { */ private static final int PING_INTERVAL = 20_000; // ms + /** Threshold for buildTimestamp in VERSION messages where we consider peer to be using v2 protocol. */ + private static final long V2_PROTOCOL_TIMESTAMP_THRESHOLD = 1546300800L; // midnight starting 1st Jan 2019 + private volatile boolean isStopping = false; private SocketChannel socketChannel = null; @@ -153,7 +155,7 @@ public class Peer { public void setVersionMessage(VersionMessage versionMessage) { this.versionMessage = versionMessage; - if (this.versionMessage.getVersionString().startsWith(Controller.VERSION_PREFIX)) { + if (this.versionMessage.getBuildTimestamp() >= V2_PROTOCOL_TIMESTAMP_THRESHOLD) { this.version = 2; // enhanced protocol } else { this.version = 1; // legacy protocol diff --git a/src/main/java/org/qora/network/PeerAddress.java b/src/main/java/org/qortal/network/PeerAddress.java similarity index 98% rename from src/main/java/org/qora/network/PeerAddress.java rename to src/main/java/org/qortal/network/PeerAddress.java index ed7085c7..332ff484 100644 --- a/src/main/java/org/qora/network/PeerAddress.java +++ b/src/main/java/org/qortal/network/PeerAddress.java @@ -1,4 +1,4 @@ -package org.qora.network; +package org.qortal.network; import java.net.Inet6Address; import java.net.InetAddress; @@ -9,7 +9,7 @@ import java.net.UnknownHostException; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.qora.settings.Settings; +import org.qortal.settings.Settings; import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; diff --git a/src/main/java/org/qora/network/Proof.java b/src/main/java/org/qortal/network/Proof.java similarity index 97% rename from src/main/java/org/qora/network/Proof.java rename to src/main/java/org/qortal/network/Proof.java index db4b035e..082f0bce 100644 --- a/src/main/java/org/qora/network/Proof.java +++ b/src/main/java/org/qortal/network/Proof.java @@ -1,11 +1,11 @@ -package org.qora.network; +package org.qortal.network; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.HashSet; -import org.qora.network.message.ProofMessage; +import org.qortal.network.message.ProofMessage; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/network/message/ArbitraryDataMessage.java b/src/main/java/org/qortal/network/message/ArbitraryDataMessage.java similarity index 95% rename from src/main/java/org/qora/network/message/ArbitraryDataMessage.java rename to src/main/java/org/qortal/network/message/ArbitraryDataMessage.java index 83946cf7..1ce149f7 100644 --- a/src/main/java/org/qora/network/message/ArbitraryDataMessage.java +++ b/src/main/java/org/qortal/network/message/ArbitraryDataMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; +import org.qortal.transform.Transformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/BlockMessage.java b/src/main/java/org/qortal/network/message/BlockMessage.java similarity index 86% rename from src/main/java/org/qora/network/message/BlockMessage.java rename to src/main/java/org/qortal/network/message/BlockMessage.java index 885e976d..8ca86ee6 100644 --- a/src/main/java/org/qora/network/message/BlockMessage.java +++ b/src/main/java/org/qortal/network/message/BlockMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,13 +8,13 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.block.Block; -import org.qora.data.at.ATStateData; -import org.qora.data.block.BlockData; -import org.qora.data.transaction.TransactionData; -import org.qora.transform.TransformationException; -import org.qora.transform.block.BlockTransformer; -import org.qora.utils.Triple; +import org.qortal.block.Block; +import org.qortal.data.at.ATStateData; +import org.qortal.data.block.BlockData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transform.TransformationException; +import org.qortal.transform.block.BlockTransformer; +import org.qortal.utils.Triple; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/BlockSummariesMessage.java b/src/main/java/org/qortal/network/message/BlockSummariesMessage.java similarity index 92% rename from src/main/java/org/qora/network/message/BlockSummariesMessage.java rename to src/main/java/org/qortal/network/message/BlockSummariesMessage.java index 80224a4c..6a30608b 100644 --- a/src/main/java/org/qora/network/message/BlockSummariesMessage.java +++ b/src/main/java/org/qortal/network/message/BlockSummariesMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,9 +7,9 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.data.block.BlockSummaryData; -import org.qora.transform.Transformer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.data.block.BlockSummaryData; +import org.qortal.transform.Transformer; +import org.qortal.transform.block.BlockTransformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/GetArbitraryDataMessage.java b/src/main/java/org/qortal/network/message/GetArbitraryDataMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/GetArbitraryDataMessage.java rename to src/main/java/org/qortal/network/message/GetArbitraryDataMessage.java index b67bc9c5..689d704b 100644 --- a/src/main/java/org/qora/network/message/GetArbitraryDataMessage.java +++ b/src/main/java/org/qortal/network/message/GetArbitraryDataMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; +import org.qortal.transform.Transformer; public class GetArbitraryDataMessage extends Message { diff --git a/src/main/java/org/qora/network/message/GetBlockMessage.java b/src/main/java/org/qortal/network/message/GetBlockMessage.java similarity index 92% rename from src/main/java/org/qora/network/message/GetBlockMessage.java rename to src/main/java/org/qortal/network/message/GetBlockMessage.java index 3813d5ee..43484e69 100644 --- a/src/main/java/org/qora/network/message/GetBlockMessage.java +++ b/src/main/java/org/qortal/network/message/GetBlockMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.block.BlockTransformer; public class GetBlockMessage extends Message { diff --git a/src/main/java/org/qora/network/message/GetBlockSummariesMessage.java b/src/main/java/org/qortal/network/message/GetBlockSummariesMessage.java similarity index 92% rename from src/main/java/org/qora/network/message/GetBlockSummariesMessage.java rename to src/main/java/org/qortal/network/message/GetBlockSummariesMessage.java index c5d0d730..148640fd 100644 --- a/src/main/java/org/qora/network/message/GetBlockSummariesMessage.java +++ b/src/main/java/org/qortal/network/message/GetBlockSummariesMessage.java @@ -1,12 +1,12 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.Transformer; +import org.qortal.transform.block.BlockTransformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/GetOnlineAccountsMessage.java b/src/main/java/org/qortal/network/message/GetOnlineAccountsMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/GetOnlineAccountsMessage.java rename to src/main/java/org/qortal/network/message/GetOnlineAccountsMessage.java index e6e76113..dcb24fec 100644 --- a/src/main/java/org/qora/network/message/GetOnlineAccountsMessage.java +++ b/src/main/java/org/qortal/network/message/GetOnlineAccountsMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,8 +7,8 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.data.network.OnlineAccountData; -import org.qora.transform.Transformer; +import org.qortal.data.network.OnlineAccountData; +import org.qortal.transform.Transformer; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/network/message/GetPeersMessage.java b/src/main/java/org/qortal/network/message/GetPeersMessage.java similarity index 92% rename from src/main/java/org/qora/network/message/GetPeersMessage.java rename to src/main/java/org/qortal/network/message/GetPeersMessage.java index 1ddb1eb5..21b06df5 100644 --- a/src/main/java/org/qora/network/message/GetPeersMessage.java +++ b/src/main/java/org/qortal/network/message/GetPeersMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/qora/network/message/GetSignaturesMessage.java b/src/main/java/org/qortal/network/message/GetSignaturesMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/GetSignaturesMessage.java rename to src/main/java/org/qortal/network/message/GetSignaturesMessage.java index 5379abcd..5d1a9ccf 100644 --- a/src/main/java/org/qora/network/message/GetSignaturesMessage.java +++ b/src/main/java/org/qortal/network/message/GetSignaturesMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.block.BlockTransformer; public class GetSignaturesMessage extends Message { diff --git a/src/main/java/org/qora/network/message/GetSignaturesV2Message.java b/src/main/java/org/qortal/network/message/GetSignaturesV2Message.java similarity index 92% rename from src/main/java/org/qora/network/message/GetSignaturesV2Message.java rename to src/main/java/org/qortal/network/message/GetSignaturesV2Message.java index fde3b253..2dc54365 100644 --- a/src/main/java/org/qora/network/message/GetSignaturesV2Message.java +++ b/src/main/java/org/qortal/network/message/GetSignaturesV2Message.java @@ -1,12 +1,12 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.Transformer; +import org.qortal.transform.block.BlockTransformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/GetTransactionMessage.java b/src/main/java/org/qortal/network/message/GetTransactionMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/GetTransactionMessage.java rename to src/main/java/org/qortal/network/message/GetTransactionMessage.java index 0839130b..2ea06580 100644 --- a/src/main/java/org/qora/network/message/GetTransactionMessage.java +++ b/src/main/java/org/qortal/network/message/GetTransactionMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; +import org.qortal.transform.Transformer; public class GetTransactionMessage extends Message { diff --git a/src/main/java/org/qora/network/message/GetUnconfirmedTransactionsMessage.java b/src/main/java/org/qortal/network/message/GetUnconfirmedTransactionsMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/GetUnconfirmedTransactionsMessage.java rename to src/main/java/org/qortal/network/message/GetUnconfirmedTransactionsMessage.java index 8c6e2b27..18260568 100644 --- a/src/main/java/org/qora/network/message/GetUnconfirmedTransactionsMessage.java +++ b/src/main/java/org/qortal/network/message/GetUnconfirmedTransactionsMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/qora/network/message/HeightMessage.java b/src/main/java/org/qortal/network/message/HeightMessage.java similarity index 96% rename from src/main/java/org/qora/network/message/HeightMessage.java rename to src/main/java/org/qortal/network/message/HeightMessage.java index 8d599f05..36b0d012 100644 --- a/src/main/java/org/qora/network/message/HeightMessage.java +++ b/src/main/java/org/qortal/network/message/HeightMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/qora/network/message/HeightV2Message.java b/src/main/java/org/qortal/network/message/HeightV2Message.java similarity index 93% rename from src/main/java/org/qora/network/message/HeightV2Message.java rename to src/main/java/org/qortal/network/message/HeightV2Message.java index 8a2538de..4d6f3f21 100644 --- a/src/main/java/org/qora/network/message/HeightV2Message.java +++ b/src/main/java/org/qortal/network/message/HeightV2Message.java @@ -1,12 +1,12 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.transform.Transformer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.Transformer; +import org.qortal.transform.block.BlockTransformer; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/network/message/Message.java b/src/main/java/org/qortal/network/message/Message.java similarity index 98% rename from src/main/java/org/qora/network/message/Message.java rename to src/main/java/org/qortal/network/message/Message.java index 3aadae80..4645b9e0 100644 --- a/src/main/java/org/qora/network/message/Message.java +++ b/src/main/java/org/qortal/network/message/Message.java @@ -1,9 +1,9 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.util.Map; -import org.qora.crypto.Crypto; -import org.qora.network.Network; +import org.qortal.crypto.Crypto; +import org.qortal.network.Network; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/OnlineAccountsMessage.java b/src/main/java/org/qortal/network/message/OnlineAccountsMessage.java similarity index 94% rename from src/main/java/org/qora/network/message/OnlineAccountsMessage.java rename to src/main/java/org/qortal/network/message/OnlineAccountsMessage.java index 9c7d410d..75109a0a 100644 --- a/src/main/java/org/qora/network/message/OnlineAccountsMessage.java +++ b/src/main/java/org/qortal/network/message/OnlineAccountsMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,8 +7,8 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.data.network.OnlineAccountData; -import org.qora.transform.Transformer; +import org.qortal.data.network.OnlineAccountData; +import org.qortal.transform.Transformer; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/network/message/PeerIdMessage.java b/src/main/java/org/qortal/network/message/PeerIdMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/PeerIdMessage.java rename to src/main/java/org/qortal/network/message/PeerIdMessage.java index 75ce0392..bcb1246e 100644 --- a/src/main/java/org/qora/network/message/PeerIdMessage.java +++ b/src/main/java/org/qortal/network/message/PeerIdMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.network.Network; +import org.qortal.network.Network; public class PeerIdMessage extends Message { diff --git a/src/main/java/org/qora/network/message/PeerVerifyMessage.java b/src/main/java/org/qortal/network/message/PeerVerifyMessage.java similarity index 93% rename from src/main/java/org/qora/network/message/PeerVerifyMessage.java rename to src/main/java/org/qortal/network/message/PeerVerifyMessage.java index 84d39454..a77ce3c6 100644 --- a/src/main/java/org/qora/network/message/PeerVerifyMessage.java +++ b/src/main/java/org/qortal/network/message/PeerVerifyMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.network.Network; +import org.qortal.network.Network; public class PeerVerifyMessage extends Message { diff --git a/src/main/java/org/qora/network/message/PeersMessage.java b/src/main/java/org/qortal/network/message/PeersMessage.java similarity index 98% rename from src/main/java/org/qora/network/message/PeersMessage.java rename to src/main/java/org/qortal/network/message/PeersMessage.java index 43c100e9..45d8f837 100644 --- a/src/main/java/org/qora/network/message/PeersMessage.java +++ b/src/main/java/org/qortal/network/message/PeersMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/qora/network/message/PeersV2Message.java b/src/main/java/org/qortal/network/message/PeersV2Message.java similarity index 95% rename from src/main/java/org/qora/network/message/PeersV2Message.java rename to src/main/java/org/qortal/network/message/PeersV2Message.java index c50dbe2b..bfea87c7 100644 --- a/src/main/java/org/qora/network/message/PeersV2Message.java +++ b/src/main/java/org/qortal/network/message/PeersV2Message.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,8 +8,8 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import org.qora.network.PeerAddress; -import org.qora.settings.Settings; +import org.qortal.network.PeerAddress; +import org.qortal.settings.Settings; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/PingMessage.java b/src/main/java/org/qortal/network/message/PingMessage.java similarity index 92% rename from src/main/java/org/qora/network/message/PingMessage.java rename to src/main/java/org/qortal/network/message/PingMessage.java index 4a9203fa..ddec0fd7 100644 --- a/src/main/java/org/qora/network/message/PingMessage.java +++ b/src/main/java/org/qortal/network/message/PingMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/qora/network/message/ProofMessage.java b/src/main/java/org/qortal/network/message/ProofMessage.java similarity index 97% rename from src/main/java/org/qora/network/message/ProofMessage.java rename to src/main/java/org/qortal/network/message/ProofMessage.java index a0135113..dc67f948 100644 --- a/src/main/java/org/qora/network/message/ProofMessage.java +++ b/src/main/java/org/qortal/network/message/ProofMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/qora/network/message/SignaturesMessage.java b/src/main/java/org/qortal/network/message/SignaturesMessage.java similarity index 94% rename from src/main/java/org/qora/network/message/SignaturesMessage.java rename to src/main/java/org/qortal/network/message/SignaturesMessage.java index efe1cdad..008f4c1a 100644 --- a/src/main/java/org/qora/network/message/SignaturesMessage.java +++ b/src/main/java/org/qortal/network/message/SignaturesMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,7 +7,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.transform.block.BlockTransformer; +import org.qortal.transform.block.BlockTransformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/TransactionMessage.java b/src/main/java/org/qortal/network/message/TransactionMessage.java similarity index 83% rename from src/main/java/org/qora/network/message/TransactionMessage.java rename to src/main/java/org/qortal/network/message/TransactionMessage.java index a492f6d2..92cce086 100644 --- a/src/main/java/org/qora/network/message/TransactionMessage.java +++ b/src/main/java/org/qortal/network/message/TransactionMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.data.transaction.TransactionData; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.TransactionTransformer; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.TransactionTransformer; public class TransactionMessage extends Message { diff --git a/src/main/java/org/qora/network/message/TransactionSignaturesMessage.java b/src/main/java/org/qortal/network/message/TransactionSignaturesMessage.java similarity index 95% rename from src/main/java/org/qora/network/message/TransactionSignaturesMessage.java rename to src/main/java/org/qortal/network/message/TransactionSignaturesMessage.java index 69cdc412..082a7187 100644 --- a/src/main/java/org/qora/network/message/TransactionSignaturesMessage.java +++ b/src/main/java/org/qortal/network/message/TransactionSignaturesMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,7 +7,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.transform.Transformer; +import org.qortal.transform.Transformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/network/message/VerificationCodesMessage.java b/src/main/java/org/qortal/network/message/VerificationCodesMessage.java similarity index 96% rename from src/main/java/org/qora/network/message/VerificationCodesMessage.java rename to src/main/java/org/qortal/network/message/VerificationCodesMessage.java index f09f165d..b75e8930 100644 --- a/src/main/java/org/qora/network/message/VerificationCodesMessage.java +++ b/src/main/java/org/qortal/network/message/VerificationCodesMessage.java @@ -1,11 +1,11 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import org.qora.network.Network; +import org.qortal.network.Network; public class VerificationCodesMessage extends Message { diff --git a/src/main/java/org/qora/network/message/VersionMessage.java b/src/main/java/org/qortal/network/message/VersionMessage.java similarity index 95% rename from src/main/java/org/qora/network/message/VersionMessage.java rename to src/main/java/org/qortal/network/message/VersionMessage.java index f0550330..cdd8f514 100644 --- a/src/main/java/org/qora/network/message/VersionMessage.java +++ b/src/main/java/org/qortal/network/message/VersionMessage.java @@ -1,4 +1,4 @@ -package org.qora.network.message; +package org.qortal.network.message; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,7 +6,7 @@ import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import org.qora.utils.Serialization; +import org.qortal.utils.Serialization; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/payment/Payment.java b/src/main/java/org/qortal/payment/Payment.java similarity index 94% rename from src/main/java/org/qora/payment/Payment.java rename to src/main/java/org/qortal/payment/Payment.java index ee6a63af..f843e546 100644 --- a/src/main/java/org/qora/payment/Payment.java +++ b/src/main/java/org/qortal/payment/Payment.java @@ -1,4 +1,4 @@ -package org.qora.payment; +package org.qortal.payment; import java.math.BigDecimal; import java.util.Arrays; @@ -8,17 +8,17 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.PaymentData; -import org.qora.data.asset.AssetData; -import org.qora.data.at.ATData; -import org.qora.repository.AssetRepository; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transaction.Transaction.ValidationResult; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.PaymentData; +import org.qortal.data.asset.AssetData; +import org.qortal.data.at.ATData; +import org.qortal.repository.AssetRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transaction.Transaction.ValidationResult; public class Payment { @@ -194,7 +194,7 @@ public class Payment { long assetId = paymentData.getAssetId(); - // For QORA amounts only: if recipient has no reference yet, then this is their starting reference + // For QORT amounts only: if recipient has no reference yet, then this is their starting reference if ((alwaysInitializeRecipientReference || assetId == Asset.QORT) && recipient.getLastReference() == null) recipient.setLastReference(signature); } @@ -247,7 +247,7 @@ public class Payment { long assetId = paymentData.getAssetId(); /* - * For QORA amounts only: If recipient's last reference is this transaction's signature, then they can't have made any transactions of their own + * For QORT amounts only: If recipient's last reference is this transaction's signature, then they can't have made any transactions of their own * (which would have changed their last reference) thus this is their first reference so remove it. */ if ((alwaysUninitializeRecipientReference || assetId == Asset.QORT) && Arrays.equals(recipient.getLastReference(), signature)) diff --git a/src/main/java/org/qora/repository/ATRepository.java b/src/main/java/org/qortal/repository/ATRepository.java similarity index 96% rename from src/main/java/org/qora/repository/ATRepository.java rename to src/main/java/org/qortal/repository/ATRepository.java index 60b83fba..9653fc6c 100644 --- a/src/main/java/org/qora/repository/ATRepository.java +++ b/src/main/java/org/qortal/repository/ATRepository.java @@ -1,9 +1,9 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.data.at.ATData; -import org.qora.data.at.ATStateData; +import org.qortal.data.at.ATData; +import org.qortal.data.at.ATStateData; public interface ATRepository { diff --git a/src/main/java/org/qora/repository/AccountRepository.java b/src/main/java/org/qortal/repository/AccountRepository.java similarity index 95% rename from src/main/java/org/qora/repository/AccountRepository.java rename to src/main/java/org/qortal/repository/AccountRepository.java index 276cc8cd..10428f7d 100644 --- a/src/main/java/org/qora/repository/AccountRepository.java +++ b/src/main/java/org/qortal/repository/AccountRepository.java @@ -1,12 +1,12 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.data.account.AccountBalanceData; -import org.qora.data.account.AccountData; -import org.qora.data.account.MintingAccountData; -import org.qora.data.account.QortFromQoraData; -import org.qora.data.account.RewardShareData; +import org.qortal.data.account.AccountBalanceData; +import org.qortal.data.account.AccountData; +import org.qortal.data.account.MintingAccountData; +import org.qortal.data.account.QortFromQoraData; +import org.qortal.data.account.RewardShareData; public interface AccountRepository { diff --git a/src/main/java/org/qora/repository/ArbitraryRepository.java b/src/main/java/org/qortal/repository/ArbitraryRepository.java similarity index 79% rename from src/main/java/org/qora/repository/ArbitraryRepository.java rename to src/main/java/org/qortal/repository/ArbitraryRepository.java index 872f942f..80f8c1e3 100644 --- a/src/main/java/org/qora/repository/ArbitraryRepository.java +++ b/src/main/java/org/qortal/repository/ArbitraryRepository.java @@ -1,6 +1,6 @@ -package org.qora.repository; +package org.qortal.repository; -import org.qora.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.ArbitraryTransactionData; public interface ArbitraryRepository { diff --git a/src/main/java/org/qora/repository/AssetRepository.java b/src/main/java/org/qortal/repository/AssetRepository.java similarity index 94% rename from src/main/java/org/qora/repository/AssetRepository.java rename to src/main/java/org/qortal/repository/AssetRepository.java index 37bcac38..e9e2527b 100644 --- a/src/main/java/org/qora/repository/AssetRepository.java +++ b/src/main/java/org/qortal/repository/AssetRepository.java @@ -1,12 +1,12 @@ -package org.qora.repository; +package org.qortal.repository; import java.math.BigDecimal; import java.util.List; -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.qortal.data.asset.AssetData; +import org.qortal.data.asset.OrderData; +import org.qortal.data.asset.RecentTradeData; +import org.qortal.data.asset.TradeData; public interface AssetRepository { diff --git a/src/main/java/org/qora/repository/BlockRepository.java b/src/main/java/org/qortal/repository/BlockRepository.java similarity index 95% rename from src/main/java/org/qora/repository/BlockRepository.java rename to src/main/java/org/qortal/repository/BlockRepository.java index f68a7bf8..db65d261 100644 --- a/src/main/java/org/qora/repository/BlockRepository.java +++ b/src/main/java/org/qortal/repository/BlockRepository.java @@ -1,12 +1,12 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.api.model.BlockMinterSummary; -import org.qora.data.block.BlockData; -import org.qora.data.block.BlockSummaryData; -import org.qora.data.block.BlockTransactionData; -import org.qora.data.transaction.TransactionData; +import org.qortal.api.model.BlockMinterSummary; +import org.qortal.data.block.BlockData; +import org.qortal.data.block.BlockSummaryData; +import org.qortal.data.block.BlockTransactionData; +import org.qortal.data.transaction.TransactionData; public interface BlockRepository { diff --git a/src/main/java/org/qora/repository/DataException.java b/src/main/java/org/qortal/repository/DataException.java similarity index 92% rename from src/main/java/org/qora/repository/DataException.java rename to src/main/java/org/qortal/repository/DataException.java index 02f260db..35901c6a 100644 --- a/src/main/java/org/qora/repository/DataException.java +++ b/src/main/java/org/qortal/repository/DataException.java @@ -1,4 +1,4 @@ -package org.qora.repository; +package org.qortal.repository; public class DataException extends Exception { diff --git a/src/main/java/org/qora/repository/GroupRepository.java b/src/main/java/org/qortal/repository/GroupRepository.java similarity index 94% rename from src/main/java/org/qora/repository/GroupRepository.java rename to src/main/java/org/qortal/repository/GroupRepository.java index b55e7119..26074b74 100644 --- a/src/main/java/org/qora/repository/GroupRepository.java +++ b/src/main/java/org/qortal/repository/GroupRepository.java @@ -1,13 +1,13 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -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.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; public interface GroupRepository { diff --git a/src/main/java/org/qora/repository/NameRepository.java b/src/main/java/org/qortal/repository/NameRepository.java similarity index 93% rename from src/main/java/org/qora/repository/NameRepository.java rename to src/main/java/org/qortal/repository/NameRepository.java index b96b3054..2dff8df1 100644 --- a/src/main/java/org/qora/repository/NameRepository.java +++ b/src/main/java/org/qortal/repository/NameRepository.java @@ -1,8 +1,8 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.data.naming.NameData; +import org.qortal.data.naming.NameData; public interface NameRepository { diff --git a/src/main/java/org/qora/repository/NetworkRepository.java b/src/main/java/org/qortal/repository/NetworkRepository.java similarity index 73% rename from src/main/java/org/qora/repository/NetworkRepository.java rename to src/main/java/org/qortal/repository/NetworkRepository.java index 823a47d6..e7a5126d 100644 --- a/src/main/java/org/qora/repository/NetworkRepository.java +++ b/src/main/java/org/qortal/repository/NetworkRepository.java @@ -1,9 +1,9 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.data.network.PeerData; -import org.qora.network.PeerAddress; +import org.qortal.data.network.PeerData; +import org.qortal.network.PeerAddress; public interface NetworkRepository { diff --git a/src/main/java/org/qora/repository/Repository.java b/src/main/java/org/qortal/repository/Repository.java similarity index 96% rename from src/main/java/org/qora/repository/Repository.java rename to src/main/java/org/qortal/repository/Repository.java index 3f88432f..39fbb07a 100644 --- a/src/main/java/org/qora/repository/Repository.java +++ b/src/main/java/org/qortal/repository/Repository.java @@ -1,4 +1,4 @@ -package org.qora.repository; +package org.qortal.repository; public interface Repository extends AutoCloseable { diff --git a/src/main/java/org/qora/repository/RepositoryFactory.java b/src/main/java/org/qortal/repository/RepositoryFactory.java similarity index 89% rename from src/main/java/org/qora/repository/RepositoryFactory.java rename to src/main/java/org/qortal/repository/RepositoryFactory.java index cd07d670..94c9627e 100644 --- a/src/main/java/org/qora/repository/RepositoryFactory.java +++ b/src/main/java/org/qortal/repository/RepositoryFactory.java @@ -1,4 +1,4 @@ -package org.qora.repository; +package org.qortal.repository; public interface RepositoryFactory { diff --git a/src/main/java/org/qora/repository/RepositoryManager.java b/src/main/java/org/qortal/repository/RepositoryManager.java similarity index 97% rename from src/main/java/org/qora/repository/RepositoryManager.java rename to src/main/java/org/qortal/repository/RepositoryManager.java index 26e8d551..e375be96 100644 --- a/src/main/java/org/qora/repository/RepositoryManager.java +++ b/src/main/java/org/qortal/repository/RepositoryManager.java @@ -1,4 +1,4 @@ -package org.qora.repository; +package org.qortal.repository; public abstract class RepositoryManager { diff --git a/src/main/java/org/qora/repository/TransactionRepository.java b/src/main/java/org/qortal/repository/TransactionRepository.java similarity index 95% rename from src/main/java/org/qora/repository/TransactionRepository.java rename to src/main/java/org/qortal/repository/TransactionRepository.java index 676a058d..d519b76a 100644 --- a/src/main/java/org/qora/repository/TransactionRepository.java +++ b/src/main/java/org/qortal/repository/TransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; import java.util.Map; -import org.qora.api.resource.TransactionsResource.ConfirmationStatus; -import org.qora.data.group.GroupApprovalData; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.api.resource.TransactionsResource.ConfirmationStatus; +import org.qortal.data.group.GroupApprovalData; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.transaction.Transaction.TransactionType; public interface TransactionRepository { diff --git a/src/main/java/org/qora/repository/VotingRepository.java b/src/main/java/org/qortal/repository/VotingRepository.java similarity index 85% rename from src/main/java/org/qora/repository/VotingRepository.java rename to src/main/java/org/qortal/repository/VotingRepository.java index 722fa6d2..28a9f6c7 100644 --- a/src/main/java/org/qora/repository/VotingRepository.java +++ b/src/main/java/org/qortal/repository/VotingRepository.java @@ -1,9 +1,9 @@ -package org.qora.repository; +package org.qortal.repository; import java.util.List; -import org.qora.data.voting.PollData; -import org.qora.data.voting.VoteOnPollData; +import org.qortal.data.voting.PollData; +import org.qortal.data.voting.VoteOnPollData; public interface VotingRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java similarity index 97% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java index 74c468d9..59955bb3 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.math.BigDecimal; import java.sql.ResultSet; @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.qora.data.at.ATData; -import org.qora.data.at.ATStateData; -import org.qora.repository.ATRepository; -import org.qora.repository.DataException; +import org.qortal.data.at.ATData; +import org.qortal.data.at.ATStateData; +import org.qortal.repository.ATRepository; +import org.qortal.repository.DataException; public class HSQLDBATRepository implements ATRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBAccountRepository.java similarity index 98% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBAccountRepository.java index ea025ea3..bfcc38a4 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBAccountRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.math.BigDecimal; import java.sql.ResultSet; @@ -7,13 +7,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.qora.data.account.AccountBalanceData; -import org.qora.data.account.AccountData; -import org.qora.data.account.MintingAccountData; -import org.qora.data.account.QortFromQoraData; -import org.qora.data.account.RewardShareData; -import org.qora.repository.AccountRepository; -import org.qora.repository.DataException; +import org.qortal.data.account.AccountBalanceData; +import org.qortal.data.account.AccountData; +import org.qortal.data.account.MintingAccountData; +import org.qortal.data.account.QortFromQoraData; +import org.qortal.data.account.RewardShareData; +import org.qortal.repository.AccountRepository; +import org.qortal.repository.DataException; public class HSQLDBAccountRepository implements AccountRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBArbitraryRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java similarity index 92% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBArbitraryRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java index ae497472..3d99bbb3 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBArbitraryRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.io.File; import java.io.IOException; @@ -8,14 +8,14 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.ArbitraryTransactionData; -import org.qora.data.transaction.ArbitraryTransactionData.DataType; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.ArbitraryRepository; -import org.qora.repository.DataException; -import org.qora.settings.Settings; -import org.qora.utils.Base58; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.ArbitraryTransactionData.DataType; +import org.qortal.repository.ArbitraryRepository; +import org.qortal.repository.DataException; +import org.qortal.settings.Settings; +import org.qortal.utils.Base58; public class HSQLDBArbitraryRepository implements ArbitraryRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBAssetRepository.java similarity index 98% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBAssetRepository.java index 8036cc0e..40ae3ca0 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBAssetRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.math.BigDecimal; import java.sql.ResultSet; @@ -9,12 +9,12 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; -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.repository.AssetRepository; -import org.qora.repository.DataException; +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.repository.AssetRepository; +import org.qortal.repository.DataException; public class HSQLDBAssetRepository implements AssetRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBBlockRepository.java similarity index 96% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBBlockRepository.java index 6a6e4872..85d8b31e 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBBlockRepository.java @@ -1,4 +1,7 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; + +import static org.qortal.repository.hsqldb.HSQLDBRepository.getZonedTimestampMilli; +import static org.qortal.repository.hsqldb.HSQLDBRepository.toOffsetDateTime; import java.math.BigDecimal; import java.sql.ResultSet; @@ -7,17 +10,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.qora.api.model.BlockMinterSummary; -import org.qora.data.block.BlockData; -import org.qora.data.block.BlockSummaryData; -import org.qora.data.block.BlockTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.BlockRepository; -import org.qora.repository.DataException; -import org.qora.repository.TransactionRepository; - -import static org.qora.repository.hsqldb.HSQLDBRepository.toOffsetDateTime; -import static org.qora.repository.hsqldb.HSQLDBRepository.getZonedTimestampMilli; +import org.qortal.api.model.BlockMinterSummary; +import org.qortal.data.block.BlockData; +import org.qortal.data.block.BlockSummaryData; +import org.qortal.data.block.BlockTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.BlockRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.TransactionRepository; public class HSQLDBBlockRepository implements BlockRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java index 02b6169d..bace4a9e 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.sql.Connection; import java.sql.ResultSet; @@ -8,7 +8,7 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.block.BlockChain; +import org.qortal.block.BlockChain; public class HSQLDBDatabaseUpdates { @@ -97,9 +97,9 @@ public class HSQLDBDatabaseUpdates { stmt.execute("INSERT INTO DatabaseInfo VALUES ( 0 )"); stmt.execute("CREATE TYPE BlockSignature AS VARBINARY(128)"); stmt.execute("CREATE TYPE Signature AS VARBINARY(64)"); - stmt.execute("CREATE TYPE QoraAddress AS VARCHAR(36)"); - stmt.execute("CREATE TYPE QoraPublicKey AS VARBINARY(32)"); - stmt.execute("CREATE TYPE QoraAmount AS DECIMAL(27, 8)"); + stmt.execute("CREATE TYPE QortalAddress AS VARCHAR(36)"); + stmt.execute("CREATE TYPE QortalPublicKey AS VARBINARY(32)"); + stmt.execute("CREATE TYPE QortalAmount AS DECIMAL(27, 8)"); stmt.execute("CREATE TYPE GenericDescription AS VARCHAR(4000)"); stmt.execute("CREATE TYPE RegisteredName AS VARCHAR(128) COLLATE SQL_TEXT_NO_PAD"); stmt.execute("CREATE TYPE NameData AS VARCHAR(4000)"); @@ -127,9 +127,9 @@ public class HSQLDBDatabaseUpdates { case 1: // Blocks stmt.execute("CREATE TABLE Blocks (signature BlockSignature, version TINYINT NOT NULL, reference BlockSignature, " - + "transaction_count INTEGER NOT NULL, total_fees QoraAmount NOT NULL, transactions_signature Signature NOT NULL, " + + "transaction_count INTEGER NOT NULL, total_fees QortalAmount NOT NULL, transactions_signature Signature NOT NULL, " + "height INTEGER NOT NULL, generation TIMESTAMP WITH TIME ZONE NOT NULL, " - + "generator QoraPublicKey NOT NULL, generator_signature Signature NOT NULL, AT_count INTEGER NOT NULL, AT_fees QoraAmount NOT NULL, " + + "generator QortalPublicKey NOT NULL, generator_signature Signature NOT NULL, AT_count INTEGER NOT NULL, AT_fees QortalAmount NOT NULL, " + "PRIMARY KEY (signature))"); // For finding blocks by height. stmt.execute("CREATE INDEX BlockHeightIndex ON Blocks (height)"); @@ -146,7 +146,7 @@ public class HSQLDBDatabaseUpdates { case 2: // Generic transactions (null reference, creator and milestone_block for genesis transactions) stmt.execute("CREATE TABLE Transactions (signature Signature, reference Signature, type TINYINT NOT NULL, " - + "creator QoraPublicKey NOT NULL, creation TIMESTAMP WITH TIME ZONE NOT NULL, fee QoraAmount NOT NULL, milestone_block BlockSignature, " + + "creator QortalPublicKey NOT NULL, creation TIMESTAMP WITH TIME ZONE NOT NULL, fee QortalAmount NOT NULL, milestone_block BlockSignature, " + "PRIMARY KEY (signature))"); // For finding transactions by transaction type. stmt.execute("CREATE INDEX TransactionTypeIndex ON Transactions (type)"); @@ -174,7 +174,7 @@ public class HSQLDBDatabaseUpdates { // Transaction participants // To allow lookup of all activity by an address - stmt.execute("CREATE TABLE TransactionParticipants (signature Signature, participant QoraAddress NOT NULL, " + stmt.execute("CREATE TABLE TransactionParticipants (signature Signature, participant QortalAddress NOT NULL, " + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Use a separate table space as this table will be very large. stmt.execute("SET TABLE TransactionParticipants NEW SPACE"); @@ -182,54 +182,54 @@ public class HSQLDBDatabaseUpdates { case 3: // Genesis Transactions - stmt.execute("CREATE TABLE GenesisTransactions (signature Signature, recipient QoraAddress NOT NULL, " - + "amount QoraAmount NOT NULL, asset_id AssetID NOT NULL, PRIMARY KEY (signature), " + stmt.execute("CREATE TABLE GenesisTransactions (signature Signature, recipient QortalAddress NOT NULL, " + + "amount QortalAmount NOT NULL, asset_id AssetID NOT NULL, PRIMARY KEY (signature), " + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 4: // Payment Transactions - stmt.execute("CREATE TABLE PaymentTransactions (signature Signature, sender QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, " - + "amount QoraAmount NOT NULL, PRIMARY KEY (signature), " + stmt.execute("CREATE TABLE PaymentTransactions (signature Signature, sender QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, " + + "amount QortalAmount NOT NULL, PRIMARY KEY (signature), " + "FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 5: // Register Name Transactions - stmt.execute("CREATE TABLE RegisterNameTransactions (signature Signature, registrant QoraPublicKey NOT NULL, name RegisteredName NOT NULL, " - + "owner QoraAddress NOT NULL, data NameData NOT NULL, " + stmt.execute("CREATE TABLE RegisterNameTransactions (signature Signature, registrant QortalPublicKey NOT NULL, name RegisteredName NOT NULL, " + + "owner QortalAddress NOT NULL, data NameData NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 6: // Update Name Transactions - stmt.execute("CREATE TABLE UpdateNameTransactions (signature Signature, owner QoraPublicKey NOT NULL, name RegisteredName NOT NULL, " - + "new_owner QoraAddress NOT NULL, new_data NameData NOT NULL, name_reference Signature, " + stmt.execute("CREATE TABLE UpdateNameTransactions (signature Signature, owner QortalPublicKey NOT NULL, name RegisteredName NOT NULL, " + + "new_owner QortalAddress NOT NULL, new_data NameData NOT NULL, name_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 7: // Sell Name Transactions - stmt.execute("CREATE TABLE SellNameTransactions (signature Signature, owner QoraPublicKey NOT NULL, name RegisteredName NOT NULL, " - + "amount QoraAmount NOT NULL, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); + stmt.execute("CREATE TABLE SellNameTransactions (signature Signature, owner QortalPublicKey NOT NULL, name RegisteredName NOT NULL, " + + "amount QortalAmount NOT NULL, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 8: // Cancel Sell Name Transactions - stmt.execute("CREATE TABLE CancelSellNameTransactions (signature Signature, owner QoraPublicKey NOT NULL, name RegisteredName NOT NULL, " + stmt.execute("CREATE TABLE CancelSellNameTransactions (signature Signature, owner QortalPublicKey NOT NULL, name RegisteredName NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 9: // Buy Name Transactions - stmt.execute("CREATE TABLE BuyNameTransactions (signature Signature, buyer QoraPublicKey NOT NULL, name RegisteredName NOT NULL, " - + "seller QoraAddress NOT NULL, amount QoraAmount NOT NULL, name_reference Signature, " + stmt.execute("CREATE TABLE BuyNameTransactions (signature Signature, buyer QortalPublicKey NOT NULL, name RegisteredName NOT NULL, " + + "seller QortalAddress NOT NULL, amount QortalAmount NOT NULL, name_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 10: // Create Poll Transactions - stmt.execute("CREATE TABLE CreatePollTransactions (signature Signature, creator QoraPublicKey NOT NULL, owner QoraAddress NOT NULL, " + stmt.execute("CREATE TABLE CreatePollTransactions (signature Signature, creator QortalPublicKey NOT NULL, owner QortalAddress NOT NULL, " + "poll_name PollName NOT NULL, description GenericDescription NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Poll options. NB: option is implicitly NON NULL and UNIQUE due to being part of compound primary key @@ -240,21 +240,21 @@ public class HSQLDBDatabaseUpdates { case 11: // Vote On Poll Transactions - stmt.execute("CREATE TABLE VoteOnPollTransactions (signature Signature, voter QoraPublicKey NOT NULL, poll_name PollName NOT NULL, " + stmt.execute("CREATE TABLE VoteOnPollTransactions (signature Signature, voter QortalPublicKey NOT NULL, poll_name PollName NOT NULL, " + "option_index PollOptionIndex NOT NULL, previous_option_index PollOptionIndex, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 12: // Arbitrary/Multi-payment/Message/Payment Transaction Payments - stmt.execute("CREATE TABLE SharedTransactionPayments (signature Signature, recipient QoraAddress NOT NULL, " - + "amount QoraAmount NOT NULL, asset_id AssetID NOT NULL, " + stmt.execute("CREATE TABLE SharedTransactionPayments (signature Signature, recipient QortalAddress NOT NULL, " + + "amount QortalAmount NOT NULL, asset_id AssetID NOT NULL, " + "PRIMARY KEY (signature, recipient, asset_id), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 13: // Arbitrary Transactions - stmt.execute("CREATE TABLE ArbitraryTransactions (signature Signature, sender QoraPublicKey NOT NULL, version TINYINT NOT NULL, " + stmt.execute("CREATE TABLE ArbitraryTransactions (signature Signature, sender QortalPublicKey NOT NULL, version TINYINT NOT NULL, " + "service TINYINT NOT NULL, data_hash DataHash NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // NB: Actual data payload stored elsewhere @@ -264,44 +264,44 @@ public class HSQLDBDatabaseUpdates { case 14: // Issue Asset Transactions stmt.execute( - "CREATE TABLE IssueAssetTransactions (signature Signature, issuer QoraPublicKey NOT NULL, owner QoraAddress NOT NULL, asset_name AssetName NOT NULL, " + "CREATE TABLE IssueAssetTransactions (signature Signature, issuer QortalPublicKey NOT NULL, owner QortalAddress NOT NULL, asset_name AssetName NOT NULL, " + "description GenericDescription NOT NULL, quantity BIGINT NOT NULL, is_divisible BOOLEAN NOT NULL, asset_id AssetID, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); - // For the future: maybe convert quantity from BIGINT to QoraAmount, regardless of divisibility + // For the future: maybe convert quantity from BIGINT to QortalAmount, regardless of divisibility break; case 15: // Transfer Asset Transactions - stmt.execute("CREATE TABLE TransferAssetTransactions (signature Signature, sender QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, " - + "asset_id AssetID NOT NULL, amount QoraAmount NOT NULL," + stmt.execute("CREATE TABLE TransferAssetTransactions (signature Signature, sender QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, " + + "asset_id AssetID NOT NULL, amount QortalAmount NOT NULL," + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 16: // Create Asset Order Transactions - stmt.execute("CREATE TABLE CreateAssetOrderTransactions (signature Signature, creator QoraPublicKey NOT NULL, " - + "have_asset_id AssetID NOT NULL, amount QoraAmount NOT NULL, want_asset_id AssetID NOT NULL, price QoraAmount NOT NULL, " + stmt.execute("CREATE TABLE CreateAssetOrderTransactions (signature Signature, creator QortalPublicKey NOT NULL, " + + "have_asset_id AssetID NOT NULL, amount QortalAmount NOT NULL, want_asset_id AssetID NOT NULL, price QortalAmount NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 17: // Cancel Asset Order Transactions - stmt.execute("CREATE TABLE CancelAssetOrderTransactions (signature Signature, creator QoraPublicKey NOT NULL, " + stmt.execute("CREATE TABLE CancelAssetOrderTransactions (signature Signature, creator QortalPublicKey NOT NULL, " + "asset_order_id AssetOrderID NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 18: // Multi-payment Transactions - stmt.execute("CREATE TABLE MultiPaymentTransactions (signature Signature, sender QoraPublicKey NOT NULL, " + stmt.execute("CREATE TABLE MultiPaymentTransactions (signature Signature, sender QortalPublicKey NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 19: // Deploy CIYAM AT Transactions - stmt.execute("CREATE TABLE DeployATTransactions (signature Signature, creator QoraPublicKey NOT NULL, AT_name ATName NOT NULL, " + stmt.execute("CREATE TABLE DeployATTransactions (signature Signature, creator QortalPublicKey NOT NULL, AT_name ATName NOT NULL, " + "description GenericDescription NOT NULL, AT_type ATType NOT NULL, AT_tags ATTags NOT NULL, " - + "creation_bytes ATCreationBytes NOT NULL, amount QoraAmount NOT NULL, asset_id AssetID NOT NULL, AT_address QoraAddress, " + + "creation_bytes ATCreationBytes NOT NULL, amount QortalAmount NOT NULL, asset_id AssetID NOT NULL, AT_address QortalAddress, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // For looking up the Deploy AT Transaction based on deployed AT address stmt.execute("CREATE INDEX DeployATAddressIndex on DeployATTransactions (AT_address)"); @@ -310,14 +310,14 @@ public class HSQLDBDatabaseUpdates { case 20: // Message Transactions stmt.execute( - "CREATE TABLE MessageTransactions (signature Signature, version TINYINT NOT NULL, sender QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, " - + "is_text BOOLEAN NOT NULL, is_encrypted BOOLEAN NOT NULL, amount QoraAmount NOT NULL, asset_id AssetID NOT NULL, data MessageData NOT NULL, " + "CREATE TABLE MessageTransactions (signature Signature, version TINYINT NOT NULL, sender QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, " + + "is_text BOOLEAN NOT NULL, is_encrypted BOOLEAN NOT NULL, amount QortalAmount NOT NULL, asset_id AssetID NOT NULL, data MessageData NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 21: - // Assets (including QORA coin itself) - stmt.execute("CREATE TABLE Assets (asset_id AssetID, owner QoraAddress NOT NULL, " + // Assets (including QORT coin itself) + stmt.execute("CREATE TABLE Assets (asset_id AssetID, owner QortalAddress NOT NULL, " + "asset_name AssetName NOT NULL, description GenericDescription NOT NULL, " + "quantity BIGINT NOT NULL, is_divisible BOOLEAN NOT NULL, reference Signature NOT NULL, PRIMARY KEY (asset_id))"); // We need a corresponding trigger to make sure new asset_id values are assigned sequentially start from 0 @@ -330,8 +330,8 @@ public class HSQLDBDatabaseUpdates { case 22: // Accounts - stmt.execute("CREATE TABLE Accounts (account QoraAddress, reference Signature, public_key QoraPublicKey, PRIMARY KEY (account))"); - stmt.execute("CREATE TABLE AccountBalances (account QoraAddress, asset_id AssetID, balance QoraAmount NOT NULL, " + stmt.execute("CREATE TABLE Accounts (account QortalAddress, reference Signature, public_key QortalPublicKey, PRIMARY KEY (account))"); + stmt.execute("CREATE TABLE AccountBalances (account QortalAddress, asset_id AssetID, balance QortalAmount NOT NULL, " + "PRIMARY KEY (account, asset_id), FOREIGN KEY (account) REFERENCES Accounts (account) ON DELETE CASCADE)"); // For looking up an account by public key stmt.execute("CREATE INDEX AccountPublicKeyIndex on Accounts (public_key)"); @@ -340,8 +340,8 @@ public class HSQLDBDatabaseUpdates { case 23: // Asset Orders stmt.execute( - "CREATE TABLE AssetOrders (asset_order_id AssetOrderID, creator QoraPublicKey NOT NULL, have_asset_id AssetID NOT NULL, want_asset_id AssetID NOT NULL, " - + "amount QoraAmount NOT NULL, fulfilled QoraAmount NOT NULL, price QoraAmount NOT NULL, " + "CREATE TABLE AssetOrders (asset_order_id AssetOrderID, creator QortalPublicKey NOT NULL, have_asset_id AssetID NOT NULL, want_asset_id AssetID NOT NULL, " + + "amount QortalAmount NOT NULL, fulfilled QortalAmount NOT NULL, price QortalAmount NOT NULL, " + "ordered TIMESTAMP WITH TIME ZONE NOT NULL, is_closed BOOLEAN NOT NULL, is_fulfilled BOOLEAN NOT NULL, " + "PRIMARY KEY (asset_order_id))"); // For quick matching of orders. is_closed are is_fulfilled included so inactive orders can be filtered out. @@ -353,7 +353,7 @@ public class HSQLDBDatabaseUpdates { case 24: // Asset Trades stmt.execute("CREATE TABLE AssetTrades (initiating_order_id AssetOrderId NOT NULL, target_order_id AssetOrderId NOT NULL, " - + "amount QoraAmount NOT NULL, price QoraAmount NOT NULL, traded TIMESTAMP WITH TIME ZONE NOT NULL)"); + + "amount QortalAmount NOT NULL, price QortalAmount NOT NULL, traded TIMESTAMP WITH TIME ZONE NOT NULL)"); // For looking up historic trades based on orders stmt.execute("CREATE INDEX AssetTradeBuyOrderIndex on AssetTrades (initiating_order_id, traded)"); stmt.execute("CREATE INDEX AssetTradeSellOrderIndex on AssetTrades (target_order_id, traded)"); @@ -362,13 +362,13 @@ public class HSQLDBDatabaseUpdates { case 25: // Polls/Voting stmt.execute( - "CREATE TABLE Polls (poll_name PollName, description GenericDescription NOT NULL, creator QoraPublicKey NOT NULL, owner QoraAddress NOT NULL, " + "CREATE TABLE Polls (poll_name PollName, description GenericDescription NOT NULL, creator QortalPublicKey NOT NULL, owner QortalAddress NOT NULL, " + "published TIMESTAMP WITH TIME ZONE NOT NULL, " + "PRIMARY KEY (poll_name))"); // Various options available on a poll stmt.execute("CREATE TABLE PollOptions (poll_name PollName, option_index TINYINT NOT NULL, option_name PollOption, " + "PRIMARY KEY (poll_name, option_index), FOREIGN KEY (poll_name) REFERENCES Polls (poll_name) ON DELETE CASCADE)"); // Actual votes cast on a poll by voting users. NOTE: only one vote per user supported at this time. - stmt.execute("CREATE TABLE PollVotes (poll_name PollName, voter QoraPublicKey, option_index PollOptionIndex NOT NULL, " + stmt.execute("CREATE TABLE PollVotes (poll_name PollName, voter QortalPublicKey, option_index PollOptionIndex NOT NULL, " + "PRIMARY KEY (poll_name, voter), FOREIGN KEY (poll_name) REFERENCES Polls (poll_name) ON DELETE CASCADE)"); // For when a user wants to lookup poll they own stmt.execute("CREATE INDEX PollOwnerIndex on Polls (owner)"); @@ -376,17 +376,17 @@ public class HSQLDBDatabaseUpdates { case 26: // Registered Names - stmt.execute("CREATE TABLE Names (name RegisteredName, data NameData NOT NULL, owner QoraAddress NOT NULL, " - + "registered TIMESTAMP WITH TIME ZONE NOT NULL, updated TIMESTAMP WITH TIME ZONE, reference Signature, is_for_sale BOOLEAN NOT NULL, sale_price QoraAmount, " + stmt.execute("CREATE TABLE Names (name RegisteredName, data NameData NOT NULL, owner QortalAddress NOT NULL, " + + "registered TIMESTAMP WITH TIME ZONE NOT NULL, updated TIMESTAMP WITH TIME ZONE, reference Signature, is_for_sale BOOLEAN NOT NULL, sale_price QortalAmount, " + "PRIMARY KEY (name))"); break; case 27: // CIYAM Automated Transactions stmt.execute( - "CREATE TABLE ATs (AT_address QoraAddress, creator QoraPublicKey, creation TIMESTAMP WITH TIME ZONE, version INTEGER NOT NULL, " + "CREATE TABLE ATs (AT_address QortalAddress, creator QortalPublicKey, creation TIMESTAMP WITH TIME ZONE, version INTEGER NOT NULL, " + "asset_id AssetID NOT NULL, code_bytes ATCode NOT NULL, is_sleeping BOOLEAN NOT NULL, sleep_until_height INTEGER, " - + "is_finished BOOLEAN NOT NULL, had_fatal_error BOOLEAN NOT NULL, is_frozen BOOLEAN NOT NULL, frozen_balance QoraAmount, " + + "is_finished BOOLEAN NOT NULL, had_fatal_error BOOLEAN NOT NULL, is_frozen BOOLEAN NOT NULL, frozen_balance QortalAmount, " + "PRIMARY key (AT_address))"); // For finding executable ATs, ordered by creation timestamp stmt.execute("CREATE INDEX ATIndex on ATs (is_finished, creation)"); @@ -394,15 +394,15 @@ public class HSQLDBDatabaseUpdates { stmt.execute("CREATE INDEX ATCreatorIndex on ATs (creator)"); // AT state on a per-block basis - stmt.execute("CREATE TABLE ATStates (AT_address QoraAddress, height INTEGER NOT NULL, creation TIMESTAMP WITH TIME ZONE, " - + "state_data ATState, state_hash ATStateHash NOT NULL, fees QoraAmount NOT NULL, " + stmt.execute("CREATE TABLE ATStates (AT_address QortalAddress, height INTEGER NOT NULL, creation TIMESTAMP WITH TIME ZONE, " + + "state_data ATState, state_hash ATStateHash NOT NULL, fees QortalAmount NOT NULL, " + "PRIMARY KEY (AT_address, height), FOREIGN KEY (AT_address) REFERENCES ATs (AT_address) ON DELETE CASCADE)"); // For finding per-block AT states, ordered by creation timestamp stmt.execute("CREATE INDEX BlockATStateIndex on ATStates (height, creation)"); // Generated AT Transactions stmt.execute( - "CREATE TABLE ATTransactions (signature Signature, AT_address QoraAddress NOT NULL, recipient QoraAddress, amount QoraAmount, asset_id AssetID, message ATMessage, " + "CREATE TABLE ATTransactions (signature Signature, AT_address QortalAddress NOT NULL, recipient QortalAddress, amount QortalAmount, asset_id AssetID, message ATMessage, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // For finding AT Transactions generated by a specific AT stmt.execute("CREATE INDEX ATTransactionsIndex on ATTransactions (AT_address)"); @@ -411,7 +411,7 @@ public class HSQLDBDatabaseUpdates { case 28: // Account groups stmt.execute( - "CREATE TABLE Groups (group_id GroupID, owner QoraAddress NOT NULL, group_name GroupName, description GenericDescription NOT NULL, " + "CREATE TABLE Groups (group_id GroupID, owner QortalAddress NOT NULL, group_name GroupName, description GenericDescription NOT NULL, " + "created TIMESTAMP WITH TIME ZONE NOT NULL, updated TIMESTAMP WITH TIME ZONE, is_open BOOLEAN NOT NULL, " + "reference Signature, PRIMARY KEY (group_id))"); // We need a corresponding trigger to make sure new group_id values are assigned sequentially starting from 1 @@ -424,20 +424,20 @@ public class HSQLDBDatabaseUpdates { stmt.execute("CREATE INDEX GroupOwnerIndex ON Groups (owner)"); // Admins - stmt.execute("CREATE TABLE GroupAdmins (group_id GroupID, admin QoraAddress, reference Signature NOT NULL, " + stmt.execute("CREATE TABLE GroupAdmins (group_id GroupID, admin QortalAddress, reference Signature NOT NULL, " + "PRIMARY KEY (group_id, admin), FOREIGN KEY (group_id) REFERENCES Groups (group_id) ON DELETE CASCADE)"); // For finding groups that address administrates stmt.execute("CREATE INDEX GroupAdminIndex ON GroupAdmins (admin)"); // Members stmt.execute( - "CREATE TABLE GroupMembers (group_id GroupID, address QoraAddress, joined TIMESTAMP WITH TIME ZONE NOT NULL, reference Signature NOT NULL, " + "CREATE TABLE GroupMembers (group_id GroupID, address QortalAddress, joined TIMESTAMP WITH TIME ZONE NOT NULL, reference Signature NOT NULL, " + "PRIMARY KEY (group_id, address), FOREIGN KEY (group_id) REFERENCES Groups (group_id) ON DELETE CASCADE)"); // For finding groups that address is member stmt.execute("CREATE INDEX GroupMemberIndex ON GroupMembers (address)"); // Invites - stmt.execute("CREATE TABLE GroupInvites (group_id GroupID, inviter QoraAddress, invitee QoraAddress, " + stmt.execute("CREATE TABLE GroupInvites (group_id GroupID, inviter QortalAddress, invitee QortalAddress, " + "expiry TIMESTAMP WITH TIME ZONE NOT NULL, reference Signature, " + "PRIMARY KEY (group_id, invitee), FOREIGN KEY (group_id) REFERENCES Groups (group_id) ON DELETE CASCADE)"); // For finding invites sent by inviter @@ -449,12 +449,12 @@ public class HSQLDBDatabaseUpdates { // Pending "join requests" stmt.execute( - "CREATE TABLE GroupJoinRequests (group_id GroupID, joiner QoraAddress, reference Signature NOT NULL, PRIMARY KEY (group_id, joiner))"); + "CREATE TABLE GroupJoinRequests (group_id GroupID, joiner QortalAddress, reference Signature NOT NULL, PRIMARY KEY (group_id, joiner))"); // Bans // NULL expiry means does not expire! stmt.execute( - "CREATE TABLE GroupBans (group_id GroupID, offender QoraAddress, admin QoraAddress NOT NULL, banned TIMESTAMP WITH TIME ZONE NOT NULL, " + "CREATE TABLE GroupBans (group_id GroupID, offender QortalAddress, admin QortalAddress NOT NULL, banned TIMESTAMP WITH TIME ZONE NOT NULL, " + "reason GenericDescription NOT NULL, expiry TIMESTAMP WITH TIME ZONE, reference Signature NOT NULL, " + "PRIMARY KEY (group_id, offender), FOREIGN KEY (group_id) REFERENCES Groups (group_id) ON DELETE CASCADE)"); // For expiry maintenance @@ -463,52 +463,52 @@ public class HSQLDBDatabaseUpdates { case 29: // Account group transactions - stmt.execute("CREATE TABLE CreateGroupTransactions (signature Signature, creator QoraPublicKey NOT NULL, group_name GroupName NOT NULL, " - + "owner QoraAddress NOT NULL, description GenericDescription NOT NULL, is_open BOOLEAN NOT NULL, group_id GroupID, " + stmt.execute("CREATE TABLE CreateGroupTransactions (signature Signature, creator QortalPublicKey NOT NULL, group_name GroupName NOT NULL, " + + "owner QortalAddress NOT NULL, description GenericDescription NOT NULL, is_open BOOLEAN NOT NULL, group_id GroupID, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); - stmt.execute("CREATE TABLE UpdateGroupTransactions (signature Signature, owner QoraPublicKey NOT NULL, group_id GroupID NOT NULL, " - + "new_owner QoraAddress NOT NULL, new_description GenericDescription NOT NULL, new_is_open BOOLEAN NOT NULL, group_reference Signature, " + stmt.execute("CREATE TABLE UpdateGroupTransactions (signature Signature, owner QortalPublicKey NOT NULL, group_id GroupID NOT NULL, " + + "new_owner QortalAddress NOT NULL, new_description GenericDescription NOT NULL, new_is_open BOOLEAN NOT NULL, group_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Account group add/remove admin transactions stmt.execute( - "CREATE TABLE AddGroupAdminTransactions (signature Signature, owner QoraPublicKey NOT NULL, group_id GroupID NOT NULL, address QoraAddress NOT NULL, " + "CREATE TABLE AddGroupAdminTransactions (signature Signature, owner QortalPublicKey NOT NULL, group_id GroupID NOT NULL, address QortalAddress NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); stmt.execute( - "CREATE TABLE RemoveGroupAdminTransactions (signature Signature, owner QoraPublicKey NOT NULL, group_id GroupID NOT NULL, admin QoraAddress NOT NULL, " + "CREATE TABLE RemoveGroupAdminTransactions (signature Signature, owner QortalPublicKey NOT NULL, group_id GroupID NOT NULL, admin QortalAddress NOT NULL, " + "admin_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Account group join/leave transactions - stmt.execute("CREATE TABLE JoinGroupTransactions (signature Signature, joiner QoraPublicKey NOT NULL, group_id GroupID NOT NULL, " + stmt.execute("CREATE TABLE JoinGroupTransactions (signature Signature, joiner QortalPublicKey NOT NULL, group_id GroupID NOT NULL, " + "invite_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); - stmt.execute("CREATE TABLE LeaveGroupTransactions (signature Signature, leaver QoraPublicKey NOT NULL, group_id GroupID NOT NULL, " + stmt.execute("CREATE TABLE LeaveGroupTransactions (signature Signature, leaver QortalPublicKey NOT NULL, group_id GroupID NOT NULL, " + "member_reference Signature, admin_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Account group kick transaction stmt.execute( - "CREATE TABLE GroupKickTransactions (signature Signature, admin QoraPublicKey NOT NULL, group_id GroupID NOT NULL, address QoraAddress NOT NULL, " + "CREATE TABLE GroupKickTransactions (signature Signature, admin QortalPublicKey NOT NULL, group_id GroupID NOT NULL, address QortalAddress NOT NULL, " + "reason GroupReason, member_reference Signature, admin_reference Signature, join_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Account group invite/cancel-invite transactions stmt.execute( - "CREATE TABLE GroupInviteTransactions (signature Signature, admin QoraPublicKey NOT NULL, group_id GroupID NOT NULL, invitee QoraAddress NOT NULL, " + "CREATE TABLE GroupInviteTransactions (signature Signature, admin QortalPublicKey NOT NULL, group_id GroupID NOT NULL, invitee QortalAddress NOT NULL, " + "time_to_live INTEGER NOT NULL, join_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Cancel group invite stmt.execute( - "CREATE TABLE CancelGroupInviteTransactions (signature Signature, admin QoraPublicKey NOT NULL, group_id GroupID NOT NULL, invitee QoraAddress NOT NULL, " + "CREATE TABLE CancelGroupInviteTransactions (signature Signature, admin QortalPublicKey NOT NULL, group_id GroupID NOT NULL, invitee QortalAddress NOT NULL, " + "invite_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Account ban/cancel-ban transactions stmt.execute( - "CREATE TABLE GroupBanTransactions (signature Signature, admin QoraPublicKey NOT NULL, group_id GroupID NOT NULL, address QoraAddress NOT NULL, " + "CREATE TABLE GroupBanTransactions (signature Signature, admin QortalPublicKey NOT NULL, group_id GroupID NOT NULL, address QortalAddress NOT NULL, " + "reason GroupReason, time_to_live INTEGER NOT NULL, " + "member_reference Signature, admin_reference Signature, join_invite_reference Signature, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); stmt.execute( - "CREATE TABLE CancelGroupBanTransactions (signature Signature, admin QoraPublicKey NOT NULL, group_id GroupID NOT NULL, address QoraAddress NOT NULL, " + "CREATE TABLE CancelGroupBanTransactions (signature Signature, admin QortalPublicKey NOT NULL, group_id GroupID NOT NULL, address QortalAddress NOT NULL, " + "ban_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; @@ -551,7 +551,7 @@ public class HSQLDBDatabaseUpdates { // Approval transactions themselves // "pending_signature" contains signature of pending transaction requiring approval // "prior_reference" contains signature of previous approval transaction for orphaning purposes - stmt.execute("CREATE TABLE GroupApprovalTransactions (signature Signature, admin QoraPublicKey NOT NULL, pending_signature Signature NOT NULL, approval BOOLEAN NOT NULL, " + stmt.execute("CREATE TABLE GroupApprovalTransactions (signature Signature, admin QortalPublicKey NOT NULL, pending_signature Signature NOT NULL, approval BOOLEAN NOT NULL, " + "prior_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Accounts have a default groupID to be used if transaction's txGroupId is 0 @@ -607,8 +607,8 @@ public class HSQLDBDatabaseUpdates { // Add support for asset "data" to ISSUE_ASSET transaction stmt.execute("ALTER TABLE IssueAssetTransactions ADD data AssetData NOT NULL DEFAULT '' BEFORE asset_id"); // Add support for UPDATE_ASSET transactions - stmt.execute("CREATE TABLE UpdateAssetTransactions (signature Signature, owner QoraPublicKey NOT NULL, asset_id AssetID NOT NULL, " - + "new_owner QoraAddress NOT NULL, new_description GenericDescription NOT NULL, new_data AssetData NOT NULL, " + stmt.execute("CREATE TABLE UpdateAssetTransactions (signature Signature, owner QortalPublicKey NOT NULL, asset_id AssetID NOT NULL, " + + "new_owner QortalAddress NOT NULL, new_description GenericDescription NOT NULL, new_data AssetData NOT NULL, " + "orphan_reference Signature, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Correct Assets.reference to use ISSUE_ASSET transaction's signature instead of reference. // This is to help UPDATE_ASSET orphaning. @@ -650,7 +650,7 @@ public class HSQLDBDatabaseUpdates { // Adjust precision stmt.execute("ALTER TABLE AssetOrders ALTER COLUMN unit_price DECIMAL(76,48)"); // Add want-amount column - stmt.execute("ALTER TABLE AssetOrders ADD want_amount QoraAmount BEFORE unit_price"); + stmt.execute("ALTER TABLE AssetOrders ADD want_amount QortalAmount BEFORE unit_price"); // Calculate want-amount values stmt.execute("UPDATE AssetOrders set want_amount = amount * unit_price"); // want-amounts all set, so disallow NULL @@ -668,7 +668,7 @@ public class HSQLDBDatabaseUpdates { stmt.execute("ALTER TABLE CreateAssetOrderTransactions ALTER COLUMN want_amount RENAME TO price"); stmt.execute("ALTER TABLE AssetOrders DROP COLUMN want_amount"); stmt.execute("ALTER TABLE AssetOrders ALTER COLUMN unit_price RENAME TO price"); - stmt.execute("ALTER TABLE AssetOrders ALTER COLUMN price QoraAmount"); + stmt.execute("ALTER TABLE AssetOrders ALTER COLUMN price QortalAmount"); /* * Normalize any 'old' orders to 'new' pricing. * We must do this so that requesting open orders can be sorted by price. @@ -679,9 +679,9 @@ public class HSQLDBDatabaseUpdates { stmt.execute("UPDATE AssetOrders SET amount = amount * price, fulfilled = fulfilled * price " + "WHERE ordered < timestamp(" + BlockChain.getInstance().getNewAssetPricingTimestamp() + ") " + "AND have_asset_id < want_asset_id"); - // Normalize price into lowest-assetID/highest-assetID price-pair, e.g. QORA/asset100 + // Normalize price into lowest-assetID/highest-assetID price-pair, e.g. QORT/asset100 // Note: HSQLDB uses BigDecimal's dividend.divide(divisor, RoundingMode.DOWN) too - stmt.execute("UPDATE AssetOrders SET price = CAST(1 AS QoraAmount) / price " + stmt.execute("UPDATE AssetOrders SET price = CAST(1 AS QortalAmount) / price " + "WHERE ordered < timestamp(" + BlockChain.getInstance().getNewAssetPricingTimestamp() + ") " + "AND have_asset_id < want_asset_id"); // Revert time zone change above @@ -690,33 +690,33 @@ public class HSQLDBDatabaseUpdates { case 43: // More work on 'new' asset pricing - refunds due to price improvement - stmt.execute("ALTER TABLE AssetTrades ADD initiator_saving QoraAmount NOT NULL DEFAULT 0"); + stmt.execute("ALTER TABLE AssetTrades ADD initiator_saving QortalAmount NOT NULL DEFAULT 0"); break; case 44: // Account flags stmt.execute("ALTER TABLE Accounts ADD COLUMN flags INT NOT NULL DEFAULT 0"); // Corresponding transaction to set/clear flags - stmt.execute("CREATE TABLE AccountFlagsTransactions (signature Signature, creator QoraPublicKey NOT NULL, target QoraAddress NOT NULL, and_mask INT NOT NULL, or_mask INT NOT NULL, xor_mask INT NOT NULL, " + stmt.execute("CREATE TABLE AccountFlagsTransactions (signature Signature, creator QortalPublicKey NOT NULL, target QortalAddress NOT NULL, and_mask INT NOT NULL, or_mask INT NOT NULL, xor_mask INT NOT NULL, " + "previous_flags INT, PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; case 45: // Enabling other accounts to forge // Transaction to allow one account to enable other account to forge - stmt.execute("CREATE TABLE EnableForgingTransactions (signature Signature, creator QoraPublicKey NOT NULL, target QoraAddress NOT NULL, " + stmt.execute("CREATE TABLE EnableForgingTransactions (signature Signature, creator QortalPublicKey NOT NULL, target QortalAddress NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Modification to accounts to record who enabled them to forge (useful for counting accounts and potentially orphaning) - stmt.execute("ALTER TABLE Accounts ADD COLUMN forging_enabler QoraAddress"); + stmt.execute("ALTER TABLE Accounts ADD COLUMN forging_enabler QortalAddress"); break; case 46: // Proxy forging // Transaction emitted by forger announcing they are forging on behalf of recipient - stmt.execute("CREATE TABLE ProxyForgingTransactions (signature Signature, forger QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, proxy_public_key QoraPublicKey NOT NULL, share DECIMAL(5,2) NOT NULL, " + stmt.execute("CREATE TABLE ProxyForgingTransactions (signature Signature, forger QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, proxy_public_key QortalPublicKey NOT NULL, share DECIMAL(5,2) NOT NULL, " + "previous_share DECIMAL(5,2), PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); // Table of current shares - stmt.execute("CREATE TABLE ProxyForgers (forger QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, proxy_public_key QoraPublicKey NOT NULL, share DECIMAL(5,2) NOT NULL, " + stmt.execute("CREATE TABLE ProxyForgers (forger QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, proxy_public_key QortalPublicKey NOT NULL, share DECIMAL(5,2) NOT NULL, " + "PRIMARY KEY (forger, recipient))"); // Proxy-forged blocks will contain proxy public key, which will be used to look up block reward sharing, so create index for those lookups stmt.execute("CREATE INDEX ProxyForgersProxyPublicKeyIndex ON ProxyForgers (proxy_public_key)"); @@ -724,8 +724,8 @@ public class HSQLDBDatabaseUpdates { case 47: // Stash of private keys used for generating blocks. These should be proxy keys! - stmt.execute("CREATE TYPE QoraKeySeed AS VARBINARY(32)"); - stmt.execute("CREATE TABLE ForgingAccounts (forger_seed QoraKeySeed NOT NULL, PRIMARY KEY (forger_seed))"); + stmt.execute("CREATE TYPE QortalKeySeed AS VARBINARY(32)"); + stmt.execute("CREATE TABLE ForgingAccounts (forger_seed QortalKeySeed NOT NULL, PRIMARY KEY (forger_seed))"); break; case 48: @@ -737,7 +737,7 @@ public class HSQLDBDatabaseUpdates { // Additional peer information stmt.execute("ALTER TABLE Peers ADD COLUMN last_block_signature BlockSignature BEFORE last_misbehaved"); stmt.execute("ALTER TABLE Peers ADD COLUMN last_block_timestamp TIMESTAMP WITH TIME ZONE BEFORE last_misbehaved"); - stmt.execute("ALTER TABLE Peers ADD COLUMN last_block_generator QoraPublicKey BEFORE last_misbehaved"); + stmt.execute("ALTER TABLE Peers ADD COLUMN last_block_generator QortalPublicKey BEFORE last_misbehaved"); break; case 50: @@ -784,7 +784,7 @@ public class HSQLDBDatabaseUpdates { stmt.execute("ALTER TABLE Accounts ADD COLUMN initial_level TINYINT NOT NULL DEFAULT 0"); stmt.execute("ALTER TABLE Accounts ADD COLUMN level TINYINT NOT NULL DEFAULT 0"); // Corresponding transaction to set level - stmt.execute("CREATE TABLE AccountLevelTransactions (signature Signature, creator QoraPublicKey NOT NULL, target QoraAddress NOT NULL, level INT NOT NULL, " + stmt.execute("CREATE TABLE AccountLevelTransactions (signature Signature, creator QortalPublicKey NOT NULL, target QortalAddress NOT NULL, level INT NOT NULL, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); break; @@ -844,7 +844,7 @@ public class HSQLDBDatabaseUpdates { case 59: // Keeping track of QORT gained from holding legacy QORA - stmt.execute("CREATE TABLE AccountQortFromQoraInfo (account QoraAddress, final_qort_from_qora QoraAmount, final_block_height INT, " + stmt.execute("CREATE TABLE AccountQortFromQoraInfo (account QortalAddress, final_qort_from_qora QortalAmount, final_block_height INT, " + "PRIMARY KEY (account), FOREIGN KEY (account) REFERENCES Accounts (account) ON DELETE CASCADE)"); break; @@ -852,7 +852,7 @@ public class HSQLDBDatabaseUpdates { // Index for speeding up fetch legacy QORA holders for Block processing stmt.execute("CREATE INDEX AccountBalances_Asset_Balance_Index ON AccountBalances (asset_id, balance)"); // Tracking height-history to account balances - stmt.execute("CREATE TABLE HistoricAccountBalances (account QoraAddress, asset_id AssetID, height INT DEFAULT 1, balance QoraAmount NOT NULL, " + stmt.execute("CREATE TABLE HistoricAccountBalances (account QortalAddress, asset_id AssetID, height INT DEFAULT 1, balance QortalAmount NOT NULL, " + "PRIMARY KEY (account, asset_id, height), FOREIGN KEY (account) REFERENCES Accounts (account) ON DELETE CASCADE)"); // Create triggers on changes to AccountBalances rows to update historic stmt.execute("CREATE TRIGGER Historic_account_balance_insert_trigger AFTER INSERT ON AccountBalances REFERENCING NEW ROW AS new_row FOR EACH ROW " @@ -908,7 +908,7 @@ public class HSQLDBDatabaseUpdates { case 64: // TRANSFER_PRIVS transaction - stmt.execute("CREATE TABLE TransferPrivsTransactions (signature Signature, sender QoraPublicKey NOT NULL, recipient QoraAddress NOT NULL, " + stmt.execute("CREATE TABLE TransferPrivsTransactions (signature Signature, sender QortalPublicKey NOT NULL, recipient QortalAddress NOT NULL, " + "previous_sender_flags INT, previous_recipient_flags INT, " + "previous_sender_blocks_minted_adjustment INT, previous_sender_blocks_minted INT, " + "PRIMARY KEY (signature), FOREIGN KEY (signature) REFERENCES Transactions (signature) ON DELETE CASCADE)"); diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBGroupRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBGroupRepository.java similarity index 98% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBGroupRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBGroupRepository.java index c160d7a2..53fcfe0e 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBGroupRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBGroupRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,15 +7,15 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -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.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.GroupRepository; +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.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.GroupRepository; public class HSQLDBGroupRepository implements GroupRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBNameRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBNameRepository.java similarity index 98% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBNameRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBNameRepository.java index 46100ed5..a4b1ae04 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBNameRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBNameRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.math.BigDecimal; import java.sql.ResultSet; @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.qora.data.naming.NameData; -import org.qora.repository.DataException; -import org.qora.repository.NameRepository; +import org.qortal.data.naming.NameData; +import org.qortal.repository.DataException; +import org.qortal.repository.NameRepository; public class HSQLDBNameRepository implements NameRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBNetworkRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBNetworkRepository.java similarity index 93% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBNetworkRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBNetworkRepository.java index 928e718a..ae84c612 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBNetworkRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBNetworkRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.qora.data.network.PeerData; -import org.qora.network.PeerAddress; -import org.qora.repository.DataException; -import org.qora.repository.NetworkRepository; +import org.qortal.data.network.PeerData; +import org.qortal.network.PeerAddress; +import org.qortal.repository.DataException; +import org.qortal.repository.NetworkRepository; public class HSQLDBNetworkRepository implements NetworkRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java similarity index 96% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java index cf0584f3..ec615cc2 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.io.File; import java.io.IOException; @@ -28,21 +28,21 @@ import java.util.regex.Pattern; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.repository.ATRepository; -import org.qora.repository.AccountRepository; -import org.qora.repository.ArbitraryRepository; -import org.qora.repository.AssetRepository; -import org.qora.repository.BlockRepository; -import org.qora.repository.GroupRepository; -import org.qora.repository.DataException; -import org.qora.repository.NameRepository; -import org.qora.repository.NetworkRepository; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.repository.TransactionRepository; -import org.qora.repository.VotingRepository; -import org.qora.repository.hsqldb.transaction.HSQLDBTransactionRepository; -import org.qora.settings.Settings; +import org.qortal.repository.ATRepository; +import org.qortal.repository.AccountRepository; +import org.qortal.repository.ArbitraryRepository; +import org.qortal.repository.AssetRepository; +import org.qortal.repository.BlockRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.GroupRepository; +import org.qortal.repository.NameRepository; +import org.qortal.repository.NetworkRepository; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.repository.TransactionRepository; +import org.qortal.repository.VotingRepository; +import org.qortal.repository.hsqldb.transaction.HSQLDBTransactionRepository; +import org.qortal.settings.Settings; public class HSQLDBRepository implements Repository { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepositoryFactory.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java similarity index 96% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBRepositoryFactory.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java index 534f349d..cbd5460f 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepositoryFactory.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBRepositoryFactory.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.sql.Connection; import java.sql.DriverManager; @@ -11,9 +11,9 @@ import org.apache.logging.log4j.Logger; import org.hsqldb.HsqlException; import org.hsqldb.error.ErrorCode; import org.hsqldb.jdbc.HSQLDBPool; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryFactory; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryFactory; public class HSQLDBRepositoryFactory implements RepositoryFactory { diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBSaver.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBSaver.java similarity index 99% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBSaver.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBSaver.java index d2222e8e..a029a0f9 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBSaver.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBSaver.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.math.BigDecimal; import java.sql.PreparedStatement; diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBVotingRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBVotingRepository.java similarity index 95% rename from src/main/java/org/qora/repository/hsqldb/HSQLDBVotingRepository.java rename to src/main/java/org/qortal/repository/hsqldb/HSQLDBVotingRepository.java index b760bf21..f936b6f2 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBVotingRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBVotingRepository.java @@ -1,4 +1,4 @@ -package org.qora.repository.hsqldb; +package org.qortal.repository.hsqldb; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,11 +7,11 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.qora.data.voting.PollData; -import org.qora.data.voting.PollOptionData; -import org.qora.data.voting.VoteOnPollData; -import org.qora.repository.DataException; -import org.qora.repository.VotingRepository; +import org.qortal.data.voting.PollData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.data.voting.VoteOnPollData; +import org.qortal.repository.DataException; +import org.qortal.repository.VotingRepository; public class HSQLDBVotingRepository implements VotingRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java index 4f765266..9d9b8800 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountFlagsTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.AccountFlagsTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.AccountFlagsTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBAccountFlagsTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java index eb156719..c4aa37de 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAccountLevelTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.AccountLevelTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.AccountLevelTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBAccountLevelTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java index 4002b679..686308c1 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAddGroupAdminTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.AddGroupAdminTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.AddGroupAdminTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBAddGroupAdminTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java similarity index 85% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java index bcf76d3e..804b2b10 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBArbitraryTransactionRepository.java @@ -1,17 +1,17 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.qora.data.PaymentData; -import org.qora.data.transaction.ArbitraryTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.ArbitraryTransactionData.DataType; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.ArbitraryTransactionData.DataType; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBArbitraryTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java index a373d25d..a14fee4b 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBAtTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.ATTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.ATTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBAtTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java index 4effe380..7e62b5b2 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBBuyNameTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BuyNameTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.BuyNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBBuyNameTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java similarity index 80% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java index 94b2171e..d49e83ba 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelAssetOrderTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CancelAssetOrderTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCancelAssetOrderTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java similarity index 82% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java index b079a176..76524b05 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupBanTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CancelGroupBanTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelGroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCancelGroupBanTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java index 1fe710ea..d61fa79b 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelGroupInviteTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CancelGroupInviteTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelGroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCancelGroupInviteTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java similarity index 80% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java index 18b8263d..5f2ea35a 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCancelSellNameTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CancelSellNameTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelSellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCancelSellNameTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java index 2893b678..4ae9ad12 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateAssetOrderTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CreateAssetOrderTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreateAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCreateAssetOrderTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java index c7effb58..fb20c504 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreateGroupTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.CreateGroupTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreateGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCreateGroupTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java similarity index 88% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java index 39988a3d..28163ab9 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBCreatePollTransactionRepository.java @@ -1,17 +1,17 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.qora.data.transaction.CreatePollTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.voting.PollOptionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreatePollTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBCreatePollTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java index 7088d379..a22cdc5e 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBDeployAtTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.DeployAtTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.DeployAtTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBDeployAtTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java index 748602f4..0407ba91 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGenesisTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.GenesisTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GenesisTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBGenesisTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java index 97890581..c8afed3d 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupApprovalTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBGroupApprovalTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java similarity index 87% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java index 8cf9a548..ae3fef43 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupBanTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.GroupBanTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBGroupBanTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java similarity index 85% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java index 55e091a6..64ec5c64 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupInviteTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.GroupInviteTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBGroupInviteTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java index b9271013..9dd3c98d 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBGroupKickTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.GroupKickTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupKickTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBGroupKickTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java similarity index 87% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java index 00647708..6c99f7ae 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBIssueAssetTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.IssueAssetTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.IssueAssetTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBIssueAssetTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java index 2c86d806..7f9ce13d 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBJoinGroupTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.JoinGroupTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.JoinGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBJoinGroupTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java index 21f8eb8d..c5aa3b00 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBLeaveGroupTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.LeaveGroupTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.LeaveGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBLeaveGroupTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java index bd051846..2e4b0b9d 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMessageTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.MessageTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.MessageTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBMessageTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java index 50fb7f25..69cd9c49 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBMultiPaymentTransactionRepository.java @@ -1,16 +1,16 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.qora.data.PaymentData; -import org.qora.data.transaction.MultiPaymentTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.MultiPaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBMultiPaymentTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java index 0ff141f4..7acc3cdd 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBPaymentTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBPaymentTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java similarity index 82% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java index 4b8f36a8..bddeaf07 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRegisterNameTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.RegisterNameTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RegisterNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBRegisterNameTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java similarity index 82% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java index 242a8a89..09b6892d 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRemoveGroupAdminTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.RemoveGroupAdminTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RemoveGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBRemoveGroupAdminTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java index 4a1ea40f..164a6f68 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBRewardShareTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.RewardShareTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RewardShareTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBRewardShareTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java similarity index 81% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java index 55c82f0a..33202358 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSellNameTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.SellNameTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.SellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBSellNameTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java similarity index 82% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java index 8a6f960f..f3be4c04 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBSetGroupTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.SetGroupTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.SetGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBSetGroupTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java similarity index 97% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java index 683823d4..77827d02 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java @@ -1,4 +1,6 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; + +import static org.qortal.transaction.Transaction.TransactionType.*; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -15,22 +17,20 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.api.resource.TransactionsResource.ConfirmationStatus; -import org.qora.data.PaymentData; -import org.qora.data.group.GroupApprovalData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.TransactionRepository; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; -import org.qora.transaction.Transaction.ApprovalStatus; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.utils.Base58; - -import static org.qora.transaction.Transaction.TransactionType.*; +import org.qortal.api.resource.TransactionsResource.ConfirmationStatus; +import org.qortal.data.PaymentData; +import org.qortal.data.group.GroupApprovalData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.TransactionRepository; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; +import org.qortal.transaction.Transaction.ApprovalStatus; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.utils.Base58; public class HSQLDBTransactionRepository implements TransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java index b6de7161..45fc0ddb 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferAssetTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBTransferAssetTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java similarity index 88% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java index 3763ba48..ae2ab9bb 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransferPrivsTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferPrivsTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferPrivsTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBTransferPrivsTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java index d636a572..8e0b1975 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateAssetTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.UpdateAssetTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBUpdateAssetTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java similarity index 86% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java index d060bed5..e2c2e72a 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateGroupTransactionRepository.java @@ -1,15 +1,15 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.UpdateGroupTransactionData; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateGroupTransactionData; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBUpdateGroupTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java similarity index 83% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java index ef64199f..d0df6ff9 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBUpdateNameTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.UpdateNameTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateNameTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBUpdateNameTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java similarity index 84% rename from src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java rename to src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java index 45973efb..0d260904 100644 --- a/src/main/java/org/qora/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBVoteOnPollTransactionRepository.java @@ -1,14 +1,14 @@ -package org.qora.repository.hsqldb.transaction; +package org.qortal.repository.hsqldb.transaction; import java.sql.ResultSet; import java.sql.SQLException; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.VoteOnPollTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.repository.hsqldb.HSQLDBSaver; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.VoteOnPollTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.repository.hsqldb.HSQLDBSaver; public class HSQLDBVoteOnPollTransactionRepository extends HSQLDBTransactionRepository { diff --git a/src/main/java/org/qora/settings/Settings.java b/src/main/java/org/qortal/settings/Settings.java similarity index 99% rename from src/main/java/org/qora/settings/Settings.java rename to src/main/java/org/qortal/settings/Settings.java index f58dfae8..cee8c018 100644 --- a/src/main/java/org/qora/settings/Settings.java +++ b/src/main/java/org/qortal/settings/Settings.java @@ -1,4 +1,4 @@ -package org.qora.settings; +package org.qortal.settings; import java.io.File; import java.io.FileNotFoundException; @@ -19,7 +19,7 @@ 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.block.BlockChain; +import org.qortal.block.BlockChain; // All properties to be converted to JSON via JAXB @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/qora/transaction/AccountFlagsTransaction.java b/src/main/java/org/qortal/transaction/AccountFlagsTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/AccountFlagsTransaction.java rename to src/main/java/org/qortal/transaction/AccountFlagsTransaction.java index 9a3f010a..a795b848 100644 --- a/src/main/java/org/qora/transaction/AccountFlagsTransaction.java +++ b/src/main/java/org/qortal/transaction/AccountFlagsTransaction.java @@ -1,16 +1,16 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.GenesisAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.AccountFlagsTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.GenesisAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.AccountFlagsTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AccountFlagsTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/AccountLevelTransaction.java b/src/main/java/org/qortal/transaction/AccountLevelTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/AccountLevelTransaction.java rename to src/main/java/org/qortal/transaction/AccountLevelTransaction.java index 145eaaa4..63f234e0 100644 --- a/src/main/java/org/qora/transaction/AccountLevelTransaction.java +++ b/src/main/java/org/qortal/transaction/AccountLevelTransaction.java @@ -1,17 +1,17 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.GenesisAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.AccountLevelTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.GenesisAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.AccountLevelTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AccountLevelTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/AddGroupAdminTransaction.java b/src/main/java/org/qortal/transaction/AddGroupAdminTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/AddGroupAdminTransaction.java rename to src/main/java/org/qortal/transaction/AddGroupAdminTransaction.java index 2cae7648..fcfe897a 100644 --- a/src/main/java/org/qora/transaction/AddGroupAdminTransaction.java +++ b/src/main/java/org/qortal/transaction/AddGroupAdminTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.AddGroupAdminTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.AddGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AddGroupAdminTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/ArbitraryTransaction.java b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java similarity index 92% rename from src/main/java/org/qora/transaction/ArbitraryTransaction.java rename to src/main/java/org/qortal/transaction/ArbitraryTransaction.java index 0963522a..b1419c37 100644 --- a/src/main/java/org/qora/transaction/ArbitraryTransaction.java +++ b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.PaymentData; -import org.qora.data.transaction.ArbitraryTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.payment.Payment; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.payment.Payment; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class ArbitraryTransaction extends Transaction { @@ -70,7 +70,7 @@ public class ArbitraryTransaction extends Transaction { if (arbitraryTransactionData.getVersion() != 1) for (PaymentData paymentData : arbitraryTransactionData.getPayments()) - // We're only interested in QORA + // We're only interested in QORT if (paymentData.getAssetId() == Asset.QORT) { if (address.equals(paymentData.getRecipient())) amount = amount.add(paymentData.getAmount()); diff --git a/src/main/java/org/qora/transaction/AtTransaction.java b/src/main/java/org/qortal/transaction/AtTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/AtTransaction.java rename to src/main/java/org/qortal/transaction/AtTransaction.java index 2587fd55..15ae12e3 100644 --- a/src/main/java/org/qora/transaction/AtTransaction.java +++ b/src/main/java/org/qortal/transaction/AtTransaction.java @@ -1,4 +1,4 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; @@ -6,16 +6,16 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.asset.AssetData; -import org.qora.data.transaction.ATTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.AtTransactionTransformer; +import org.qortal.account.Account; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.asset.AssetData; +import org.qortal.data.transaction.ATTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.AtTransactionTransformer; import com.google.common.primitives.Bytes; @@ -182,10 +182,10 @@ public class AtTransaction extends Transaction { Account recipient = getRecipient(); long assetId = this.atTransactionData.getAssetId(); - // For QORA amounts only: if recipient has no reference yet, then this is their starting reference + // For QORT amounts only: if recipient has no reference yet, then this is their starting reference if (assetId == Asset.QORT && recipient.getLastReference() == null) // In Qora1 last reference was set to 64-bytes of zero - // In Qora2 we use AT-Transction's signature, which makes more sense + // In Qortal we use AT-Transction's signature, which makes more sense recipient.setLastReference(this.atTransactionData.getSignature()); } } @@ -217,7 +217,7 @@ public class AtTransaction extends Transaction { long assetId = this.atTransactionData.getAssetId(); /* - * For QORA amounts only: If recipient's last reference is this transaction's signature, then they can't have made any transactions of their own + * For QORT amounts only: If recipient's last reference is this transaction's signature, then they can't have made any transactions of their own * (which would have changed their last reference) thus this is their first reference so remove it. */ if (assetId == Asset.QORT && Arrays.equals(recipient.getLastReference(), this.atTransactionData.getSignature())) diff --git a/src/main/java/org/qora/transaction/BuyNameTransaction.java b/src/main/java/org/qortal/transaction/BuyNameTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/BuyNameTransaction.java rename to src/main/java/org/qortal/transaction/BuyNameTransaction.java index e2642c01..2e37468a 100644 --- a/src/main/java/org/qora/transaction/BuyNameTransaction.java +++ b/src/main/java/org/qortal/transaction/BuyNameTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.naming.NameData; -import org.qora.data.transaction.BuyNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.naming.NameData; +import org.qortal.data.transaction.BuyNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/CancelAssetOrderTransaction.java b/src/main/java/org/qortal/transaction/CancelAssetOrderTransaction.java similarity index 84% rename from src/main/java/org/qora/transaction/CancelAssetOrderTransaction.java rename to src/main/java/org/qortal/transaction/CancelAssetOrderTransaction.java index 1aeb0799..5d41b87d 100644 --- a/src/main/java/org/qora/transaction/CancelAssetOrderTransaction.java +++ b/src/main/java/org/qortal/transaction/CancelAssetOrderTransaction.java @@ -1,20 +1,20 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.asset.Order; -import org.qora.crypto.Crypto; -import org.qora.data.asset.OrderData; -import org.qora.data.transaction.CancelAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -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.asset.Asset; +import org.qortal.asset.Order; +import org.qortal.crypto.Crypto; +import org.qortal.data.asset.OrderData; +import org.qortal.data.transaction.CancelAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.AssetRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelAssetOrderTransaction extends Transaction { @@ -88,7 +88,7 @@ public class CancelAssetOrderTransaction extends Transaction { if (!orderCreator.getAddress().equals(creator.getAddress())) return ValidationResult.INVALID_ORDER_CREATOR; - // Check creator has enough QORA for fee + // Check creator has enough QORT for fee if (creator.getConfirmedBalance(Asset.QORT).compareTo(cancelOrderTransactionData.getFee()) < 0) return ValidationResult.NO_BALANCE; diff --git a/src/main/java/org/qora/transaction/CancelGroupBanTransaction.java b/src/main/java/org/qortal/transaction/CancelGroupBanTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/CancelGroupBanTransaction.java rename to src/main/java/org/qortal/transaction/CancelGroupBanTransaction.java index 7be7f157..212e84be 100644 --- a/src/main/java/org/qora/transaction/CancelGroupBanTransaction.java +++ b/src/main/java/org/qortal/transaction/CancelGroupBanTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.CancelGroupBanTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.CancelGroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelGroupBanTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/CancelGroupInviteTransaction.java b/src/main/java/org/qortal/transaction/CancelGroupInviteTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/CancelGroupInviteTransaction.java rename to src/main/java/org/qortal/transaction/CancelGroupInviteTransaction.java index d8f85085..8b47f67f 100644 --- a/src/main/java/org/qora/transaction/CancelGroupInviteTransaction.java +++ b/src/main/java/org/qortal/transaction/CancelGroupInviteTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.CancelGroupInviteTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.CancelGroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelGroupInviteTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/CancelSellNameTransaction.java b/src/main/java/org/qortal/transaction/CancelSellNameTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/CancelSellNameTransaction.java rename to src/main/java/org/qortal/transaction/CancelSellNameTransaction.java index e2cb6dc6..c86db359 100644 --- a/src/main/java/org/qora/transaction/CancelSellNameTransaction.java +++ b/src/main/java/org/qortal/transaction/CancelSellNameTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.naming.NameData; -import org.qora.data.transaction.CancelSellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.naming.NameData; +import org.qortal.data.transaction.CancelSellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/CreateAssetOrderTransaction.java b/src/main/java/org/qortal/transaction/CreateAssetOrderTransaction.java similarity index 82% rename from src/main/java/org/qora/transaction/CreateAssetOrderTransaction.java rename to src/main/java/org/qortal/transaction/CreateAssetOrderTransaction.java index 4c70ac8d..5b8cd163 100644 --- a/src/main/java/org/qora/transaction/CreateAssetOrderTransaction.java +++ b/src/main/java/org/qortal/transaction/CreateAssetOrderTransaction.java @@ -1,22 +1,22 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.asset.Order; -import org.qora.block.BlockChain; -import org.qora.data.asset.AssetData; -import org.qora.data.asset.OrderData; -import org.qora.data.transaction.CreateAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -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.asset.Asset; +import org.qortal.asset.Order; +import org.qortal.block.BlockChain; +import org.qortal.data.asset.AssetData; +import org.qortal.data.asset.OrderData; +import org.qortal.data.transaction.CreateAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.AssetRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CreateAssetOrderTransaction extends Transaction { @@ -118,20 +118,20 @@ public class CreateAssetOrderTransaction extends Transaction { * whichever has the highest assetID. * * e.g. with assetID 11 "GOLD": - * haveAssetId: 0 (QORA), wantAssetId: 11 (GOLD), amount: 123 (GOLD), price: 400 (QORA/GOLD) - * stake 49200 QORA, return 123 GOLD + * haveAssetId: 0 (QORT), wantAssetId: 11 (GOLD), amount: 123 (GOLD), price: 400 (QORT/GOLD) + * stake 49200 QORT, return 123 GOLD * - * haveAssetId: 11 (GOLD), wantAssetId: 0 (QORA), amount: 123 (GOLD), price: 400 (QORA/GOLD) - * stake 123 GOLD, return 49200 QORA + * haveAssetId: 11 (GOLD), wantAssetId: 0 (QORT), amount: 123 (GOLD), price: 400 (QORT/GOLD) + * stake 123 GOLD, return 49200 QORT */ boolean isAmountWantAsset = haveAssetId < wantAssetId; if (isAmountWantAsset) { - // have/commit 49200 QORA, want/return 123 GOLD + // have/commit 49200 QORT, want/return 123 GOLD committedCost = createOrderTransactionData.getAmount().multiply(createOrderTransactionData.getPrice()); maxOtherAmount = createOrderTransactionData.getAmount(); } else { - // have/commit 123 GOLD, want/return 49200 QORA + // have/commit 123 GOLD, want/return 49200 QORT committedCost = createOrderTransactionData.getAmount(); maxOtherAmount = createOrderTransactionData.getAmount().multiply(createOrderTransactionData.getPrice()); } @@ -140,8 +140,8 @@ public class CreateAssetOrderTransaction extends Transaction { * Under "old" pricing scheme, "amount" is always have-asset and price is always want-per-have. * * e.g. with assetID 11 "GOLD": - * haveAssetId: 0 (QORA), wantAssetId: 11 (GOLD), amount: 49200 (QORA), price: 0.00250000 (GOLD/QORA) - * haveAssetId: 11 (GOLD), wantAssetId: 0 (QORA), amount: 123 (GOLD), price: 400 (QORA/GOLD) + * haveAssetId: 0 (QORT), wantAssetId: 11 (GOLD), amount: 49200 (QORT), price: 0.00250000 (GOLD/QORT) + * haveAssetId: 11 (GOLD), wantAssetId: 0 (QORT), amount: 123 (GOLD), price: 400 (QORT/GOLD) */ committedCost = createOrderTransactionData.getAmount(); maxOtherAmount = createOrderTransactionData.getAmount().multiply(createOrderTransactionData.getPrice()); @@ -155,10 +155,10 @@ public class CreateAssetOrderTransaction extends Transaction { if (!wantAssetData.getIsDivisible() && maxOtherAmount.stripTrailingZeros().scale() > 0) return ValidationResult.INVALID_RETURN; - // Check order creator has enough asset balance AFTER removing fee, in case asset is QORA - // If asset is QORA then we need to check amount + fee in one go + // Check order creator has enough asset balance AFTER removing fee, in case asset is QORT + // If asset is QORT then we need to check amount + fee in one go if (haveAssetId == Asset.QORT) { - // Check creator has enough funds for amount + fee in QORA + // Check creator has enough funds for amount + fee in QORT if (creator.getConfirmedBalance(Asset.QORT).compareTo(committedCost.add(createOrderTransactionData.getFee())) < 0) return ValidationResult.NO_BALANCE; } else { @@ -166,7 +166,7 @@ public class CreateAssetOrderTransaction extends Transaction { if (creator.getConfirmedBalance(haveAssetId).compareTo(committedCost) < 0) return ValidationResult.NO_BALANCE; - // Check creator has enough funds for fee in QORA + // Check creator has enough funds for fee in QORT // NOTE: in Gen1 pre-POWFIX-RELEASE transactions didn't have this check if (createOrderTransactionData.getTimestamp() >= BlockChain.getInstance().getPowFixReleaseTimestamp() && creator.getConfirmedBalance(Asset.QORT).compareTo(createOrderTransactionData.getFee()) < 0) diff --git a/src/main/java/org/qora/transaction/CreateGroupTransaction.java b/src/main/java/org/qortal/transaction/CreateGroupTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/CreateGroupTransaction.java rename to src/main/java/org/qortal/transaction/CreateGroupTransaction.java index 85baa05c..42c69541 100644 --- a/src/main/java/org/qora/transaction/CreateGroupTransaction.java +++ b/src/main/java/org/qortal/transaction/CreateGroupTransaction.java @@ -1,17 +1,17 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.CreateGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.CreateGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/CreatePollTransaction.java b/src/main/java/org/qortal/transaction/CreatePollTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/CreatePollTransaction.java rename to src/main/java/org/qortal/transaction/CreatePollTransaction.java index d8cb8c46..a3ee855f 100644 --- a/src/main/java/org/qora/transaction/CreatePollTransaction.java +++ b/src/main/java/org/qortal/transaction/CreatePollTransaction.java @@ -1,21 +1,21 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.CreatePollTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.voting.PollOptionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.voting.Poll; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.CreatePollTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.voting.Poll; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/DeployAtTransaction.java b/src/main/java/org/qortal/transaction/DeployAtTransaction.java similarity index 93% rename from src/main/java/org/qora/transaction/DeployAtTransaction.java rename to src/main/java/org/qortal/transaction/DeployAtTransaction.java index 985290e1..191adeec 100644 --- a/src/main/java/org/qora/transaction/DeployAtTransaction.java +++ b/src/main/java/org/qortal/transaction/DeployAtTransaction.java @@ -1,4 +1,4 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.nio.ByteBuffer; @@ -8,17 +8,17 @@ import java.util.ArrayList; import java.util.List; import org.ciyam.at.MachineState; -import org.qora.account.Account; -import org.qora.asset.Asset; -import org.qora.at.AT; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.asset.AssetData; -import org.qora.data.transaction.DeployAtTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transform.Transformer; +import org.qortal.account.Account; +import org.qortal.asset.Asset; +import org.qortal.at.AT; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.asset.AssetData; +import org.qortal.data.transaction.DeployAtTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transform.Transformer; import com.google.common.base.Utf8; @@ -173,7 +173,7 @@ public class DeployAtTransaction extends Transaction { // Check creator has enough funds if (assetId == Asset.QORT) { - // Simple case: amount and fee both in Qora + // Simple case: amount and fee both in QORT BigDecimal minimumBalance = deployATTransactionData.getFee().add(deployATTransactionData.getAmount()); if (creator.getConfirmedBalance(Asset.QORT).compareTo(minimumBalance) < 0) @@ -209,7 +209,7 @@ public class DeployAtTransaction extends Transaction { // Check creator has enough funds if (assetId == Asset.QORT) { - // Simple case: amount and fee both in Qora + // Simple case: amount and fee both in QORT BigDecimal minimumBalance = deployATTransactionData.getFee().add(deployATTransactionData.getAmount()); if (creator.getConfirmedBalance(Asset.QORT).compareTo(minimumBalance) < 0) diff --git a/src/main/java/org/qora/transaction/GenesisTransaction.java b/src/main/java/org/qortal/transaction/GenesisTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/GenesisTransaction.java rename to src/main/java/org/qortal/transaction/GenesisTransaction.java index c60c62db..42ad2f4c 100644 --- a/src/main/java/org/qora/transaction/GenesisTransaction.java +++ b/src/main/java/org/qortal/transaction/GenesisTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PrivateKeyAccount; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.GenesisTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.TransactionTransformer; +import org.qortal.account.Account; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.GenesisTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.TransactionTransformer; import com.google.common.primitives.Bytes; diff --git a/src/main/java/org/qora/transaction/GroupApprovalTransaction.java b/src/main/java/org/qortal/transaction/GroupApprovalTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/GroupApprovalTransaction.java rename to src/main/java/org/qortal/transaction/GroupApprovalTransaction.java index 15035d09..59bd0c10 100644 --- a/src/main/java/org/qora/transaction/GroupApprovalTransaction.java +++ b/src/main/java/org/qortal/transaction/GroupApprovalTransaction.java @@ -1,16 +1,16 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupApprovalTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/GroupBanTransaction.java b/src/main/java/org/qortal/transaction/GroupBanTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/GroupBanTransaction.java rename to src/main/java/org/qortal/transaction/GroupBanTransaction.java index ae5d3ed5..574a9e77 100644 --- a/src/main/java/org/qora/transaction/GroupBanTransaction.java +++ b/src/main/java/org/qortal/transaction/GroupBanTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.GroupBanTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.GroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupBanTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/GroupInviteTransaction.java b/src/main/java/org/qortal/transaction/GroupInviteTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/GroupInviteTransaction.java rename to src/main/java/org/qortal/transaction/GroupInviteTransaction.java index 54e5855b..7599c637 100644 --- a/src/main/java/org/qora/transaction/GroupInviteTransaction.java +++ b/src/main/java/org/qortal/transaction/GroupInviteTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.GroupInviteTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.GroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupInviteTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/GroupKickTransaction.java b/src/main/java/org/qortal/transaction/GroupKickTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/GroupKickTransaction.java rename to src/main/java/org/qortal/transaction/GroupKickTransaction.java index d953e214..b26f173e 100644 --- a/src/main/java/org/qora/transaction/GroupKickTransaction.java +++ b/src/main/java/org/qortal/transaction/GroupKickTransaction.java @@ -1,20 +1,20 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.GroupKickTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.GroupRepository; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.GroupKickTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.GroupRepository; +import org.qortal.repository.Repository; public class GroupKickTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/IssueAssetTransaction.java b/src/main/java/org/qortal/transaction/IssueAssetTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/IssueAssetTransaction.java rename to src/main/java/org/qortal/transaction/IssueAssetTransaction.java index f94ba68c..c10c3b37 100644 --- a/src/main/java/org/qora/transaction/IssueAssetTransaction.java +++ b/src/main/java/org/qortal/transaction/IssueAssetTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.IssueAssetTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.IssueAssetTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; @@ -57,7 +57,7 @@ public class IssueAssetTransaction extends Transaction { if (address.equals(this.getIssuer().getAddress())) amount = amount.subtract(this.transactionData.getFee()); - // NOTE: we're only interested in QORA amounts, and genesis account issued QORA so no need to check owner + // NOTE: we're only interested in QORT amounts, and genesis account issued QORT so no need to check owner return amount; } @@ -83,7 +83,7 @@ public class IssueAssetTransaction extends Transaction { // "data" field is only allowed in v2 String data = this.issueAssetTransactionData.getData(); - if (this.issueAssetTransactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) { + if (this.issueAssetTransactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) { // v2 so check data field properly int dataLength = Utf8.encodedLength(data); if (data == null || dataLength < 1 || dataLength > Asset.MAX_DATA_SIZE) @@ -129,7 +129,7 @@ public class IssueAssetTransaction extends Transaction { @Override public ValidationResult isProcessable() throws DataException { // Check the asset name isn't already taken. This check is not present in gen1. - if (issueAssetTransactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (issueAssetTransactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) if (this.repository.getAssetRepository().assetExists(issueAssetTransactionData.getAssetName())) return ValidationResult.ASSET_ALREADY_EXISTS; diff --git a/src/main/java/org/qora/transaction/JoinGroupTransaction.java b/src/main/java/org/qortal/transaction/JoinGroupTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/JoinGroupTransaction.java rename to src/main/java/org/qortal/transaction/JoinGroupTransaction.java index 74a39052..96573201 100644 --- a/src/main/java/org/qora/transaction/JoinGroupTransaction.java +++ b/src/main/java/org/qortal/transaction/JoinGroupTransaction.java @@ -1,17 +1,17 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.JoinGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.JoinGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class JoinGroupTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/LeaveGroupTransaction.java b/src/main/java/org/qortal/transaction/LeaveGroupTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/LeaveGroupTransaction.java rename to src/main/java/org/qortal/transaction/LeaveGroupTransaction.java index 9ee97d6c..6b361009 100644 --- a/src/main/java/org/qora/transaction/LeaveGroupTransaction.java +++ b/src/main/java/org/qortal/transaction/LeaveGroupTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.LeaveGroupTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.LeaveGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class LeaveGroupTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/MessageTransaction.java b/src/main/java/org/qortal/transaction/MessageTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/MessageTransaction.java rename to src/main/java/org/qortal/transaction/MessageTransaction.java index 15639524..59adcfad 100644 --- a/src/main/java/org/qora/transaction/MessageTransaction.java +++ b/src/main/java/org/qortal/transaction/MessageTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.PaymentData; -import org.qora.data.transaction.MessageTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.payment.Payment; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.MessageTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.payment.Payment; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class MessageTransaction extends Transaction { @@ -60,7 +60,7 @@ public class MessageTransaction extends Transaction { if (address.equals(senderAddress)) amount = amount.subtract(this.transactionData.getFee()); - // We're only interested in QORA + // We're only interested in QORT if (messageTransactionData.getAssetId() == Asset.QORT) { if (address.equals(messageTransactionData.getRecipient())) amount = amount.add(messageTransactionData.getAmount()); @@ -127,7 +127,7 @@ public class MessageTransaction extends Transaction { @Override public void processReferencesAndFees() throws DataException { - // Wrap and delegate references processing to Payment class. Only update recipient's last reference if transferring QORA. + // Wrap and delegate references processing to Payment class. Only update recipient's last reference if transferring QORT. new Payment(this.repository).processReferencesAndFees(messageTransactionData.getSenderPublicKey(), getPaymentData(), messageTransactionData.getFee(), messageTransactionData.getSignature(), false); } @@ -141,7 +141,7 @@ public class MessageTransaction extends Transaction { @Override public void orphanReferencesAndFees() throws DataException { - // Wrap and delegate references processing to Payment class. Only revert recipient's last reference if transferring QORA. + // Wrap and delegate references processing to Payment class. Only revert recipient's last reference if transferring QORT. new Payment(this.repository).orphanReferencesAndFees(messageTransactionData.getSenderPublicKey(), getPaymentData(), messageTransactionData.getFee(), messageTransactionData.getSignature(), messageTransactionData.getReference(), false); } diff --git a/src/main/java/org/qora/transaction/MultiPaymentTransaction.java b/src/main/java/org/qortal/transaction/MultiPaymentTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/MultiPaymentTransaction.java rename to src/main/java/org/qortal/transaction/MultiPaymentTransaction.java index c87b02ac..ff0172c2 100644 --- a/src/main/java/org/qora/transaction/MultiPaymentTransaction.java +++ b/src/main/java/org/qortal/transaction/MultiPaymentTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.PaymentData; -import org.qora.data.transaction.MultiPaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.payment.Payment; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.MultiPaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.payment.Payment; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class MultiPaymentTransaction extends Transaction { @@ -66,7 +66,7 @@ public class MultiPaymentTransaction extends Transaction { if (address.equals(senderAddress)) amount = amount.subtract(this.transactionData.getFee()); - // We're only interested in QORA + // We're only interested in QORT for (PaymentData paymentData : multiPaymentTransactionData.getPayments()) if (paymentData.getAssetId() == Asset.QORT) { if (address.equals(paymentData.getRecipient())) diff --git a/src/main/java/org/qora/transaction/PaymentTransaction.java b/src/main/java/org/qortal/transaction/PaymentTransaction.java similarity index 86% rename from src/main/java/org/qora/transaction/PaymentTransaction.java rename to src/main/java/org/qortal/transaction/PaymentTransaction.java index 273c7790..1dbbe337 100644 --- a/src/main/java/org/qora/transaction/PaymentTransaction.java +++ b/src/main/java/org/qortal/transaction/PaymentTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.PaymentData; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.payment.Payment; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.payment.Payment; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class PaymentTransaction extends Transaction { @@ -95,21 +95,21 @@ public class PaymentTransaction extends Transaction { @Override public void processReferencesAndFees() throws DataException { - // Wrap and delegate references processing to Payment class. Only update recipient's last reference if transferring QORA. + // Wrap and delegate references processing to Payment class. Only update recipient's last reference if transferring QORT. new Payment(this.repository).processReferencesAndFees(paymentTransactionData.getSenderPublicKey(), getPaymentData(), paymentTransactionData.getFee(), paymentTransactionData.getSignature(), false); } @Override public void orphan() throws DataException { - // Wrap and delegate payment processing to Payment class. Only revert recipient's last reference if transferring QORA. + // Wrap and delegate payment processing to Payment class. Only revert recipient's last reference if transferring QORT. new Payment(this.repository).orphan(paymentTransactionData.getSenderPublicKey(), getPaymentData(), paymentTransactionData.getFee(), paymentTransactionData.getSignature(), paymentTransactionData.getReference()); } @Override public void orphanReferencesAndFees() throws DataException { - // Wrap and delegate payment processing to Payment class. Only revert recipient's last reference if transferring QORA. + // Wrap and delegate payment processing to Payment class. Only revert recipient's last reference if transferring QORT. new Payment(this.repository).orphanReferencesAndFees(paymentTransactionData.getSenderPublicKey(), getPaymentData(), paymentTransactionData.getFee(), paymentTransactionData.getSignature(), paymentTransactionData.getReference(), false); } diff --git a/src/main/java/org/qora/transaction/RegisterNameTransaction.java b/src/main/java/org/qortal/transaction/RegisterNameTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/RegisterNameTransaction.java rename to src/main/java/org/qortal/transaction/RegisterNameTransaction.java index 3defabfd..3e358e0f 100644 --- a/src/main/java/org/qora/transaction/RegisterNameTransaction.java +++ b/src/main/java/org/qortal/transaction/RegisterNameTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.RegisterNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.RegisterNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/RemoveGroupAdminTransaction.java b/src/main/java/org/qortal/transaction/RemoveGroupAdminTransaction.java similarity index 88% rename from src/main/java/org/qora/transaction/RemoveGroupAdminTransaction.java rename to src/main/java/org/qortal/transaction/RemoveGroupAdminTransaction.java index d5b1d117..6d50f61a 100644 --- a/src/main/java/org/qora/transaction/RemoveGroupAdminTransaction.java +++ b/src/main/java/org/qortal/transaction/RemoveGroupAdminTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.RemoveGroupAdminTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.RemoveGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class RemoveGroupAdminTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/RewardShareTransaction.java b/src/main/java/org/qortal/transaction/RewardShareTransaction.java similarity index 95% rename from src/main/java/org/qora/transaction/RewardShareTransaction.java rename to src/main/java/org/qortal/transaction/RewardShareTransaction.java index 5cfa4ea1..e30b15f2 100644 --- a/src/main/java/org/qora/transaction/RewardShareTransaction.java +++ b/src/main/java/org/qortal/transaction/RewardShareTransaction.java @@ -1,21 +1,21 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.account.RewardShareData; -import org.qora.data.transaction.RewardShareTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transform.Transformer; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.account.RewardShareData; +import org.qortal.data.transaction.RewardShareTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transform.Transformer; public class RewardShareTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/SellNameTransaction.java b/src/main/java/org/qortal/transaction/SellNameTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/SellNameTransaction.java rename to src/main/java/org/qortal/transaction/SellNameTransaction.java index cf891c94..b9e95e10 100644 --- a/src/main/java/org/qora/transaction/SellNameTransaction.java +++ b/src/main/java/org/qortal/transaction/SellNameTransaction.java @@ -1,18 +1,18 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.naming.NameData; -import org.qora.data.transaction.SellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.naming.NameData; +import org.qortal.data.transaction.SellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/SetGroupTransaction.java b/src/main/java/org/qortal/transaction/SetGroupTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/SetGroupTransaction.java rename to src/main/java/org/qortal/transaction/SetGroupTransaction.java index 65d9e4da..e2f3f0b4 100644 --- a/src/main/java/org/qora/transaction/SetGroupTransaction.java +++ b/src/main/java/org/qortal/transaction/SetGroupTransaction.java @@ -1,16 +1,16 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.asset.Asset; -import org.qora.data.transaction.SetGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.SetGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class SetGroupTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/Transaction.java b/src/main/java/org/qortal/transaction/Transaction.java similarity index 96% rename from src/main/java/org/qora/transaction/Transaction.java rename to src/main/java/org/qortal/transaction/Transaction.java index 3e789469..f3cba5ea 100644 --- a/src/main/java/org/qora/transaction/Transaction.java +++ b/src/main/java/org/qortal/transaction/Transaction.java @@ -1,4 +1,4 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.math.BigInteger; @@ -14,25 +14,25 @@ import java.util.concurrent.locks.ReentrantLock; 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.block.BlockChain; -import org.qora.controller.Controller; -import org.qora.data.block.BlockData; -import org.qora.data.group.GroupApprovalData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.GroupRepository; -import org.qora.repository.Repository; -import org.qora.settings.Settings; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.TransactionTransformer; -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.block.BlockChain; +import org.qortal.controller.Controller; +import org.qortal.data.block.BlockData; +import org.qortal.data.group.GroupApprovalData; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.GroupRepository; +import org.qortal.repository.Repository; +import org.qortal.settings.Settings; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.TransactionTransformer; +import org.qortal.utils.NTP; import static java.util.Arrays.stream; import static java.util.stream.Collectors.toMap; @@ -366,7 +366,7 @@ public abstract class Transaction { public static int getVersionByTimestamp(long timestamp) { if (timestamp < BlockChain.getInstance().getPowFixReleaseTimestamp()) { return 1; - } else if (timestamp < BlockChain.getInstance().getQoraV2Timestamp()) { + } else if (timestamp < BlockChain.getInstance().getQortalTimestamp()) { return 3; } else { return 4; @@ -436,13 +436,13 @@ public abstract class Transaction { public abstract boolean isInvolved(Account account) throws DataException; /** - * Returns amount of QORA lost/gained by passed account due to this transaction. + * Returns amount of QORT lost/gained by passed account due to this transaction. *

* Amounts "lost", e.g. sent by sender and fees, are returned as negative values.
- * Amounts "gained", e.g. QORA sent to recipient, are returned as positive values. + * Amounts "gained", e.g. QORT sent to recipient, are returned as positive values. * * @param account - * @return Amount of QORA lost/gained by account, or BigDecimal.ZERO otherwise + * @return Amount of QORT lost/gained by account, or BigDecimal.ZERO otherwise * @throws DataException */ public abstract BigDecimal getAmount(Account account) throws DataException; diff --git a/src/main/java/org/qora/transaction/TransferAssetTransaction.java b/src/main/java/org/qortal/transaction/TransferAssetTransaction.java similarity index 89% rename from src/main/java/org/qora/transaction/TransferAssetTransaction.java rename to src/main/java/org/qortal/transaction/TransferAssetTransaction.java index 8f0b06a9..4374f7f8 100644 --- a/src/main/java/org/qora/transaction/TransferAssetTransaction.java +++ b/src/main/java/org/qortal/transaction/TransferAssetTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.PaymentData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.payment.Payment; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.payment.Payment; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class TransferAssetTransaction extends Transaction { @@ -57,7 +57,7 @@ public class TransferAssetTransaction extends Transaction { if (address.equals(senderAddress)) amount = amount.subtract(this.transactionData.getFee()); - // We're only interested in QORA amounts + // We're only interested in OQRT amounts if (transferAssetTransactionData.getAssetId() == Asset.QORT) { if (address.equals(transferAssetTransactionData.getRecipient())) amount = amount.add(transferAssetTransactionData.getAmount()); @@ -100,28 +100,28 @@ public class TransferAssetTransaction extends Transaction { @Override public void process() throws DataException { - // Wrap asset transfer as a payment and delegate processing to Payment class. Only update recipient's last reference if transferring QORA. + // Wrap asset transfer as a payment and delegate processing to Payment class. Only update recipient's last reference if transferring QORT. new Payment(this.repository).process(transferAssetTransactionData.getSenderPublicKey(), getPaymentData(), transferAssetTransactionData.getFee(), transferAssetTransactionData.getSignature()); } @Override public void processReferencesAndFees() throws DataException { - // Wrap asset transfer as a payment and delegate processing to Payment class. Only update recipient's last reference if transferring QORA. + // Wrap asset transfer as a payment and delegate processing to Payment class. Only update recipient's last reference if transferring QORT. new Payment(this.repository).processReferencesAndFees(transferAssetTransactionData.getSenderPublicKey(), getPaymentData(), transferAssetTransactionData.getFee(), transferAssetTransactionData.getSignature(), false); } @Override public void orphan() throws DataException { - // Wrap asset transfer as a payment and delegate processing to Payment class. Only revert recipient's last reference if transferring QORA. + // Wrap asset transfer as a payment and delegate processing to Payment class. Only revert recipient's last reference if transferring QORT. new Payment(this.repository).orphan(transferAssetTransactionData.getSenderPublicKey(), getPaymentData(), transferAssetTransactionData.getFee(), transferAssetTransactionData.getSignature(), transferAssetTransactionData.getReference()); } @Override public void orphanReferencesAndFees() throws DataException { - // Wrap asset transfer as a payment and delegate processing to Payment class. Only revert recipient's last reference if transferring QORA. + // Wrap asset transfer as a payment and delegate processing to Payment class. Only revert recipient's last reference if transferring QORT. new Payment(this.repository).orphanReferencesAndFees(transferAssetTransactionData.getSenderPublicKey(), getPaymentData(), transferAssetTransactionData.getFee(), transferAssetTransactionData.getSignature(), transferAssetTransactionData.getReference(), false); } diff --git a/src/main/java/org/qora/transaction/TransferPrivsTransaction.java b/src/main/java/org/qortal/transaction/TransferPrivsTransaction.java similarity index 95% rename from src/main/java/org/qora/transaction/TransferPrivsTransaction.java rename to src/main/java/org/qortal/transaction/TransferPrivsTransaction.java index 19c85c0e..8a4cd2bf 100644 --- a/src/main/java/org/qora/transaction/TransferPrivsTransaction.java +++ b/src/main/java/org/qortal/transaction/TransferPrivsTransaction.java @@ -1,4 +1,4 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Arrays; @@ -7,16 +7,16 @@ import java.util.List; 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.crypto.Crypto; -import org.qora.data.account.AccountData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferPrivsTransactionData; -import org.qora.repository.AccountRepository; -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.crypto.Crypto; +import org.qortal.data.account.AccountData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferPrivsTransactionData; +import org.qortal.repository.AccountRepository; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class TransferPrivsTransaction extends Transaction { diff --git a/src/main/java/org/qora/transaction/UpdateAssetTransaction.java b/src/main/java/org/qortal/transaction/UpdateAssetTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/UpdateAssetTransaction.java rename to src/main/java/org/qortal/transaction/UpdateAssetTransaction.java index 03f3d79a..8f4c2d09 100644 --- a/src/main/java/org/qora/transaction/UpdateAssetTransaction.java +++ b/src/main/java/org/qortal/transaction/UpdateAssetTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.asset.AssetData; -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.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.asset.AssetData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; @@ -76,7 +76,7 @@ public class UpdateAssetTransaction extends Transaction { @Override public ValidationResult isValid() throws DataException { // V2-only transaction - if (this.updateAssetTransactionData.getTimestamp() < BlockChain.getInstance().getQoraV2Timestamp()) + if (this.updateAssetTransactionData.getTimestamp() < BlockChain.getInstance().getQortalTimestamp()) return ValidationResult.NOT_YET_RELEASED; // Check asset actually exists diff --git a/src/main/java/org/qora/transaction/UpdateGroupTransaction.java b/src/main/java/org/qortal/transaction/UpdateGroupTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/UpdateGroupTransaction.java rename to src/main/java/org/qortal/transaction/UpdateGroupTransaction.java index 528f820a..e25b0b57 100644 --- a/src/main/java/org/qora/transaction/UpdateGroupTransaction.java +++ b/src/main/java/org/qortal/transaction/UpdateGroupTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.UpdateGroupTransactionData; -import org.qora.data.group.GroupData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.group.GroupData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateGroupTransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/UpdateNameTransaction.java b/src/main/java/org/qortal/transaction/UpdateNameTransaction.java similarity index 90% rename from src/main/java/org/qora/transaction/UpdateNameTransaction.java rename to src/main/java/org/qortal/transaction/UpdateNameTransaction.java index d3f2bfd4..5cc28c8e 100644 --- a/src/main/java/org/qora/transaction/UpdateNameTransaction.java +++ b/src/main/java/org/qortal/transaction/UpdateNameTransaction.java @@ -1,19 +1,19 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import org.qora.account.Account; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.naming.NameData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.UpdateNameTransactionData; -import org.qora.naming.Name; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.naming.NameData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateNameTransactionData; +import org.qortal.naming.Name; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transaction/VoteOnPollTransaction.java b/src/main/java/org/qortal/transaction/VoteOnPollTransaction.java similarity index 91% rename from src/main/java/org/qora/transaction/VoteOnPollTransaction.java rename to src/main/java/org/qortal/transaction/VoteOnPollTransaction.java index 3bb63d02..0c8fc9ca 100644 --- a/src/main/java/org/qora/transaction/VoteOnPollTransaction.java +++ b/src/main/java/org/qortal/transaction/VoteOnPollTransaction.java @@ -1,4 +1,4 @@ -package org.qora.transaction; +package org.qortal.transaction; import java.math.BigDecimal; import java.util.ArrayList; @@ -6,19 +6,19 @@ import java.util.List; 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.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.VoteOnPollTransactionData; -import org.qora.data.voting.PollData; -import org.qora.data.voting.PollOptionData; -import org.qora.data.voting.VoteOnPollData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.VotingRepository; -import org.qora.voting.Poll; +import org.qortal.account.Account; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.VoteOnPollTransactionData; +import org.qortal.data.voting.PollData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.data.voting.VoteOnPollData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.VotingRepository; +import org.qortal.voting.Poll; import com.google.common.base.Utf8; diff --git a/src/main/java/org/qora/transform/PaymentTransformer.java b/src/main/java/org/qortal/transform/PaymentTransformer.java similarity index 95% rename from src/main/java/org/qora/transform/PaymentTransformer.java rename to src/main/java/org/qortal/transform/PaymentTransformer.java index 4c6cf241..98b34143 100644 --- a/src/main/java/org/qora/transform/PaymentTransformer.java +++ b/src/main/java/org/qortal/transform/PaymentTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform; +package org.qortal.transform; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,8 +6,8 @@ import java.math.BigDecimal; import java.nio.ByteBuffer; import org.json.simple.JSONObject; -import org.qora.data.PaymentData; -import org.qora.utils.Serialization; +import org.qortal.data.PaymentData; +import org.qortal.utils.Serialization; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/transform/TransformationException.java b/src/main/java/org/qortal/transform/TransformationException.java similarity index 93% rename from src/main/java/org/qora/transform/TransformationException.java rename to src/main/java/org/qortal/transform/TransformationException.java index d8182574..514a9d44 100644 --- a/src/main/java/org/qora/transform/TransformationException.java +++ b/src/main/java/org/qortal/transform/TransformationException.java @@ -1,4 +1,4 @@ -package org.qora.transform; +package org.qortal.transform; public class TransformationException extends Exception { diff --git a/src/main/java/org/qora/transform/Transformer.java b/src/main/java/org/qortal/transform/Transformer.java similarity index 95% rename from src/main/java/org/qora/transform/Transformer.java rename to src/main/java/org/qortal/transform/Transformer.java index 71f77bfc..927e45d4 100644 --- a/src/main/java/org/qora/transform/Transformer.java +++ b/src/main/java/org/qortal/transform/Transformer.java @@ -1,4 +1,4 @@ -package org.qora.transform; +package org.qortal.transform; public abstract class Transformer { diff --git a/src/main/java/org/qora/transform/block/BlockTransformer.java b/src/main/java/org/qortal/transform/block/BlockTransformer.java similarity index 96% rename from src/main/java/org/qora/transform/block/BlockTransformer.java rename to src/main/java/org/qortal/transform/block/BlockTransformer.java index e863c9c2..e588805d 100644 --- a/src/main/java/org/qora/transform/block/BlockTransformer.java +++ b/src/main/java/org/qortal/transform/block/BlockTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.block; +package org.qortal.transform.block; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,21 +8,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.qora.account.PublicKeyAccount; -import org.qora.block.Block; -import org.qora.block.BlockChain; -import org.qora.data.at.ATStateData; -import org.qora.data.block.BlockData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.transform.Transformer; -import org.qora.transform.transaction.TransactionTransformer; -import org.qora.utils.Base58; -import org.qora.utils.Serialization; -import org.qora.utils.Triple; +import org.qortal.account.PublicKeyAccount; +import org.qortal.block.Block; +import org.qortal.block.BlockChain; +import org.qortal.data.at.ATStateData; +import org.qortal.data.block.BlockData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.transform.Transformer; +import org.qortal.transform.transaction.TransactionTransformer; +import org.qortal.utils.Base58; +import org.qortal.utils.Serialization; +import org.qortal.utils.Triple; import com.google.common.primitives.Bytes; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/transform/transaction/AccountFlagsTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/AccountFlagsTransactionTransformer.java similarity index 88% rename from src/main/java/org/qora/transform/transaction/AccountFlagsTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/AccountFlagsTransactionTransformer.java index 791f4d6f..032356fd 100644 --- a/src/main/java/org/qora/transform/transaction/AccountFlagsTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/AccountFlagsTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.AccountFlagsTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.AccountFlagsTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -46,7 +46,7 @@ public class AccountFlagsTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/AccountLevelTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/AccountLevelTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/AccountLevelTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/AccountLevelTransactionTransformer.java index 45f591c6..ede34e72 100644 --- a/src/main/java/org/qora/transform/transaction/AccountLevelTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/AccountLevelTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.AccountLevelTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.AccountLevelTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class AccountLevelTransactionTransformer extends TransactionTransformer { @@ -41,7 +41,7 @@ public class AccountLevelTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/AddGroupAdminTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/AddGroupAdminTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/AddGroupAdminTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/AddGroupAdminTransactionTransformer.java index 3f4a10b5..6b9f8059 100644 --- a/src/main/java/org/qora/transform/transaction/AddGroupAdminTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/AddGroupAdminTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.AddGroupAdminTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.AddGroupAdminTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -42,7 +42,7 @@ public class AddGroupAdminTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/ArbitraryTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/ArbitraryTransactionTransformer.java similarity index 90% rename from src/main/java/org/qora/transform/transaction/ArbitraryTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/ArbitraryTransactionTransformer.java index 0602e036..1dc62e22 100644 --- a/src/main/java/org/qora/transform/transaction/ArbitraryTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/ArbitraryTransactionTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,19 +8,19 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.qora.block.BlockChain; -import org.qora.crypto.Crypto; -import org.qora.data.PaymentData; -import org.qora.data.transaction.ArbitraryTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.ArbitraryTransactionData.DataType; -import org.qora.transaction.ArbitraryTransaction; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.PaymentTransformer; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.crypto.Crypto; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.ArbitraryTransactionData.DataType; +import org.qortal.transaction.ArbitraryTransaction; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.PaymentTransformer; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -63,7 +63,7 @@ public class ArbitraryTransactionTransformer extends TransactionTransformer { int version = Transaction.getVersionByTimestamp(timestamp); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -176,7 +176,7 @@ public class ArbitraryTransactionTransformer extends TransactionTransformer { return toBytesForSigningImplV4(arbitraryTransactionData); byte[] bytes = TransactionTransformer.toBytesForSigningImpl(transactionData); - if (arbitraryTransactionData.getVersion() == 1 || transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (arbitraryTransactionData.getVersion() == 1 || transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return bytes; // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/AtTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/AtTransactionTransformer.java similarity index 91% rename from src/main/java/org/qora/transform/transaction/AtTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/AtTransactionTransformer.java index 5cf8f5b0..6f966f7a 100644 --- a/src/main/java/org/qora/transform/transaction/AtTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/AtTransactionTransformer.java @@ -1,14 +1,14 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.data.transaction.ATTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.data.transaction.ATTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/src/main/java/org/qora/transform/transaction/BuyNameTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/BuyNameTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/BuyNameTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/BuyNameTransactionTransformer.java index 3e5be88d..1eb384a6 100644 --- a/src/main/java/org/qora/transform/transaction/BuyNameTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/BuyNameTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.BuyNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.BuyNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; @@ -46,7 +46,7 @@ public class BuyNameTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CancelAssetOrderTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CancelAssetOrderTransactionTransformer.java similarity index 85% rename from src/main/java/org/qora/transform/transaction/CancelAssetOrderTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CancelAssetOrderTransactionTransformer.java index 4deb397f..f694536a 100644 --- a/src/main/java/org/qora/transform/transaction/CancelAssetOrderTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CancelAssetOrderTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CancelAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class CancelAssetOrderTransactionTransformer extends TransactionTransformer { @@ -38,7 +38,7 @@ public class CancelAssetOrderTransactionTransformer extends TransactionTransform long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CancelGroupBanTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CancelGroupBanTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/CancelGroupBanTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CancelGroupBanTransactionTransformer.java index 376f43d7..3c0aa0d4 100644 --- a/src/main/java/org/qora/transform/transaction/CancelGroupBanTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CancelGroupBanTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CancelGroupBanTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelGroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -42,7 +42,7 @@ public class CancelGroupBanTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CancelGroupInviteTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CancelGroupInviteTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/CancelGroupInviteTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CancelGroupInviteTransactionTransformer.java index 43ae347e..58b01440 100644 --- a/src/main/java/org/qora/transform/transaction/CancelGroupInviteTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CancelGroupInviteTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CancelGroupInviteTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelGroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -42,7 +42,7 @@ public class CancelGroupInviteTransactionTransformer extends TransactionTransfor long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CancelSellNameTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CancelSellNameTransactionTransformer.java similarity index 85% rename from src/main/java/org/qora/transform/transaction/CancelSellNameTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CancelSellNameTransactionTransformer.java index 3ffabae6..deac57c6 100644 --- a/src/main/java/org/qora/transform/transaction/CancelSellNameTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CancelSellNameTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CancelSellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CancelSellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; @@ -42,7 +42,7 @@ public class CancelSellNameTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CreateAssetOrderTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CreateAssetOrderTransactionTransformer.java similarity index 91% rename from src/main/java/org/qora/transform/transaction/CreateAssetOrderTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CreateAssetOrderTransactionTransformer.java index 27e8a948..add1cfa6 100644 --- a/src/main/java/org/qora/transform/transaction/CreateAssetOrderTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CreateAssetOrderTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CreateAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreateAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; @@ -45,7 +45,7 @@ public class CreateAssetOrderTransactionTransformer extends TransactionTransform long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -110,7 +110,7 @@ public class CreateAssetOrderTransactionTransformer extends TransactionTransform * @throws TransformationException */ public static byte[] toBytesForSigningImpl(TransactionData transactionData) throws TransformationException { - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return TransactionTransformer.toBytesForSigningImpl(transactionData); // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/CreateGroupTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CreateGroupTransactionTransformer.java similarity index 90% rename from src/main/java/org/qora/transform/transaction/CreateGroupTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CreateGroupTransactionTransformer.java index 45330fb8..066777df 100644 --- a/src/main/java/org/qora/transform/transaction/CreateGroupTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CreateGroupTransactionTransformer.java @@ -1,19 +1,19 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CreateGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreateGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -56,7 +56,7 @@ public class CreateGroupTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/CreatePollTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/CreatePollTransactionTransformer.java similarity index 90% rename from src/main/java/org/qora/transform/transaction/CreatePollTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/CreatePollTransactionTransformer.java index b37063ae..fdb23781 100644 --- a/src/main/java/org/qora/transform/transaction/CreatePollTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/CreatePollTransactionTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,15 +7,15 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CreatePollTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.voting.PollOptionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; -import org.qora.voting.Poll; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreatePollTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; +import org.qortal.voting.Poll; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -54,7 +54,7 @@ public class CreatePollTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -79,7 +79,7 @@ public class CreatePollTransactionTransformer extends TransactionTransformer { pollOptions.add(new PollOptionData(optionName)); // V1 only: voter count also present - if (timestamp < BlockChain.getInstance().getQoraV2Timestamp()) { + if (timestamp < BlockChain.getInstance().getQortalTimestamp()) { int voterCount = byteBuffer.getInt(); if (voterCount != 0) throw new TransformationException("Unexpected voter count in byte data for CreatePollTransaction"); @@ -107,7 +107,7 @@ public class CreatePollTransactionTransformer extends TransactionTransformer { // option-string-length, option-string dataLength += INT_LENGTH + Utf8.encodedLength(pollOptionData.getOptionName()); - if (transactionData.getTimestamp() < BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() < BlockChain.getInstance().getQortalTimestamp()) // v1 only: voter-count (should always be zero) dataLength += INT_LENGTH; } @@ -135,7 +135,7 @@ public class CreatePollTransactionTransformer extends TransactionTransformer { for (PollOptionData pollOptionData : pollOptions) { Serialization.serializeSizedString(bytes, pollOptionData.getOptionName()); - if (transactionData.getTimestamp() < BlockChain.getInstance().getQoraV2Timestamp()) { + if (transactionData.getTimestamp() < BlockChain.getInstance().getQortalTimestamp()) { // In v1, CreatePollTransaction uses Poll.toBytes which serializes voters too. // Zero voters as this is a new poll. bytes.write(Ints.toByteArray(0)); @@ -164,7 +164,7 @@ public class CreatePollTransactionTransformer extends TransactionTransformer { public static byte[] toBytesForSigningImpl(TransactionData transactionData) throws TransformationException { byte[] bytes = TransactionTransformer.toBytesForSigningImpl(transactionData); - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return bytes; // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/DeployAtTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/DeployAtTransactionTransformer.java similarity index 92% rename from src/main/java/org/qora/transform/transaction/DeployAtTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/DeployAtTransactionTransformer.java index 64972978..ea571739 100644 --- a/src/main/java/org/qora/transform/transaction/DeployAtTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/DeployAtTransactionTransformer.java @@ -1,20 +1,20 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.DeployAtTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.DeployAtTransaction; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.DeployAtTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.DeployAtTransaction; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -63,7 +63,7 @@ public class DeployAtTransactionTransformer extends TransactionTransformer { int version = Transaction.getVersionByTimestamp(timestamp); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -166,7 +166,7 @@ public class DeployAtTransactionTransformer extends TransactionTransformer { * @throws TransformationException */ public static byte[] toBytesForSigningImpl(TransactionData transactionData) throws TransformationException { - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return TransactionTransformer.toBytesForSigningImpl(transactionData); // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/GenesisTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/GenesisTransactionTransformer.java similarity index 81% rename from src/main/java/org/qora/transform/transaction/GenesisTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/GenesisTransactionTransformer.java index 3514eda5..77068ec1 100644 --- a/src/main/java/org/qora/transform/transaction/GenesisTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/GenesisTransactionTransformer.java @@ -1,20 +1,20 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.account.GenesisAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GenesisTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.account.GenesisAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GenesisTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; @@ -48,7 +48,7 @@ public class GenesisTransactionTransformer extends TransactionTransformer { BigDecimal amount = Serialization.deserializeBigDecimal(byteBuffer); long assetId = Asset.QORT; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) assetId = byteBuffer.getLong(); BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, null, GenesisAccount.PUBLIC_KEY, BigDecimal.ZERO, null); @@ -57,10 +57,10 @@ public class GenesisTransactionTransformer extends TransactionTransformer { } public static int getDataLength(TransactionData transactionData) throws TransformationException { - if (transactionData.getTimestamp() < BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() < BlockChain.getInstance().getQortalTimestamp()) return TYPE_LENGTH + TIMESTAMP_LENGTH + RECIPIENT_LENGTH + AMOUNT_LENGTH; - // Qora V2+ + // Qortal return TYPE_LENGTH + TIMESTAMP_LENGTH + RECIPIENT_LENGTH + AMOUNT_LENGTH + ASSET_ID_LENGTH; } @@ -78,7 +78,7 @@ public class GenesisTransactionTransformer extends TransactionTransformer { Serialization.serializeBigDecimal(bytes, genesisTransactionData.getAmount()); - if (genesisTransactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (genesisTransactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) bytes.write(Longs.toByteArray(genesisTransactionData.getAssetId())); return bytes.toByteArray(); diff --git a/src/main/java/org/qora/transform/transaction/GroupApprovalTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/GroupApprovalTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/GroupApprovalTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/GroupApprovalTransactionTransformer.java index 61f4d25d..4f7414db 100644 --- a/src/main/java/org/qora/transform/transaction/GroupApprovalTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/GroupApprovalTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class GroupApprovalTransactionTransformer extends TransactionTransformer { @@ -40,7 +40,7 @@ public class GroupApprovalTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/GroupBanTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/GroupBanTransactionTransformer.java similarity index 88% rename from src/main/java/org/qora/transform/transaction/GroupBanTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/GroupBanTransactionTransformer.java index 5d022d1a..7e92f6f3 100644 --- a/src/main/java/org/qora/transform/transaction/GroupBanTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/GroupBanTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GroupBanTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -49,7 +49,7 @@ public class GroupBanTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/GroupInviteTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/GroupInviteTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/GroupInviteTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/GroupInviteTransactionTransformer.java index 3461970f..ecf10236 100644 --- a/src/main/java/org/qora/transform/transaction/GroupInviteTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/GroupInviteTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GroupInviteTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -44,7 +44,7 @@ public class GroupInviteTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/GroupKickTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/GroupKickTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/GroupKickTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/GroupKickTransactionTransformer.java index 9628a556..cc85fdb3 100644 --- a/src/main/java/org/qora/transform/transaction/GroupKickTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/GroupKickTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.GroupKickTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.GroupKickTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -47,7 +47,7 @@ public class GroupKickTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/IssueAssetTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/IssueAssetTransactionTransformer.java similarity index 91% rename from src/main/java/org/qora/transform/transaction/IssueAssetTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/IssueAssetTransactionTransformer.java index d02e1904..f9445bdc 100644 --- a/src/main/java/org/qora/transform/transaction/IssueAssetTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/IssueAssetTransactionTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -6,14 +6,14 @@ import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.Arrays; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.IssueAssetTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.IssueAssetTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Longs; @@ -60,7 +60,7 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -82,7 +82,7 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer { String data = ""; boolean isUnspendable = false; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) { + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) { // in v2, assets have additional fields data = Serialization.deserializeSizedString(byteBuffer, Asset.MAX_DATA_SIZE); isUnspendable = byteBuffer.get() != 0; @@ -108,7 +108,7 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer { + Utf8.encodedLength(issueAssetTransactionData.getAssetName()) + Utf8.encodedLength(issueAssetTransactionData.getDescription()); - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) { + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) { // In v2, assets have additional fields. dataLength += DATA_SIZE_LENGTH + Utf8.encodedLength(issueAssetTransactionData.getData()) + IS_UNSPENDABLE_LENGTH; } else { @@ -137,7 +137,7 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer { bytes.write((byte) (issueAssetTransactionData.getIsDivisible() ? 1 : 0)); // In v2, assets have additional fields. - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) { + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) { Serialization.serializeSizedString(bytes, issueAssetTransactionData.getData()); bytes.write((byte) (issueAssetTransactionData.getIsUnspendable() ? 1 : 0)); } else { @@ -173,7 +173,7 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer { public static byte[] toBytesForSigningImpl(TransactionData transactionData) throws TransformationException { byte[] bytes = TransactionTransformer.toBytesForSigningImpl(transactionData); - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return bytes; // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/JoinGroupTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/JoinGroupTransactionTransformer.java similarity index 84% rename from src/main/java/org/qora/transform/transaction/JoinGroupTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/JoinGroupTransactionTransformer.java index d585612e..7070683a 100644 --- a/src/main/java/org/qora/transform/transaction/JoinGroupTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/JoinGroupTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.JoinGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.JoinGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ public class JoinGroupTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/LeaveGroupTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/LeaveGroupTransactionTransformer.java similarity index 84% rename from src/main/java/org/qora/transform/transaction/LeaveGroupTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/LeaveGroupTransactionTransformer.java index 6207c338..69384ff8 100644 --- a/src/main/java/org/qora/transform/transaction/LeaveGroupTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/LeaveGroupTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.LeaveGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.LeaveGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ public class LeaveGroupTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/MessageTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/MessageTransactionTransformer.java similarity index 89% rename from src/main/java/org/qora/transform/transaction/MessageTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/MessageTransactionTransformer.java index 345ad1ee..eabd8890 100644 --- a/src/main/java/org/qora/transform/transaction/MessageTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/MessageTransactionTransformer.java @@ -1,20 +1,20 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.MessageTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.MessageTransaction; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.MessageTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.MessageTransaction; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; @@ -57,7 +57,7 @@ public class MessageTransactionTransformer extends TransactionTransformer { int version = Transaction.getVersionByTimestamp(timestamp); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/MultiPaymentTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/MultiPaymentTransactionTransformer.java similarity index 88% rename from src/main/java/org/qora/transform/transaction/MultiPaymentTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/MultiPaymentTransactionTransformer.java index 86bf768c..ec282b8f 100644 --- a/src/main/java/org/qora/transform/transaction/MultiPaymentTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/MultiPaymentTransactionTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.qora.block.BlockChain; -import org.qora.data.PaymentData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.MultiPaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.PaymentTransformer; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.MultiPaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.PaymentTransformer; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -48,7 +48,7 @@ public class MultiPaymentTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; @@ -113,7 +113,7 @@ public class MultiPaymentTransactionTransformer extends TransactionTransformer { public static byte[] toBytesForSigningImpl(TransactionData transactionData) throws TransformationException { byte[] bytes = TransactionTransformer.toBytesForSigningImpl(transactionData); - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) return bytes; // Special v1 version diff --git a/src/main/java/org/qora/transform/transaction/PaymentTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/PaymentTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/PaymentTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/PaymentTransactionTransformer.java index a6ed003b..8b55764a 100644 --- a/src/main/java/org/qora/transform/transaction/PaymentTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/PaymentTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class PaymentTransactionTransformer extends TransactionTransformer { @@ -40,7 +40,7 @@ public class PaymentTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/RegisterNameTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/RegisterNameTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/RegisterNameTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/RegisterNameTransactionTransformer.java index 62d5427e..f6235c60 100644 --- a/src/main/java/org/qora/transform/transaction/RegisterNameTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/RegisterNameTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.RegisterNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RegisterNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; @@ -47,7 +47,7 @@ public class RegisterNameTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/RemoveGroupAdminTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/RemoveGroupAdminTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/RemoveGroupAdminTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/RemoveGroupAdminTransactionTransformer.java index 1926dfd2..752d209b 100644 --- a/src/main/java/org/qora/transform/transaction/RemoveGroupAdminTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/RemoveGroupAdminTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.RemoveGroupAdminTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RemoveGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -42,7 +42,7 @@ public class RemoveGroupAdminTransactionTransformer extends TransactionTransform long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/RewardShareTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/RewardShareTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/RewardShareTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/RewardShareTransactionTransformer.java index 40db4eb2..44f3228d 100644 --- a/src/main/java/org/qora/transform/transaction/RewardShareTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/RewardShareTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.RewardShareTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.RewardShareTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class RewardShareTransactionTransformer extends TransactionTransformer { @@ -41,7 +41,7 @@ public class RewardShareTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/SellNameTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/SellNameTransactionTransformer.java similarity index 86% rename from src/main/java/org/qora/transform/transaction/SellNameTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/SellNameTransactionTransformer.java index a6ac366d..26f3b4dd 100644 --- a/src/main/java/org/qora/transform/transaction/SellNameTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/SellNameTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.SellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.naming.Name; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.SellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.naming.Name; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; @@ -44,7 +44,7 @@ public class SellNameTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/SetGroupTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/SetGroupTransactionTransformer.java similarity index 85% rename from src/main/java/org/qora/transform/transaction/SetGroupTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/SetGroupTransactionTransformer.java index 382caa9a..12a0f01a 100644 --- a/src/main/java/org/qora/transform/transaction/SetGroupTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/SetGroupTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.SetGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.SetGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ public class SetGroupTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/TransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/TransactionTransformer.java similarity index 96% rename from src/main/java/org/qora/transform/transaction/TransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/TransactionTransformer.java index 8595d939..820c1bdd 100644 --- a/src/main/java/org/qora/transform/transaction/TransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/TransactionTransformer.java @@ -1,4 +1,4 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -17,13 +17,13 @@ import javax.xml.bind.annotation.XmlElement; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.BlockChain; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.transform.Transformer; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.TransactionData; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.transform.Transformer; import com.google.common.hash.HashCode; import com.google.common.primitives.Ints; @@ -225,7 +225,7 @@ public abstract class TransactionTransformer extends Transformer { // All transactions have at least txType, timestamp, reference, tx creator's public key and also fee and signature (on the end) int baseLength = TYPE_LENGTH + TIMESTAMP_LENGTH + REFERENCE_LENGTH + PUBLIC_KEY_LENGTH + FEE_LENGTH + SIGNATURE_LENGTH; - if (transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp()) + if (transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp()) baseLength += GROUPID_LENGTH; return baseLength; @@ -309,7 +309,7 @@ public abstract class TransactionTransformer extends Transformer { } protected static void transformCommonBytes(TransactionData transactionData, ByteArrayOutputStream bytes) throws IOException { - boolean v2 = transactionData.getTimestamp() >= BlockChain.getInstance().getQoraV2Timestamp(); + boolean v2 = transactionData.getTimestamp() >= BlockChain.getInstance().getQortalTimestamp(); // Transaction type bytes.write(Ints.toByteArray(transactionData.getType().value)); diff --git a/src/main/java/org/qora/transform/transaction/TransferAssetTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/TransferAssetTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/TransferAssetTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/TransferAssetTransactionTransformer.java index 467f06ff..b116d58e 100644 --- a/src/main/java/org/qora/transform/transaction/TransferAssetTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/TransferAssetTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.primitives.Longs; @@ -44,7 +44,7 @@ public class TransferAssetTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/TransferPrivsTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/TransferPrivsTransactionTransformer.java similarity index 85% rename from src/main/java/org/qora/transform/transaction/TransferPrivsTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/TransferPrivsTransactionTransformer.java index 920bb23d..66fcaf3a 100644 --- a/src/main/java/org/qora/transform/transaction/TransferPrivsTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/TransferPrivsTransactionTransformer.java @@ -1,17 +1,17 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferPrivsTransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferPrivsTransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; public class TransferPrivsTransactionTransformer extends TransactionTransformer { @@ -38,7 +38,7 @@ public class TransferPrivsTransactionTransformer extends TransactionTransformer long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/UpdateAssetTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/UpdateAssetTransactionTransformer.java similarity index 89% rename from src/main/java/org/qora/transform/transaction/UpdateAssetTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/UpdateAssetTransactionTransformer.java index 31bcffe4..c0d2b70b 100644 --- a/src/main/java/org/qora/transform/transaction/UpdateAssetTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/UpdateAssetTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.transaction.UpdateAssetTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateAssetTransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Longs; @@ -51,7 +51,7 @@ public class UpdateAssetTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/UpdateGroupTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/UpdateGroupTransactionTransformer.java similarity index 90% rename from src/main/java/org/qora/transform/transaction/UpdateGroupTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/UpdateGroupTransactionTransformer.java index 8a6d26fb..ac587c20 100644 --- a/src/main/java/org/qora/transform/transaction/UpdateGroupTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/UpdateGroupTransactionTransformer.java @@ -1,19 +1,19 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.UpdateGroupTransactionData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateGroupTransactionData; +import org.qortal.group.Group; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -57,7 +57,7 @@ public class UpdateGroupTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/UpdateNameTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/UpdateNameTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/UpdateNameTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/UpdateNameTransactionTransformer.java index 93d165c2..41b7c216 100644 --- a/src/main/java/org/qora/transform/transaction/UpdateNameTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/UpdateNameTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.UpdateNameTransactionData; -import org.qora.naming.Name; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateNameTransactionData; +import org.qortal.naming.Name; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; import com.google.common.base.Utf8; @@ -47,7 +47,7 @@ public class UpdateNameTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/transform/transaction/VoteOnPollTransactionTransformer.java b/src/main/java/org/qortal/transform/transaction/VoteOnPollTransactionTransformer.java similarity index 87% rename from src/main/java/org/qora/transform/transaction/VoteOnPollTransactionTransformer.java rename to src/main/java/org/qortal/transform/transaction/VoteOnPollTransactionTransformer.java index 7faaf42b..8bb577ab 100644 --- a/src/main/java/org/qora/transform/transaction/VoteOnPollTransactionTransformer.java +++ b/src/main/java/org/qortal/transform/transaction/VoteOnPollTransactionTransformer.java @@ -1,18 +1,18 @@ -package org.qora.transform.transaction; +package org.qortal.transform.transaction; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.VoteOnPollTransactionData; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.utils.Serialization; -import org.qora.voting.Poll; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.VoteOnPollTransactionData; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.utils.Serialization; +import org.qortal.voting.Poll; import com.google.common.base.Utf8; import com.google.common.primitives.Ints; @@ -45,7 +45,7 @@ public class VoteOnPollTransactionTransformer extends TransactionTransformer { long timestamp = byteBuffer.getLong(); int txGroupId = 0; - if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) + if (timestamp >= BlockChain.getInstance().getQortalTimestamp()) txGroupId = byteBuffer.getInt(); byte[] reference = new byte[REFERENCE_LENGTH]; diff --git a/src/main/java/org/qora/ui/DownloadResourceService.java b/src/main/java/org/qortal/ui/DownloadResourceService.java similarity index 98% rename from src/main/java/org/qora/ui/DownloadResourceService.java rename to src/main/java/org/qortal/ui/DownloadResourceService.java index 57613560..0345bdf0 100644 --- a/src/main/java/org/qora/ui/DownloadResourceService.java +++ b/src/main/java/org/qortal/ui/DownloadResourceService.java @@ -1,4 +1,4 @@ -package org.qora.ui; +package org.qortal.ui; import java.io.IOException; import java.util.Enumeration; diff --git a/src/main/java/org/qora/ui/UiService.java b/src/main/java/org/qortal/ui/UiService.java similarity index 98% rename from src/main/java/org/qora/ui/UiService.java rename to src/main/java/org/qortal/ui/UiService.java index f8756e36..83a09b8f 100644 --- a/src/main/java/org/qora/ui/UiService.java +++ b/src/main/java/org/qortal/ui/UiService.java @@ -1,4 +1,4 @@ -package org.qora.ui; +package org.qortal.ui; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -12,7 +12,7 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlets.CrossOriginFilter; -import org.qora.settings.Settings; +import org.qortal.settings.Settings; public class UiService { diff --git a/src/main/java/org/qora/utils/BIP39.java b/src/main/java/org/qortal/utils/BIP39.java similarity index 96% rename from src/main/java/org/qora/utils/BIP39.java rename to src/main/java/org/qortal/utils/BIP39.java index 99043726..10a8ca8b 100644 --- a/src/main/java/org/qora/utils/BIP39.java +++ b/src/main/java/org/qortal/utils/BIP39.java @@ -1,9 +1,9 @@ -package org.qora.utils; +package org.qortal.utils; import java.util.ArrayList; import java.util.List; -import org.qora.globalization.BIP39WordList; +import org.qortal.globalization.BIP39WordList; public class BIP39 { diff --git a/src/main/java/org/qora/utils/Base58.java b/src/main/java/org/qortal/utils/Base58.java similarity index 99% rename from src/main/java/org/qora/utils/Base58.java rename to src/main/java/org/qortal/utils/Base58.java index 6d4f669f..8fa9ddad 100644 --- a/src/main/java/org/qora/utils/Base58.java +++ b/src/main/java/org/qortal/utils/Base58.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.qora.utils; +package org.qortal.utils; import java.io.UnsupportedEncodingException; import java.math.BigInteger; diff --git a/src/main/java/org/qora/utils/BitTwiddling.java b/src/main/java/org/qortal/utils/BitTwiddling.java similarity index 94% rename from src/main/java/org/qora/utils/BitTwiddling.java rename to src/main/java/org/qortal/utils/BitTwiddling.java index 1dc6cbfd..e17e6034 100644 --- a/src/main/java/org/qora/utils/BitTwiddling.java +++ b/src/main/java/org/qortal/utils/BitTwiddling.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; public class BitTwiddling { diff --git a/src/main/java/org/qora/utils/ByteArray.java b/src/main/java/org/qortal/utils/ByteArray.java similarity index 97% rename from src/main/java/org/qora/utils/ByteArray.java rename to src/main/java/org/qortal/utils/ByteArray.java index 604e586b..d89714e1 100644 --- a/src/main/java/org/qora/utils/ByteArray.java +++ b/src/main/java/org/qortal/utils/ByteArray.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; public class ByteArray implements Comparable { diff --git a/src/main/java/org/qora/utils/ExecuteProduceConsume.java b/src/main/java/org/qortal/utils/ExecuteProduceConsume.java similarity index 99% rename from src/main/java/org/qora/utils/ExecuteProduceConsume.java rename to src/main/java/org/qortal/utils/ExecuteProduceConsume.java index 237ede76..451a616c 100644 --- a/src/main/java/org/qora/utils/ExecuteProduceConsume.java +++ b/src/main/java/org/qortal/utils/ExecuteProduceConsume.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/org/qora/utils/NTP.java b/src/main/java/org/qortal/utils/NTP.java similarity index 99% rename from src/main/java/org/qora/utils/NTP.java rename to src/main/java/org/qortal/utils/NTP.java index 6bae7564..36eae1e1 100644 --- a/src/main/java/org/qora/utils/NTP.java +++ b/src/main/java/org/qortal/utils/NTP.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; import java.io.IOException; import java.net.InetAddress; @@ -18,7 +18,7 @@ import org.apache.commons.net.ntp.TimeInfo; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.settings.Settings; +import org.qortal.settings.Settings; public class NTP implements Runnable { diff --git a/src/main/java/org/qora/utils/Pair.java b/src/main/java/org/qortal/utils/Pair.java similarity index 96% rename from src/main/java/org/qora/utils/Pair.java rename to src/main/java/org/qortal/utils/Pair.java index 9293bf22..77f4c68b 100644 --- a/src/main/java/org/qora/utils/Pair.java +++ b/src/main/java/org/qortal/utils/Pair.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; public class Pair { diff --git a/src/main/java/org/qora/utils/Serialization.java b/src/main/java/org/qortal/utils/Serialization.java similarity index 96% rename from src/main/java/org/qora/utils/Serialization.java rename to src/main/java/org/qortal/utils/Serialization.java index 94bacfa7..27852ca0 100644 --- a/src/main/java/org/qora/utils/Serialization.java +++ b/src/main/java/org/qortal/utils/Serialization.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,8 +8,8 @@ import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import org.qora.transform.TransformationException; -import org.qora.transform.Transformer; +import org.qortal.transform.TransformationException; +import org.qortal.transform.Transformer; import com.google.common.primitives.Ints; diff --git a/src/main/java/org/qora/utils/StringLongMapXmlAdapter.java b/src/main/java/org/qortal/utils/StringLongMapXmlAdapter.java similarity index 98% rename from src/main/java/org/qora/utils/StringLongMapXmlAdapter.java rename to src/main/java/org/qortal/utils/StringLongMapXmlAdapter.java index eae5d8f0..00625462 100644 --- a/src/main/java/org/qora/utils/StringLongMapXmlAdapter.java +++ b/src/main/java/org/qortal/utils/StringLongMapXmlAdapter.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/qora/utils/Triple.java b/src/main/java/org/qortal/utils/Triple.java similarity index 94% rename from src/main/java/org/qora/utils/Triple.java rename to src/main/java/org/qortal/utils/Triple.java index 9f7c7a15..5095a2da 100644 --- a/src/main/java/org/qora/utils/Triple.java +++ b/src/main/java/org/qortal/utils/Triple.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; public class Triple { diff --git a/src/main/java/org/qora/utils/URLViewer.java b/src/main/java/org/qortal/utils/URLViewer.java similarity index 96% rename from src/main/java/org/qora/utils/URLViewer.java rename to src/main/java/org/qortal/utils/URLViewer.java index 9e76bbbd..e03e6141 100644 --- a/src/main/java/org/qora/utils/URLViewer.java +++ b/src/main/java/org/qortal/utils/URLViewer.java @@ -1,4 +1,4 @@ -package org.qora.utils; +package org.qortal.utils; import java.awt.Desktop; import java.net.URI; diff --git a/src/main/java/org/qora/voting/Poll.java b/src/main/java/org/qortal/voting/Poll.java similarity index 90% rename from src/main/java/org/qora/voting/Poll.java rename to src/main/java/org/qortal/voting/Poll.java index 5d051f55..8792f379 100644 --- a/src/main/java/org/qora/voting/Poll.java +++ b/src/main/java/org/qortal/voting/Poll.java @@ -1,9 +1,9 @@ -package org.qora.voting; +package org.qortal.voting; -import org.qora.data.transaction.CreatePollTransactionData; -import org.qora.data.voting.PollData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.data.transaction.CreatePollTransactionData; +import org.qortal.data.voting.PollData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class Poll { diff --git a/src/main/resources/blockchain.json b/src/main/resources/blockchain.json index a7a726c3..37a6ce6b 100644 --- a/src/main/resources/blockchain.json +++ b/src/main/resources/blockchain.json @@ -51,105 +51,147 @@ "votingTimestamp": 0, "arbitraryTimestamp": 0, "powfixTimestamp": 0, - "v2Timestamp": 0, + "qortalTimestamp": 0, "newAssetPricingTimestamp": 0, "groupApprovalTimestamp": 0 }, "genesisInfo": { "version": 4, - "timestamp": "1579860000000", + "timestamp": "1580720000000", "transactions": [ { "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORT", "description": "QORTAL coin", "quantity": 0, "isDivisible": true, "reference": "28u54WRcMfGujtQMZ9dNKFXVqucY7XfPihXAqPFsnx853NPUwfDJy1sMH5boCkahFgjUNYqc5fkduxdBhQTKgUsC", "data": "{}" }, - { "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORA", "description": "Representative legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true }, + { "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "Legacy-QORA", "description": "Representative legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true }, { "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORT-from-QORA", "description": "QORT gained from holding legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true }, - { "type": "ACCOUNT_FLAGS", "target": "QbmBdAbvmXqCya8bia8WaD5izumKkC9BrY", "andMask": -1, "orMask": 0, "xorMask": 0 }, - { "type": "ACCOUNT_FLAGS", "target": "QNuvYvBRUQgNj8u7gbLqBruDjKL1qzemND", "andMask": -1, "orMask": 0, "xorMask": 0 }, - { "type": "ACCOUNT_FLAGS", "target": "QhPXuFFRa9s91Q2qYKpSN5LVCUTqYkgRLz", "andMask": -1, "orMask": 0, "xorMask": 0 }, - { "type": "ACCOUNT_FLAGS", "target": "QY82MasqEH6ChwXaETH4piMtE8Pk4NBWD3", "andMask": -1, "orMask": 1, "xorMask": 0 }, { "type": "ACCOUNT_FLAGS", "target": "QdAESUvjxT764zNnYyo53DVbu7nusmjuee", "andMask": -1, "orMask": 1, "xorMask": 0 }, { "type": "ACCOUNT_FLAGS", "target": "QcPro2T97Q8cAfcVM4Pn4fv71Za4T6oeFD", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QbJqEntoBFps7XECQkTDFzXNCdz9R2qmkB", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QceNmCiZxxLdvL85huifVcnk64udcJ47Jr", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "Qd453ewoyESrEgUab6dTFe2pufWkD94Tsm", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QfjoMGib4trpZHzxUSMdmtiRnsrLNf74zp", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "Qgfh143pRJyxpS92JoazjXNMH1uZueQBZ2", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QicRwDhfk8M2CGNvpMEmYzQEjESvF7WrFY", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QLwMaXmDDUvh7aN5MdpY28rqTKE8U1Cepc", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QP3J3GHgjqP69neTAprpYe4co33eKQiQpS", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QPsjHoKhugEADrtSQP5xjFgsaQPn9WmE3Y", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QRt11DVBnLaSDxr2KHvx92LdPrjhbhJtkj", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QSbHwxaBh5P7wXDurk2KCb8d1sCVN4JpMf", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QTE6b4xF8ecQTdphXn2BrptPVgRWCkzMQC", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QUxh6PNsKhwJ12qGaM3AC1xZjwxy4hk1RG", "andMask": -1, "orMask": 1, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QXZk64nkBfGeaU8jFmaHtcDTG8ydwqZcWf", "andMask": -1, "orMask": 1, "xorMask": 0 }, + + { "type": "ACCOUNT_FLAGS", "target": "QTx98gU8ErigXkViWkvRH5JfaMpk8b3bHe", "andMask": -1, "orMask": 0, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QbmBdAbvmXqCya8bia8WaD5izumKkC9BrY", "andMask": -1, "orMask": 0, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QNuvYvBRUQgNj8u7gbLqBruDjKL1qzemND", "andMask": -1, "orMask": 0, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QSJ5cDLWivGcn9ym21azufBfiqeuGH1maq", "andMask": -1, "orMask": 0, "xorMask": 0 }, + { "type": "ACCOUNT_FLAGS", "target": "QhPXuFFRa9s91Q2qYKpSN5LVCUTqYkgRLz", "andMask": -1, "orMask": 0, "xorMask": 0 }, + { "type": "REWARD_SHARE", "minterPublicKey": "HFDmuc4HAAoVs9Siea3MugjBHasbotgVz2gsRDuLAAcB", "recipient": "QY82MasqEH6ChwXaETH4piMtE8Pk4NBWD3", "rewardSharePublicKey": "F35TbQXmgzz32cALj29jxzpdYSUKQvssqThLsZSabSXx", "sharePercent": 0 }, { "type": "CREATE_GROUP", "creatorPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "owner": "QbmBdAbvmXqCya8bia8WaD5izumKkC9BrY", "groupName": "dev-group", "description": "developer group", "isOpen": true, "approvalThreshold": "ONE", "minimumBlockDelay": 10, "maximumBlockDelay": 1440 }, + { "type": "JOIN_GROUP", "joinerPublicKey": "Gqcfa6YGXnKTr4F3QMpDQkjxxLGBmsq83wXcYeZvES7i", "groupId": 1 }, + { "type": "ADD_GROUP_ADMIN", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "member": "QTx98gU8ErigXkViWkvRH5JfaMpk8b3bHe" }, + { "type": "JOIN_GROUP", "joinerPublicKey": "CrHdj5wKFtu7961zYvCxW76K1hHPSNpo43XP1hTWryJR", "groupId": 1 }, { "type": "ADD_GROUP_ADMIN", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "member": "QNuvYvBRUQgNj8u7gbLqBruDjKL1qzemND" }, + { "type": "JOIN_GROUP", "joinerPublicKey": "2ZnSnZcpvMePw23f3AefANbRQHs7KjDyAyEzXc9dBMdn", "groupId": 1 }, + { "type": "ADD_GROUP_ADMIN", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "member": "QSJ5cDLWivGcn9ym21azufBfiqeuGH1maq" }, + { "type": "JOIN_GROUP", "joinerPublicKey": "25jxnXz3xF3tK2WJHpUHwGx7DXR6yfjAHF1hFX5ice6H", "groupId": 1 }, { "type": "ADD_GROUP_ADMIN", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "member": "QhPXuFFRa9s91Q2qYKpSN5LVCUTqYkgRLz" }, - { "type": "UPDATE_GROUP", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "newOwner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "newDescription": "developer group", "newIsOpen": true, "newApprovalThreshold": "ONE", "minimumBlockDelay": 10, "maximumBlockDelay": 1440 }, + { "type": "UPDATE_GROUP", "ownerPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "groupId": 1, "newOwner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "newDescription": "developer group", "newIsOpen": false, "newApprovalThreshold": "PCT20", "minimumBlockDelay": 10, "maximumBlockDelay": 1440 }, { "type": "REGISTER_NAME", "registrantPublicKey": "CVancqfgb2vWLXHjqZF8LtoQyB7Y5HtZUrFKvtwrTkNW", "owner": "QbmBdAbvmXqCya8bia8WaD5izumKkC9BrY", "name": "ciyam", "data": "{}" }, + { "type": "ACCOUNT_LEVEL", "target": "QVLuvt9krmxXwQPAeAhxzhuMF5i8F4aNs8", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "Qe9VPzQp3h4Kg3DHSHBUQ3AM3AiRBfCDfX", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QcrnYL6yNwHKuEzYLXQ8LewG3m2B5k9K5f", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QVLuvt9krmxXwQPAeAhxzhuMF5i8F4aNs8", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QPYfRd1uhnAgqkZNmjNCjgPhkguMnHWuc4", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QM9zVbXXnfrtQ1X7zPQ5zxPYPAWTaVMXqZ", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "Qft1ktvJ14eBFjpJaphT24ks4WRcN3K6tB", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QaUciVnbQDXdNygJadEY31PuDEBLi6Spmu", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QcHF9YogbuzZhG4fK4116pgE2qrmbkGh2n", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QWe1iPDudLU189BggPykbH1DrAeaFEgX6W", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QgECFJiiri2dDN4zA32URvbdDid2cFrJwM", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QTTrv8SWR8huV8TFYUEQhfZ1j1JmtL5p8G", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QYgVi26jUqMzJo4ahZV9yekQNnYKHBaX8r", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QWe1iPDudLU189BggPykbH1DrAeaFEgX6W", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QQa3MTgdnru5B7wSqPcq7qXcZcpbDQ7oyE", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QUvoLFfkuVuRe1KGMLQS4nUHry6CBTuTYz", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QXan6JJ1WuRi7GigvFDjtTzJY1rfYEqEqv", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QUvoLFfkuVuRe1KGMLQS4nUHry6CBTuTYz", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QTEE4ZJXv68ke4841HWjTLAAU8mfccxwbE", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QQoHo1x4hvZcSFbj2uQAXQhq2ZXBUgPeNj", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QVurebcEbe4USR4xcS3Mbk12mhxsjRX31u", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QfmM8dgfikTB2FYVuJ9owzQXVm8wP7T4QT", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QPUMyJ59kkrp75tDzDPxSyw1GWCrbC2cS2", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QQEZEGWt3sAPwEWYD2RQ6tMwnpkayG81dY", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "Qc9dZchoYfc1eRJhSLXR9rxSHcqNB47Dex", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QTMTFswUU83XVmk6T4Gez7qUJCccbAad7S", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QQEZEGWt3sAPwEWYD2RQ6tMwnpkayG81dY", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QjrC8NXwR8gFkEauvRwCPxqHroPFqAJbhK", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QPcTWoAhYWmwjmWbQAS8muisrQVaLJMbg7", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QWpJxitn53ovwknQfrCaqivvoUNuPrX2sb", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QLpLY9o3X21q7q4L6u5JdDuMskYA838iYE", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QdGbhtkFHUqd9nK9UegxxGXD1eSRYSoKjt", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QgpAW6uqwNR58gNYWRCVXNLm4F5TuckAw4", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QP8xG56L8b28h1mguSk9LuzNhxbHgAoL9b", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QfjL32jLsxtumbfx6ufmfCFCBccVCQFkrh", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QgpAW6uqwNR58gNYWRCVXNLm4F5TuckAw4", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QbwgBD6LWdk1hZsb8EwdVVmDZdvpxMzyGT", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "Qbcy4uyMkQF2JXYqGkueDiFNZ4tHjRg8CR", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QdXe21sjY8smjVmiAUgZY8xWVzwgxMgK5A", "level": 5 }, - { "type": "ACCOUNT_LEVEL", "target": "QawB5MesBratjs2d9EMnXnrN4EC7gw7LRw", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QXKmtkHHwaUQzGeHHG2dFiHUnKAp815Mzq", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QZkThgFfExognAbxLjYZGVHpL7X6g3EG4A", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QawB5MesBratjs2d9EMnXnrN4EC7gw7LRw", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QPEbvVBWDG7qgy4smY8nWiie78Vec8qiT9", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QXKmtkHHwaUQzGeHHG2dFiHUnKAp815Mzq", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QguNJ4evpN9i76dYHysTzLiKoWKFhE4B4U", "level": 5 }, + { "type": "ACCOUNT_LEVEL", "target": "QZkThgFfExognAbxLjYZGVHpL7X6g3EG4A", "level": 5 }, { "type": "ACCOUNT_LEVEL", "target": "QbH8srDKeS5VcsQsgsaF3nqCzGT1NqfsTx", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QdtAQm1EGNgM7QDSaC2qvV9WdpRHwpApUT", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QRFHr4jnVgvAsPTubeSrh8bPy1yzwzYaWD", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QVkQTr8PzDTaNxhvrC47UUxUi6V987a5qL", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QWuW2YMygVtWieUo6a4yayD1xFDWdnmo5j", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QbqRyFw7Xu6Nsb4FraaUSe7nUPukuUpekG", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QguNJ4evpN9i76dYHysTzLiKoWKFhE4B4U", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QjrC8NXwR8gFkEauvRwCPxqHroPFqAJbhK", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QSkiGy3v3MwvGy3aACuyLDv3Xy2AWAYfPS", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QVkQTr8PzDTaNxhvrC47UUxUi6V987a5qL", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QQPYyoE3Bm2vh8Wr5aaBNyirC8dd3BhBGH", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QUzUCfoakDqBaL5zBgfvTKLHcuxbUfB38Q", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QSBJuNoCAFUTcevuCTcMi3i5nzNPhC5R4b", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QTGeQqn3XEFdnnCqvifCFXYdKym7SaHzTd", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QVSqUrNFR4mPTMa7UdVmNKZTSaDVAv8XXF", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QMLjFiPiPa46YBRoushe6a227kSrXnXyKb", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QgVZb632eqF1eLQm9gBGuBtyp9Dyz2FKUK", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QPREQjU2defiYdgA33HDiLNGBpxtuebeqE", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QiBYApdEYRwsFYjt59UJqZV55wcwykvhsh", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QNJ8jDx6Mni2GKLHEY1BMh9xDumT3vnJQM", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QMsKXQAYKmR7dBH4P3kMLiKzYatK3h1CeS", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QRCtc67FTNKS5zVXM8omw8F55h9DP7herL", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QZvHW7amu5DNktsBgaMrR1brHZhhhVwKLW", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QgqM5bKs3tNqKNAnVeaQp4oaYMXCmX6YJr", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QhMEWhZCufhKLkfuNU2DAzj1mmWoAxX147", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QWuW2YMygVtWieUo6a4yayD1xFDWdnmo5j", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QSkiGy3v3MwvGy3aACuyLDv3Xy2AWAYfPS", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QbvxC3ENqomXp11833APchdjeyCNd49nLj", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "Qj5ncwncQY4KPYgKHD1eYpXHbR717PeLcJ", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QY1RFZTD2ogRohf3UrdT4g1Qo9D122AZDN", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QcU4VhU9ohDXU4k4AUMapgJRYSzEpizjLN", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QYGcPZcRhGaY1MsiDr3VtwTXmB9TAbLFSn", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QZsygC1chppsJK1cnaHG4fEsNaDYfLF7ZJ", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QYGcPZcRhGaY1MsiDr3VtwTXmB9TAbLFSn", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QaFN7DWcGF7keNACJpwCVnegePbfsAoFCw", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QYGNMWBmqWgVtMWGHypAsKhDVQw5mrFZww", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QcNmqT8CZ6zSZwuRm5LahRZnuGBJRnPY8o", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QXv4WiqgryFPi8BgX7RU7gqtAgrVutmU4S", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QRKRk5HVADsN1LHygK7q2pA7dWnYKnPpCT", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QSGB4Rd2xhd6UmA9LALTQ4f89Tfsz5VajU", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QNVKrjEq5bZdiDtgo64m5kz87rTHqCwvCP", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "QNMDKE7XTujNQkuQorcHXw6hL7qRvyaTjr", "level": 4 }, - { "type": "ACCOUNT_LEVEL", "target": "QY6ZGZdi8h5op2VrRXkG1W5Jp3feLwp7ZD", "level": 4 }, { "type": "ACCOUNT_LEVEL", "target": "Qgwb5SLVGAperXAMoVNBDvGpVAxTVY7f6F", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QgCQq4cFaGrJhwvKs4XwvccKiLZ8GVMCXR", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QRtRELSSASzqiYy2FtNcrePH6TVnqJkv9B", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QMtm8wVPHGE3qHg2hMaj6SZ78D5eXw3VWZ", "level": 4 }, + { "type": "ACCOUNT_LEVEL", "target": "QY6ZGZdi8h5op2VrRXkG1W5Jp3feLwp7ZD", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QVrvy4ac2jBTfxyCKB7MLimqJooTDBApmS", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QcCBVfL35rxSyQ416L2MBz14FYbNrbeNPx", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QNHdGeFJmPcDdN8prPzPL4bk2dpnJ2ZZFr", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QRWEbcRnLoGccAndtLcGgpeQFH2ZBcMqHo", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "Qce2Djqrk2WzG1QhMZ3BqFok9HGsz4wtM3", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QUXga5K8nzd9EqYtvEesZWEYuA688h6D3d", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QfbX8JJupEw5ckNtU4upQgET35oLTr5e6v", "level": 3 }, @@ -157,120 +199,158 @@ { "type": "ACCOUNT_LEVEL", "target": "QibuD4c6gvXgS4iut7q3sXuVb23rgFJq2M", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QMozpRT9aUunfmPh7EtQ6LPoth2JFJWBXC", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QTpYQqRyMekaEuECziirzy3HvCVofZS1wJ", "level": 3 }, - { "type": "ACCOUNT_LEVEL", "target": "QXv4WiqgryFPi8BgX7RU7gqtAgrVutmU4S", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QawSgZ7i2LLFTKyPxQptk9gN526ihy5yZi", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QMuWNAJ2tbeViHtBUN3yD2KARrrzcanLAd", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QUGo9SErgc6ceB5aBzcSJDNqBkQ9eaCKZS", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QdFZk74skMUu4rKMPEmcSVwR87LNDe6o3Y", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QWLpsGYrkF2cy3tH6DCxso7kXZpZJvv13e", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "Qgp16aMcdiS2EUkxCm5NSZgB8DixGK51zT", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QScBgSw74MquesXmVJxerX3YgyhtShRr4q", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QgcF6KgVZ9eDAMHJdSEeAtp91t931VKZMv", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QjgGeEkyiXa43pyqkXxZbvAChQpVYfUyKz", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QRWEbzH4niUcu9dL3Yq42X4j89aqQk3qWw", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QYD3kXchZ86vUyJBXNCVQ4LUvTAd6PUZW3", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QPqfuZpmyA6cK6WUFwcGeKH2Te1aegkHBM", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QhQdzLn36SDgrgoMfvdZAkoWtTUHpB3acJ", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QWL7kZp6Pdd1bhxZ6SXPhVf5g7GParG9CC", "level": 3 }, - { "type": "ACCOUNT_LEVEL", "target": "QjgGeEkyiXa43pyqkXxZbvAChQpVYfUyKz", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QbxJvwrEHZs7MDE8rbqBwZAZkcywue5F3W", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QUKKwug9PNai3DBggXUXP8Ag7WmR5SVUR4", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QWwrtjBL4ah965XPXHYJhymreC9jyryNLZ", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QjEaMxcBKMsj91ytKe6GdTBJP8Mu1Ru3r4", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QbYTowTHCr9WzfrR6b8uDfJKwL41nG1vyr", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QPusqAVBVFGAAeE7RdospttA18AuyLP7sB", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "Qd1Px9vhWuEmF2SbLx3Ez7HhGtifGMa8TJ", "level": 3 }, - { "type": "ACCOUNT_LEVEL", "target": "QbYTowTHCr9WzfrR6b8uDfJKwL41nG1vyr", "level": 3 }, - { "type": "ACCOUNT_LEVEL", "target": "QNw9xAm9TUerin9QsapCPL9mV6zmoXyJrh", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QSq8y4ZrSbF55ZddWNcw1ett2LDtjQEvNn", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QNw9xAm9TUerin9QsapCPL9mV6zmoXyJrh", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QYuMATkLjz7YB6s4EG1aWCmmmrAPj3W9Ce", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QNiTnonHpXTeUrgNdyYWVDPP4ZdjkLpW72", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QTtXS6fZGThRLq4qgkwM4ngBYkLoFyZ3bK", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QjrCFCi6dqvka4UELg2SHhM2oWnQWepd1o", "level": 3 }, { "type": "ACCOUNT_LEVEL", "target": "QREtYDhP4HkpeCCZroemuGXMGVFoZHH3Lp", "level": 3 }, + { "type": "ACCOUNT_LEVEL", "target": "QgesuKa3zwx8VAseF1oHZAFHMf29k8ergq", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QdXdUxnyKGGo7eEfTcx85oEikNe5nYnuwa", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QWBFK5h61ZxGfqQpEkwwKTcLAo8t9VWe4K", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QjEAs2or122weKppv5zALzoQzXxbsDjy3f", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QgesuKa3zwx8VAseF1oHZAFHMf29k8ergq", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QZ19JRpSsgvm4z6EjnbhdxJBoUYzDGvP3x", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QUZQPWhrxpze32vGiux6wa85kg9iwuhCDx", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QWinRb65f2g3yBoaZvTrQKQk7CW7vfBgGX", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QQaKBSjAt9RK2bqJoSriR77X4ULstGzrFQ", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QdwSxr3t4hdGHjQFy6EVGR9yGMipefsTuo", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QZ2gi6BhUNpGmrErgJLFuY1WHy6xK1J7qX", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QWinRb65f2g3yBoaZvTrQKQk7CW7vfBgGX", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QQaKBSjAt9RK2bqJoSriR77X4ULstGzrFQ", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QU8XJyQEZxSHgrS1XyooWUo5MmruXg36Pe", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QisSQZ7Et7Rfzx2SCC2o9UDSeRZWMyFKWc", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QXYk68x2tiUrDBv8eq6wd4KtBmLHYiC4zR", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QTyokTJrR4b2y76An3BFUEbqQy5vvg76iN", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QisSQZ7Et7Rfzx2SCC2o9UDSeRZWMyFKWc", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QPyx2bNiAnJEjitfeAh8jZXzQVKio2B7Mi", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QU8XJyQEZxSHgrS1XyooWUo5MmruXg36Pe", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QMJwdufHY9dMoARHCUyGbMPAqUB4BcqGKm", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QNffmqjCUQsLaHLZXBaA47tQW7bERdpP4R", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QeUc5NfzubZD4eA4eJ7bfXAFraAWc7jVz5", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QeDhJRqTyeDmcgGJoms6FHK49ZGVpVahxg", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QfPcwetW3BErP4ySTurxFJSHpNkNXPEhGk", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QQHWFSJpzuDupPfcTvGMRNJp2UGz98Kb7j", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QMJwdufHY9dMoARHCUyGbMPAqUB4BcqGKm", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QeDhJRqTyeDmcgGJoms6FHK49ZGVpVahxg", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QdepeWWLMD3LiDRKkKBria29rDhZP9V5RJ", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QeSh3t1AnaRcRThkkUTvvdMEouixCADeVh", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QRtRELSSASzqiYy2FtNcrePH6TVnqJkv9B", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QMtm8wVPHGE3qHg2hMaj6SZ78D5eXw3VWZ", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QWez1VBfYVJ8KFoZ6MhJDzYVLbn5mr38VT", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QZiYh4m4Uh3FH52cnow8MrNyXhSH88bp2H", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QYsh2NB6TogqV1iXHmHXcVaWw25WEYA94o", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QZjCgcSVvSRsFZeLJz9C5dTa36s3cSKqvB", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QfhJM5CpX5MhfjCcopwfw7pgS6w1hVJ49E", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QMMh94Pfs5LVE4xJee1yggViqP1YDdQHT4", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QZjCgcSVvSRsFZeLJz9C5dTa36s3cSKqvB", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QU9dnN47Nc5KaH7JwNoCZ7TANwCW5VX9iG", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QXoW5M113C3SDUeFdjVVs2m1RT9XtzXS3z", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QjsD7pMh2LpmgYudaaRM8gmzhBC4c9uwyj", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QZxcntxfJimHus9pgfvVVPbpHs5yU7ZMhB", "level": 2 }, - { "type": "ACCOUNT_LEVEL", "target": "QRBVE5gHumH6RUgEUxJdQ5417NUvc14k3F", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "Qc2eRuYXtpATrg87Pr1WDXkUBCsgNRYcQF", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QbEJ5tfeskASVnmLFeKzspuZJJb6cJVPZ4", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QWvTdm9LU1GSX9q6Rrvgx7xjo2iuV2Gxn1", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QZw7tgMttSySNMKfcMrEbdtnqHVrQ9w9fT", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QbGwYRV3UDek4VNpzoAVVQWfoKjZmm4qPb", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QRBVE5gHumH6RUgEUxJdQ5417NUvc14k3F", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QXeiJa7ftN6dAYNZcdqKDBhmAFyGjX2zkm", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "Qc2eRuYXtpATrg87Pr1WDXkUBCsgNRYcQF", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QbEJ5tfeskASVnmLFeKzspuZJJb6cJVPZ4", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QWvTdm9LU1GSX9q6Rrvgx7xjo2iuV2Gxn1", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QZw7tgMttSySNMKfcMrEbdtnqHVrQ9w9fT", "level": 2 }, + { "type": "ACCOUNT_LEVEL", "target": "QbGwYRV3UDek4VNpzoAVVQWfoKjZmm4qPb", "level": 2 }, { "type": "ACCOUNT_LEVEL", "target": "QYM76r3tuf6FJWz2USqVjwXJrV9tLMz1cj", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QfnbnWrRQ4HNDQvtg3wG2B1eC4ycUsFqZz", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QUdjqijDoyc83K4WcMW1sCn7zLd2t1WTqn", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QRUbzEbLd7fRjAx2fBdXAH4QS1WQyetvDc", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QU9K6pWhkok9mokkPDoCwgSu3j62ECuKLD", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QaZs97g4Mbq9tXMoBWbhw3jFvBBVkWKS5F", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QcJwVCyzraPy51uB4xd4f94n2UFYAsznGC", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QZbKMgYBwWGyTDJzoDir2aNqXsFdDp6fS9", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QZ7wvWAUcHKRhvQ3ijdrqM4zucQKCgQ1hQ", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QgmEtScSZWJmTUAidCZKj6gDr3LznZ6rr4", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QQXgH4CnQCB76BbXhsApu6ShhohFfvoXv7", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QZJc1V32oFm8tufB4bk7fa3aepu4EdkeDU", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QSkicapNH35a3UebSxxSMCfntBhwwi6veW", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QLqZD8eiNk8nrzyWcURfQDS9T5NWx98vrz", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QVEfMEeEHP768c9rEyi3WcH2JQwqheVDe3", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QehM6hQZVkrYAst8WrBVdQiMFfTtDtbKQu", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QY7gQwZKiPYMHYjYASSDBhhAoyYaxmex17", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QQXgH4CnQCB76BbXhsApu6ShhohFfvoXv7", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QPE3EGR8LTYSLtWBq52SFte66oud6cxchF", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "Qa9NXeLAvmaTsKackfDRmm1A9zy7JeEjgV", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QXqAtZJsLU6HFGTzuegjeUbmEW8cGEnYt6", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QWLpsGYrkF2cy3tH6DCxso7kXZpZJvv13e", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QXpCzKnANyh8jrRRxemvsXHAeFRHrDvdXF", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "Qd1Xw41BzN1CgASqsh2PcrrkTKyDs2MVYF", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QVb7P596imucSwDqb5HHEjqpnAre615PbS", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QTgfJFaEj5wuFvufwjUmYPhQ8eVfHR4u22", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QNMtHRjEWPgZUVCpiC2qE2LyJsxq1BC1Yj", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QUNTxxwr9f47RcwY48ZUP6FmmKnWCsxes5", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QSTDdguUfKe6TaQrik2zq4Xrbu6unxNa9o", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QgsxpySDm1qja6D2EyKuHPiUhyTM1RMk6c", "level": 1 }, - { "type": "ACCOUNT_LEVEL", "target": "QaZs97g4Mbq9tXMoBWbhw3jFvBBVkWKS5F", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QWZwi5NUzHuJfg5fh9HzjWRpQc1fmMknAh", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QMb2cAKb2BUxknneuoXQynJ7uzosJ57Top", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QVuksgNt3QAr7KCrkxtE5FWrczfgLKxs4H", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QP9vU5yTsBjuTSFxH5Cb9VXYNRHKhMNAJ4", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QXm5e16Lq6dnYwpZJ8Rn2cME3ziHZfRRnp", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QWkLaA4fYK51m4CszSgBd7efoDsSKamdf1", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QQzMut6erjgSKCpZ1dHDcjKcj9KAce7cug", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QZgDpQ1Vyi5pNNe2ZzBRhcUgSU13yeWvmH", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "QiQernJdiP4zCECB93v247FUtovkfJyTYm", "level": 1 }, { "type": "ACCOUNT_LEVEL", "target": "Qa4KygekpW1Brr3D66K6rGtS5AY8qkhvD3", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QQfFiVWkyAmfs1hDUcWU6XBfonxLdz6RSN", "level": 1 }, + { "type": "ACCOUNT_LEVEL", "target": "QViKVZa3M3ar7RBRSBMTx8FdzLh1zxUhN8", "level": 1 }, + { "type": "GENESIS", "recipient": "QS2k8PMpmvUHzFDp2JfbVxRo8SiGiV72xx", "amount": "637557960.49687541", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QUM95jekFMye3Lmkg2gj7CdhFreYye4DaA", "amount": "400671036.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QaYAUoT2SzYA6kqBEW6W11brkYpSf7g4Wy", "amount": "352652351.30705076", "assetId": 1 }, { "type": "GENESIS", "recipient": "QdoLZqB3pY4NgbSpvbsFzBDq2LcShjXsoq", "amount": "263574650.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QTnPQVphizFhBFtSbTQzAC4Kubj4uqpv96", "amount": "232356835.62157121", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMtx2UmUuRZckCmRJRyxdzSAazHP8hU5rA", "amount": "160672815.43629771", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVz1rKM9QQrGX7gkxR9EV8a2T4AuD1QT87", "amount": "128506517.58266672", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QUUcETWLi7EcjQ9M83Aur3SwmESFBFuQye", "amount": "126998534.24906898", "assetId": 1 }, + { "type": "GENESIS", "recipient": "Qa15fMdEiY7WqK2xwvdHrdhU2TE6yk3V3L", "amount": "122690068.33700012", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QM4LF9EzQnXJ9VyFwnJbJzskJLrybuSzsw", "amount": "114361793.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QQKeokRiFCgAhBSdu1DUf5e1LCkgApvrxZ", "amount": "100000078.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QiaaoNZ54wKoaUMXxW72UsPt1MiPpeUTWm", "amount": "100000031.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QYoRWAxw6CVMeYeWHKJh3csmTVkVzjpdBo", "amount": "100000026.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPwLkxemtGsrdcPJSA4iMgKbBPdecL7dwZ", "amount": "99999999.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMkgf9Y6Ac2TUrynDvyhX69ekpC3P3GQmN", "amount": "99008835.47860426", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QUnfm6t9SrhgFB8YqCV1vQhmqFzhncxioK", "amount": "80000207.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QWZm17rRXeUehcM4TprVNNRSTHWQmG2bME", "amount": "62663714.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QXdcbgN6vdQRBKJzHSB2JaSDDzPEsTUi14", "amount": "49450000.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QczMrVLEnEAXwvucwrfasH9H7QHNMPxLKu", "amount": "46488501.53473695", "assetId": 1 }, { "type": "GENESIS", "recipient": "Qaa5hs9dj1gPxhqigH7tVyZ3oRuVcMULXB", "amount": "44766868.70000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQMswzmv65MZSdafqzCACm3tbLj23ixkVR", "amount": "42447489.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "Qa95hURaNK4kPhDhbdmDFm2wMkkoWFZ4Zz", "amount": "40976709.97984710", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVEde9kJt2ejqXavBzK35zY3eztnkSXTwN", "amount": "38172492.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QZjDFrMrgeR9SGL8bprqyiXVtAZMVCXESZ", "amount": "37291276.42323117", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPmmPjdDXW35ykF557KbaVy5jYBbaM3pRp", "amount": "33333332.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QaWReiLe5tAsTNoq7hMiSGNasJEXTX5bmn", "amount": "31465829.00562504", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLrErVJvpRdYAt4dGwk8i8rG3PMUSgpp3i", "amount": "26593505.67231102", "assetId": 1 }, { "type": "GENESIS", "recipient": "QYsLsfwMRBPnunmuWmFkM4hvGsfooY8ssU", "amount": "25303386.66951814", "assetId": 1 }, { "type": "GENESIS", "recipient": "QgULJXk3qyLDr4EKkz48rxwwvWK7BDL8Ux", "amount": "22476856.86000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QNwedkYs6hToBRPZvBb6naKvDEgB7BeaKi", "amount": "21967101.30582773", "assetId": 1 }, { "type": "GENESIS", "recipient": "QgP7vQABSDJwuE8VTdVkiNnbkorqWWctQm", "amount": "20442665.63310002", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QM5Fg3kBzj9BqsGAJKHhsEtgRgf4x2Yn5G", "amount": "20000006.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLdC7wm9PYC1KjgZaeVdGzH4M88BYhEeEw", "amount": "19927901.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLgBTDkt7t7WwbTd1RM8iGxu9FexPZcn7C", "amount": "19000025.40000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QQShonrAdJXg4CzhegtynzaBP7S631vKGq", "amount": "16577946.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMFJGxGLCbegHL3NZ7HRo3UYaCXhweJVKS", "amount": "14977498.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QcAVj3i3drVkiC9P8FtDgVdYz8Zeu61uNg", "amount": "13142764.62938834", "assetId": 1 }, { "type": "GENESIS", "recipient": "QTDB2mmxEU7L4oUnmBh9F3qhCxfVpJUzaA", "amount": "12960806.75574690", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLgewDr48AZxWbDbRZ12xEvCePwPj9bMBE", "amount": "12684967.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QPEoMF2dA7NHrHhsSG9zczCFwx9wFdWvzT", "amount": "10033147.61257500", "assetId": 1 }, - { "type": "GENESIS", "recipient": "QjnHejJPyuyTRs7huzcqXtbM6sufWyLf9o", "amount": "9999999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQSiZAgdMjadXZRVTHa252AAY2yjZfQKR1", "amount": "10000000.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QWLhUT55hZHgdD7ayEqwHnF9h62dHV45G1", "amount": "9999999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QjnHejJPyuyTRs7huzcqXtbM6sufWyLf9o", "amount": "9999999.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QjJjjBUJSZAMuYiwTyfJTFthH6SrofjG6d", "amount": "8871800.22712502", "assetId": 1 }, { "type": "GENESIS", "recipient": "QRh9zNPmz5McxeWx3iCy2xnBRrBoYDZfMJ", "amount": "8739995.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QWGwGBzZG8UeNXJYZq9tjzN6ceriqTgMRd", "amount": "7825760.00000000", "assetId": 1 }, @@ -278,8 +358,11 @@ { "type": "GENESIS", "recipient": "QbdHzyw6q2hMAhg12JFbXSEcbrj43xNnYG", "amount": "7593814.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QNFWWhmsun3HVUChjck8XqhsQW2tckNxxM", "amount": "7239123.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QeosmemBtE7aosv2QZhq1PTjqpKurKXKzy", "amount": "6185646.80750010", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QU8SzA12SVKPgqpTzRna5itKktGhvEdmgP", "amount": "5931486.64530000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QQM9B3ipQcSvATsxb4vgVuYs9kuxgnuBwG", "amount": "5032347.69657146", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLu6X6CVhr6tovNR6k9pQijxN4DHiuLeJS", "amount": "4918400.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQ44LmLWzkWWe2UJfdvsySkd4ZRs1is3sX", "amount": "4384750.69674618", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QNK7x1kgiA45Zvc5jZFaoDeDzrBrxivwYd", "amount": "4135907.02294526", "assetId": 1 }, { "type": "GENESIS", "recipient": "QPdkHcN8DBLuxaFf4Q4zXNn3rq2G78VgNt", "amount": "4128493.31116798", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMNdPz11XubtvxXLGeiG3PHKaQW67LkZMp", "amount": "4056950.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QhUWSWWFt6vDy2qNFn68JPTPLjyDrzrh4D", "amount": "3220564.00000000", "assetId": 1 }, @@ -289,25 +372,104 @@ { "type": "GENESIS", "recipient": "QTekAqCoXPy5R7NE78GXxjSaXBuekZge88", "amount": "2740816.93000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QVQErjTVBkPTphbyDhPvhHKGX2etNXZsgy", "amount": "1999999.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QNPfWoyuvYaScXuCdiCM2PEzvD7PWybBvh", "amount": "1749402.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QaGhALQm9h3G6m728ZM9L2rrE7Y63nk9e8", "amount": "1637480.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QV96D15Y3qM1r55odiDf7j2TTYY8jCMJPs", "amount": "1572208.70562500", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLsEy8syg8EXttzajE8AWGg3CxccNR6YML", "amount": "1300001.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLeNqYjzid2oJFL2iVtcHeAkyunuTsHae4", "amount": "1185185.44326193", "assetId": 1 }, { "type": "GENESIS", "recipient": "QaUhQiyBZpZWSmFo56zRu2XXfZVL4D2xii", "amount": "1033451.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMrECKgkohx6ZXEMdLzikqBmAkdyHeQDqL", "amount": "997498.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QR1GoYcR3iasGNWtJjeNcZFPf9BH4TjCeC", "amount": "858153.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QNsdyTKN7MVsTYqSyZNPatzRTgNyWDqPZW", "amount": "832163.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMK8v74dCqJ3d3p4JMZZknvQ1wEJovHEjd", "amount": "805444.62885757", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMFysMKXLubP21BCYeYiSNP3v5mLhp81Cd", "amount": "676881.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMdfkckSTcCMKnRRve51SEfZQPVLZg9S7b", "amount": "333086.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QN2UFyKfUsJBHmM5hZrrD2wrwZ1SctSfwQ", "amount": "296438.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMrSxECG64fp2JaoXkw9DYEp6jFPYmh5Jr", "amount": "124684.50000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QQRUVwMGifreiLv3FuPTTcA1WbsvhH7Mux", "amount": "102825.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QMQAG28pyv2aZVjWbKoRn39Ytir6rLPnTK", "amount": "100745.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWY9HkkCvbKJaqWMEkLbbAJcncywJgy31Q", "amount": "100004.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QV6rVM4Ywh7TzdN1hgSWVrArKxyEUMuMfs", "amount": "100002.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QTBjfXU6ctuRFBTGkcJySZLqB3L9BdxNbb", "amount": "100002.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QTmKWUXtuQ3ihfigtuLSeFddskmSy3fGN5", "amount": "100002.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQDpKmaKa4uz61CSGVD2zSFaQzeRjaQ8FT", "amount": "100002.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRQvk1PCt7pNm6JSohtEQQdMEu7BrWjmtr", "amount": "100002.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVdEoLEamBDg8MC8uoMe6fsWrpbd9J3mTL", "amount": "100001.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QW7o4Cd6tvFLe2WryK4eNmFCxz7a9Bs5pJ", "amount": "100001.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWCTesfyodV4CnKF5cP1RCnksEonZhyJEj", "amount": "100001.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWCEJXDjfZLUfgCJ5V6Uy16KkdigLqEvvo", "amount": "100001.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QV1FfiEGhYRfNSN5HeXL6ZB1t2NeQJ761N", "amount": "100000.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVjAVUkKjFHX9N2UQntuPWqHe3PGdBgKgx", "amount": "100000.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVEuVYqdLfkAyTU5paKkSj2kGid5X7upPi", "amount": "100000.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQEBW8LU48cuV4uiwQUJ94k3UkJo5eszeg", "amount": "100000.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QUqDXJzwKrte2YNpR4b44ttKWwnSk6pRTZ", "amount": "100000.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QgkNZyrj4zAEAwCDZHTLQ7RcbcCTwcNzPL", "amount": "99999.09400001", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QW4jfDfsVWHLeLLvdapCG23q5MGajh8mKr", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVvq5dE352hhujmDcoj6CaEajp7mBuAuKK", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QU6Ac4sVimeehkuK8XcbpFUBVatZ2qgd47", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQodoJ4PdvwWbPwLErJsXjxtrW2BDZ52Gd", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLm1JSR6mph8vXrJ4ZHj5PjchAP7UoN9zm", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QU54p4EUyEr6EDEK7tmWEgwMBkr5MHNJr9", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMAsEHJcNAk6Vkzik2bEV6nJ7JZjWAksvi", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QTAth8ahCmt7ZchLA2N6S5jbF5wCMzyC8H", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQ5jfYBm2tPH4xCdfWDccnzUxhNPHL3VS3", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVfFNmHCgWFHhUwLBNBYp32JjL2uusyfsW", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVfru93ZBLd5XR9YzRBbFHCuYiNV1hJhEw", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWA1V7vrRLuhibXjRCSG54y4mkTLf3a4T7", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVxFXg9QMJp7FFD4XPU2BXR4hySCB9u9Zm", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRMpfSZ3gcX4gZKCXHam36qpaCC49F2cEt", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLecTtNrkgGFAwsSPVpJLgkqdjmjLmsT3F", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QUVkDZ2ercosZrRBnC8YZt7et9sXfwfKP4", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWR8npVGu3w75p5WtgxMikcnujVHEuPBxL", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMHjTaHRi1zTRgXq1vddRiuMBxZpHEJFeb", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLpBVjVAxhygwbvHyGLLnKbyvsZ1jUqaWC", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVXchvzB4PaaXSwhyZcayiTTSe5cje3DE8", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRWVqUTDFQRRAKiWjkFCk5pdE1iDw2Cz8s", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVKtHgZutURJdqnMCRRewsi2WsFNmYGoEE", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQAiKxdyRuKT7vPTQGbTitiN4E1WVnWZFa", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QSu3hoF3n9qjMSBfmEn6bGVKNXpn4SrtiX", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQsuUfQg57meYToLCx7GTH2DYfAfe4KgQx", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRPAESx3b4pWw9C4Q6YLdNYUcCQsWbzEfE", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRPnVABwiqT3qBqC6bscfWU6R79RjhUfp9", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QR3mxAS6xdwsRGQXiMVngYmL953gdKcaoa", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRSeGbHVKqhbUGNzF33DhoJQiPpf9WxZWR", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRdmMSmXk65qRYD8r1yzMBSKFdZf89nmZ8", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QSYyv5yJBhkrGeB33NV3NbRYTys9mfkzze", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQMFd2LfNJCyH6jkQkrK7mdKpjWiJhhFty", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QP9tgb3pN6FzU3UCmHGW95s9Fmgubzm8md", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQszEg4sqt2o5oN4pdyjxrAwGD3TY5QNfZ", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QNLsfHsFcS5xc7BR1fD6aNSZLPt8CEKLuG", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVuKDbWVeM92yEta1fagk79NGQsLkvKdCf", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QSCdg6rRRm4jb3r4XNKVytyQAgiTxkAjTw", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMdEATyg41BFbWuMZx829uzBZ8fqYDDERw", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QM66cjqmF3WCbbiac6tVU1pLupv2AvU4ev", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QVeQRaWcPUNfT3yPWtm6xmuy1hM4N6b1yg", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPbWwDxBK3m1LU7uPv55Rq8bwvqLsSjXiE", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QR2cz8ErrLtcos58iKrQA9aPa8T8kaGc5w", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QTrMWWXU6WyuBRW3WU6duNXpe7AbNog4kP", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QWHinsRV49Nf2ue2ZBumK8jWHWrSFhHr91", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQa6YP9ocmaMBZPEAPnY7dDekdqo9os4gr", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QSqcH6aiqnGnP8iGG1cRxMSqtypsqgWprm", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMrodSbGSU3zsJVi8BN5X5gPE2xvXGt1ja", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPJbzQTJ7T8fRFu5NbGu9goLZyeLq5Kg3i", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QTHLtnDuCz85Xa2jkPuZKhdvyXh8yZH6NJ", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMMsPuLhww36VQAphKyo29BfhHLeekf8ST", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPNuGywKCewuy66DXj7GAJrev5HkcVWjuu", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QMTN4ALHmKeJkbVFQQyceEAideDTb1eXdq", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QRMbQS8Tz9tEH5Wxg6GcoqJ22NqVEcVLFY", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QW1NHhKUUPGg2WwMxNyV8VbzmEJJfBTXvy", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QQginD86frBSnoNjHEk7JE4zaBWbTqnHk6", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QPSEbEbncD9aUrSzNie658DuoFgex641Sd", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QLzhvyT3LHzE9DqFrSwNivKMzkB6T1g2DD", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QNG1SXqh2uJ4FAy2yxEzUXbRh9Z5KsTvq5", "amount": "99999.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QM1KcVDtpkfsrSyDx6v9okdigbXrNTDKmZ", "amount": "99999.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QLnyXdhGDVEBmByTtjTZihVE3UnReghNyd", "amount": "78296.75000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QTHQ9pFMoraWTCS1tuFzuwWSXu7uVJ18VF", "amount": "40395.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QfNkfy7kZ2gwue4Vsoz3YfARwSCS13cwXN", "amount": "14997.00000000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "QN9QJxXAT2ceDwgXvSvjkndeUGXW84xfhQ", "amount": "8505.00000000", "assetId": 1 }, { "type": "GENESIS", "recipient": "QVZAQrQHPD8rePZ5hWKx4uj7Ty4GEBe15D", "amount": "2989.50000000", "assetId": 1 }, - { "type": "GENESIS", "recipient": "QPZTxWtCmH6Y6zwwntjnPDfKG6zNKRivqJ", "amount": "1282.61375000", "assetId": 1 } + { "type": "GENESIS", "recipient": "QPZTxWtCmH6Y6zwwntjnPDfKG6zNKRivqJ", "amount": "1282.61375000", "assetId": 1 }, + { "type": "GENESIS", "recipient": "Qgwuvmkqf1wTAxqyFpvUswDqgzWrC6towa", "amount": "0.66600000", "assetId": 1 } ] } -} +} \ No newline at end of file diff --git a/src/test/java/org/qora/test/AccountBalanceTests.java b/src/test/java/org/qortal/test/AccountBalanceTests.java similarity index 93% rename from src/test/java/org/qora/test/AccountBalanceTests.java rename to src/test/java/org/qortal/test/AccountBalanceTests.java index 389707ba..a47f0e16 100644 --- a/src/test/java/org/qora/test/AccountBalanceTests.java +++ b/src/test/java/org/qortal/test/AccountBalanceTests.java @@ -1,4 +1,4 @@ -package org.qora.test; +package org.qortal.test; import static org.junit.Assert.*; @@ -13,24 +13,24 @@ import java.util.stream.Collectors; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.Account; -import org.qora.account.PrivateKeyAccount; -import org.qora.account.PublicKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.data.account.AccountBalanceData; -import org.qora.data.account.AccountData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.AccountRepository.BalanceOrdering; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TestAccount; -import org.qora.test.common.TransactionUtils; +import org.qortal.account.Account; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.account.PublicKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.data.account.AccountBalanceData; +import org.qortal.data.account.AccountData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.repository.AccountRepository.BalanceOrdering; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TestAccount; +import org.qortal.test.common.TransactionUtils; public class AccountBalanceTests extends Common { diff --git a/src/test/java/org/qora/test/BlockTests.java b/src/test/java/org/qortal/test/BlockTests.java similarity index 84% rename from src/test/java/org/qora/test/BlockTests.java rename to src/test/java/org/qortal/test/BlockTests.java index 4c24517e..bb2ecd56 100644 --- a/src/test/java/org/qora/test/BlockTests.java +++ b/src/test/java/org/qortal/test/BlockTests.java @@ -1,29 +1,29 @@ -package org.qora.test; +package org.qortal.test; import java.math.BigDecimal; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.Block; -import org.qora.block.GenesisBlock; -import org.qora.data.at.ATStateData; -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.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TransactionUtils; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transform.TransformationException; -import org.qora.transform.block.BlockTransformer; -import org.qora.transform.transaction.TransactionTransformer; -import org.qora.utils.Base58; -import org.qora.utils.Triple; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.Block; +import org.qortal.block.GenesisBlock; +import org.qortal.data.at.ATStateData; +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.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TransactionUtils; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transform.TransformationException; +import org.qortal.transform.block.BlockTransformer; +import org.qortal.transform.transaction.TransactionTransformer; +import org.qortal.utils.Base58; +import org.qortal.utils.Triple; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/ByteArrayTests.java b/src/test/java/org/qortal/test/ByteArrayTests.java similarity index 98% rename from src/test/java/org/qora/test/ByteArrayTests.java rename to src/test/java/org/qortal/test/ByteArrayTests.java index 8b59d77c..32c692ef 100644 --- a/src/test/java/org/qora/test/ByteArrayTests.java +++ b/src/test/java/org/qortal/test/ByteArrayTests.java @@ -1,4 +1,4 @@ -package org.qora.test; +package org.qortal.test; import static org.junit.Assert.*; @@ -10,7 +10,7 @@ import java.util.Random; import org.junit.Before; import org.junit.Test; -import org.qora.utils.ByteArray; +import org.qortal.utils.ByteArray; public class ByteArrayTests { diff --git a/src/test/java/org/qora/test/ChainWeightTests.java b/src/test/java/org/qortal/test/ChainWeightTests.java similarity index 94% rename from src/test/java/org/qora/test/ChainWeightTests.java rename to src/test/java/org/qortal/test/ChainWeightTests.java index 62dd225d..c580f30c 100644 --- a/src/test/java/org/qora/test/ChainWeightTests.java +++ b/src/test/java/org/qortal/test/ChainWeightTests.java @@ -1,4 +1,4 @@ -package org.qora.test; +package org.qortal.test; import static org.junit.Assert.*; @@ -7,16 +7,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.qora.account.Account; -import org.qora.block.Block; -import org.qora.data.block.BlockSummaryData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.Common; -import org.qora.test.common.TestAccount; -import org.qora.transform.Transformer; -import org.qora.transform.block.BlockTransformer; +import org.qortal.account.Account; +import org.qortal.block.Block; +import org.qortal.data.block.BlockSummaryData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.Common; +import org.qortal.test.common.TestAccount; +import org.qortal.transform.Transformer; +import org.qortal.transform.block.BlockTransformer; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/qora/test/CompatibilityTests.java b/src/test/java/org/qortal/test/CompatibilityTests.java similarity index 88% rename from src/test/java/org/qora/test/CompatibilityTests.java rename to src/test/java/org/qortal/test/CompatibilityTests.java index 34167a5f..4418be3d 100644 --- a/src/test/java/org/qora/test/CompatibilityTests.java +++ b/src/test/java/org/qortal/test/CompatibilityTests.java @@ -1,15 +1,15 @@ -package org.qora.test; +package org.qortal.test; import org.junit.Test; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.test.common.Common; -import org.qora.transaction.CreateAssetOrderTransaction; -import org.qora.transaction.CreatePollTransaction; -import org.qora.transaction.IssueAssetTransaction; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.TransactionTransformer; -import org.qora.utils.NTP; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.test.common.Common; +import org.qortal.transaction.CreateAssetOrderTransaction; +import org.qortal.transaction.CreatePollTransaction; +import org.qortal.transaction.IssueAssetTransaction; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.TransactionTransformer; +import org.qortal.utils.NTP; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/CryptoTests.java b/src/test/java/org/qortal/test/CryptoTests.java similarity index 97% rename from src/test/java/org/qora/test/CryptoTests.java rename to src/test/java/org/qortal/test/CryptoTests.java index 7869ed03..0e294c63 100644 --- a/src/test/java/org/qora/test/CryptoTests.java +++ b/src/test/java/org/qortal/test/CryptoTests.java @@ -1,11 +1,11 @@ -package org.qora.test; +package org.qortal.test; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.BlockChain; -import org.qora.crypto.BouncyCastle25519; -import org.qora.crypto.Crypto; -import org.qora.test.common.Common; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.BlockChain; +import org.qortal.crypto.BouncyCastle25519; +import org.qortal.crypto.Crypto; +import org.qortal.test.common.Common; import static org.junit.Assert.*; @@ -97,7 +97,7 @@ public class CryptoTests extends Common { String expected58 = publicKey58; String actual58 = Base58.encode(account.getPublicKey()); - assertEquals("qora-core derived public key incorrect", expected58, actual58); + assertEquals("qortal derived public key incorrect", expected58, actual58); Ed25519PrivateKeyParameters privateKeyParams = new Ed25519PrivateKeyParameters(privateKey, 0); Ed25519PublicKeyParameters publicKeyParams = privateKeyParams.generatePublicKey(); diff --git a/src/test/java/org/qora/test/EPCTests.java b/src/test/java/org/qortal/test/EPCTests.java similarity index 98% rename from src/test/java/org/qora/test/EPCTests.java rename to src/test/java/org/qortal/test/EPCTests.java index 00a075a7..1a77ba6d 100644 --- a/src/test/java/org/qora/test/EPCTests.java +++ b/src/test/java/org/qortal/test/EPCTests.java @@ -1,4 +1,4 @@ -package org.qora.test; +package org.qortal.test; import java.util.ArrayList; import java.util.Collections; @@ -10,7 +10,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.qora.utils.ExecuteProduceConsume; +import org.qortal.utils.ExecuteProduceConsume; public class EPCTests { diff --git a/src/test/java/org/qora/test/GuiTests.java b/src/test/java/org/qortal/test/GuiTests.java similarity index 85% rename from src/test/java/org/qora/test/GuiTests.java rename to src/test/java/org/qortal/test/GuiTests.java index 5a84a6ce..0a352003 100644 --- a/src/test/java/org/qora/test/GuiTests.java +++ b/src/test/java/org/qortal/test/GuiTests.java @@ -1,10 +1,10 @@ -package org.qora.test; +package org.qortal.test; import java.awt.TrayIcon.MessageType; import org.junit.Test; -import org.qora.gui.SplashFrame; -import org.qora.gui.SysTray; +import org.qortal.gui.SplashFrame; +import org.qortal.gui.SysTray; public class GuiTests { diff --git a/src/test/java/org/qora/test/MemoryPoWTests.java b/src/test/java/org/qortal/test/MemoryPoWTests.java similarity index 93% rename from src/test/java/org/qora/test/MemoryPoWTests.java rename to src/test/java/org/qortal/test/MemoryPoWTests.java index be2a52c9..c83bf436 100644 --- a/src/test/java/org/qora/test/MemoryPoWTests.java +++ b/src/test/java/org/qortal/test/MemoryPoWTests.java @@ -1,7 +1,7 @@ -package org.qora.test; +package org.qortal.test; import org.junit.Test; -import org.qora.crypto.MemoryPoW; +import org.qortal.crypto.MemoryPoW; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/RepositoryTests.java b/src/test/java/org/qortal/test/RepositoryTests.java similarity index 92% rename from src/test/java/org/qora/test/RepositoryTests.java rename to src/test/java/org/qortal/test/RepositoryTests.java index 90ffa2eb..e06706dc 100644 --- a/src/test/java/org/qora/test/RepositoryTests.java +++ b/src/test/java/org/qortal/test/RepositoryTests.java @@ -1,15 +1,15 @@ -package org.qora.test; +package org.qortal.test; import org.junit.Before; import org.junit.Test; -import org.qora.account.Account; -import org.qora.asset.Asset; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.repository.hsqldb.HSQLDBRepository; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; +import org.qortal.account.Account; +import org.qortal.asset.Asset; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.repository.hsqldb.HSQLDBRepository; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/SerializationTests.java b/src/test/java/org/qortal/test/SerializationTests.java similarity index 90% rename from src/test/java/org/qora/test/SerializationTests.java rename to src/test/java/org/qortal/test/SerializationTests.java index 096ddbac..0f4fb2c4 100644 --- a/src/test/java/org/qora/test/SerializationTests.java +++ b/src/test/java/org/qortal/test/SerializationTests.java @@ -1,17 +1,17 @@ -package org.qora.test; +package org.qortal.test; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.Common; -import org.qora.test.common.TransactionUtils; -import org.qora.transaction.Transaction; -import org.qora.transform.TransformationException; -import org.qora.transform.transaction.TransactionTransformer; -import org.qora.utils.Base58; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.Common; +import org.qortal.test.common.TransactionUtils; +import org.qortal.transaction.Transaction; +import org.qortal.transform.TransformationException; +import org.qortal.transform.transaction.TransactionTransformer; +import org.qortal.utils.Base58; import com.google.common.hash.HashCode; diff --git a/src/test/java/org/qora/test/TransferPrivsTests.java b/src/test/java/org/qortal/test/TransferPrivsTests.java similarity index 95% rename from src/test/java/org/qora/test/TransferPrivsTests.java rename to src/test/java/org/qortal/test/TransferPrivsTests.java index 270cfbf0..71eb1292 100644 --- a/src/test/java/org/qora/test/TransferPrivsTests.java +++ b/src/test/java/org/qortal/test/TransferPrivsTests.java @@ -1,24 +1,24 @@ -package org.qora.test; +package org.qortal.test; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.Account; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.BlockChain; -import org.qora.block.BlockMinter; -import org.qora.data.account.AccountData; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.transaction.TransferPrivsTransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TestAccount; -import org.qora.test.common.TransactionUtils; +import org.qortal.account.Account; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.BlockChain; +import org.qortal.block.BlockMinter; +import org.qortal.data.account.AccountData; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferPrivsTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TestAccount; +import org.qortal.test.common.TransactionUtils; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/api/AddressesApiTests.java b/src/test/java/org/qortal/test/api/AddressesApiTests.java similarity index 92% rename from src/test/java/org/qora/test/api/AddressesApiTests.java rename to src/test/java/org/qortal/test/api/AddressesApiTests.java index 72fa500f..f508a970 100644 --- a/src/test/java/org/qora/test/api/AddressesApiTests.java +++ b/src/test/java/org/qortal/test/api/AddressesApiTests.java @@ -1,4 +1,4 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; @@ -6,8 +6,8 @@ import java.util.Collections; import org.junit.Before; import org.junit.Test; -import org.qora.api.resource.AddressesResource; -import org.qora.test.common.ApiCommon; +import org.qortal.api.resource.AddressesResource; +import org.qortal.test.common.ApiCommon; public class AddressesApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/api/AdminApiTests.java b/src/test/java/org/qortal/test/api/AdminApiTests.java similarity index 80% rename from src/test/java/org/qora/test/api/AdminApiTests.java rename to src/test/java/org/qortal/test/api/AdminApiTests.java index 726b37b4..c5620e50 100644 --- a/src/test/java/org/qora/test/api/AdminApiTests.java +++ b/src/test/java/org/qortal/test/api/AdminApiTests.java @@ -1,11 +1,11 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; -import org.qora.api.resource.AdminResource; -import org.qora.test.common.ApiCommon; +import org.qortal.api.resource.AdminResource; +import org.qortal.test.common.ApiCommon; public class AdminApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/api/AssetsApiTests.java b/src/test/java/org/qortal/test/api/AssetsApiTests.java similarity index 94% rename from src/test/java/org/qora/test/api/AssetsApiTests.java rename to src/test/java/org/qortal/test/api/AssetsApiTests.java index 0061e699..993123b9 100644 --- a/src/test/java/org/qora/test/api/AssetsApiTests.java +++ b/src/test/java/org/qortal/test/api/AssetsApiTests.java @@ -1,4 +1,4 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; @@ -8,12 +8,12 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.qora.api.ApiError; -import org.qora.api.ApiException; -import org.qora.api.resource.AssetsResource; -import org.qora.api.resource.TransactionsResource.ConfirmationStatus; -import org.qora.repository.AccountRepository.BalanceOrdering; -import org.qora.test.common.ApiCommon; +import org.qortal.api.ApiError; +import org.qortal.api.ApiException; +import org.qortal.api.resource.AssetsResource; +import org.qortal.api.resource.TransactionsResource.ConfirmationStatus; +import org.qortal.repository.AccountRepository.BalanceOrdering; +import org.qortal.test.common.ApiCommon; public class AssetsApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/api/BlockApiTests.java b/src/test/java/org/qortal/test/api/BlockApiTests.java similarity index 90% rename from src/test/java/org/qora/test/api/BlockApiTests.java rename to src/test/java/org/qortal/test/api/BlockApiTests.java index dc0ac657..8dea8eea 100644 --- a/src/test/java/org/qora/test/api/BlockApiTests.java +++ b/src/test/java/org/qortal/test/api/BlockApiTests.java @@ -1,4 +1,4 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; @@ -8,8 +8,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.qora.api.resource.BlocksResource; -import org.qora.test.common.ApiCommon; +import org.qortal.api.resource.BlocksResource; +import org.qortal.test.common.ApiCommon; public class BlockApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/api/GroupApiTests.java b/src/test/java/org/qortal/test/api/GroupApiTests.java similarity index 93% rename from src/test/java/org/qora/test/api/GroupApiTests.java rename to src/test/java/org/qortal/test/api/GroupApiTests.java index b5489663..cd288906 100644 --- a/src/test/java/org/qora/test/api/GroupApiTests.java +++ b/src/test/java/org/qortal/test/api/GroupApiTests.java @@ -1,11 +1,11 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; -import org.qora.api.resource.GroupsResource; -import org.qora.test.common.ApiCommon; +import org.qortal.api.resource.GroupsResource; +import org.qortal.test.common.ApiCommon; public class GroupApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/api/TransactionsApiTests.java b/src/test/java/org/qortal/test/api/TransactionsApiTests.java similarity index 89% rename from src/test/java/org/qora/test/api/TransactionsApiTests.java rename to src/test/java/org/qortal/test/api/TransactionsApiTests.java index 0c37e6fa..2cdd746b 100644 --- a/src/test/java/org/qora/test/api/TransactionsApiTests.java +++ b/src/test/java/org/qortal/test/api/TransactionsApiTests.java @@ -1,4 +1,4 @@ -package org.qora.test.api; +package org.qortal.test.api; import static org.junit.Assert.*; @@ -7,10 +7,10 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.qora.api.resource.TransactionsResource; -import org.qora.api.resource.TransactionsResource.ConfirmationStatus; -import org.qora.test.common.ApiCommon; -import org.qora.transaction.Transaction.TransactionType; +import org.qortal.api.resource.TransactionsResource; +import org.qortal.api.resource.TransactionsResource.ConfirmationStatus; +import org.qortal.test.common.ApiCommon; +import org.qortal.transaction.Transaction.TransactionType; public class TransactionsApiTests extends ApiCommon { diff --git a/src/test/java/org/qora/test/apps/BTCACCTTests.java b/src/test/java/org/qortal/test/apps/BTCACCTTests.java similarity index 96% rename from src/test/java/org/qora/test/apps/BTCACCTTests.java rename to src/test/java/org/qortal/test/apps/BTCACCTTests.java index b7c7e157..e33eacfa 100644 --- a/src/test/java/org/qora/test/apps/BTCACCTTests.java +++ b/src/test/java/org/qortal/test/apps/BTCACCTTests.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.File; import java.net.UnknownHostException; @@ -36,20 +36,20 @@ import com.google.common.hash.HashCode; import com.google.common.primitives.Bytes; /** - * Initiator must be Qora-chain so that initiator can send initial message to BTC P2SH then Qora can scan for P2SH add send corresponding message to Qora AT. + * Initiator must be Qortal-chain so that initiator can send initial message to BTC P2SH then Qortal can scan for P2SH add send corresponding message to Qortal AT. * - * Initiator (wants Qora, has BTC) + * Initiator (wants QORT, has BTC) * Funds BTC P2SH address * - * Responder (has Qora, wants BTC) - * Builds Qora ACCT AT and funds it with Qora + * Responder (has QORT, wants BTC) + * Builds Qortal ACCT AT and funds it with QORT * * Initiator sends recipient+secret+script as input to BTC P2SH address, releasing BTC amount - fees to responder * - * Qora nodes scan for P2SH output, checks amount and recipient and if ok sends secret to Qora ACCT AT - * (Or it's possible to feed BTC transaction details into Qora AT so it can check them itself?) + * Qortal nodes scan for P2SH output, checks amount and recipient and if ok sends secret to Qortal ACCT AT + * (Or it's possible to feed BTC transaction details into Qortal AT so it can check them itself?) * - * Qora ACCT AT sends its Qora to initiator + * Qortal ACCT AT sends its QORT to initiator * */ diff --git a/src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java b/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java similarity index 84% rename from src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java rename to src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java index 7ab4e5f5..edfe717e 100644 --- a/src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java +++ b/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java @@ -1,21 +1,21 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.security.Security; import org.bitcoinj.core.Base58; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider; -import org.qora.block.BlockChain; -import org.qora.controller.Controller; -import org.qora.data.account.RewardShareData; -import org.qora.gui.Gui; -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.transform.block.BlockTransformer; +import org.qortal.block.BlockChain; +import org.qortal.controller.Controller; +import org.qortal.data.account.RewardShareData; +import org.qortal.gui.Gui; +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.transform.block.BlockTransformer; import org.roaringbitmap.IntIterator; import io.druid.extendedset.intset.ConciseSet; diff --git a/src/test/java/org/qora/test/apps/NTPTests.java b/src/test/java/org/qortal/test/apps/NTPTests.java similarity index 99% rename from src/test/java/org/qora/test/apps/NTPTests.java rename to src/test/java/org/qortal/test/apps/NTPTests.java index b1fd880c..6d7e89fd 100644 --- a/src/test/java/org/qora/test/apps/NTPTests.java +++ b/src/test/java/org/qortal/test/apps/NTPTests.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.IOException; import java.net.InetAddress; diff --git a/src/test/java/org/qora/test/apps/ProxyTest.java b/src/test/java/org/qortal/test/apps/ProxyTest.java similarity index 93% rename from src/test/java/org/qora/test/apps/ProxyTest.java rename to src/test/java/org/qortal/test/apps/ProxyTest.java index 5f0d519f..7ddd9ea8 100644 --- a/src/test/java/org/qora/test/apps/ProxyTest.java +++ b/src/test/java/org/qortal/test/apps/ProxyTest.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.IOException; import java.io.InputStream; @@ -21,8 +21,7 @@ public class ProxyTest { private static final Pattern proxyUrlPattern = Pattern.compile("(https://)([^@:/]+)@([0-9.]{7,15})(/.*)"); public static void main(String args[]) { - String uri = "https://raw.githubusercontent.com@151.101.16.133/catbref/qora-core/894f0e54a6c22e68d4f4162b2ebcdf9b4e39162a/qora-core.jar"; - // String uri = "https://raw.githubusercontent.com/catbref/qora-core/894f0e54a6c22e68d4f4162b2ebcdf9b4e39162a/qora-core.jar"; + String uri = "https://raw.githubusercontent.com@151.101.16.133/QORT/qortal/master/pom.xml"; try (InputStream in = fetchStream(uri)) { int byteCount = 0; diff --git a/src/test/java/org/qora/test/apps/RewardShareKeys.java b/src/test/java/org/qortal/test/apps/RewardShareKeys.java similarity index 91% rename from src/test/java/org/qora/test/apps/RewardShareKeys.java rename to src/test/java/org/qortal/test/apps/RewardShareKeys.java index dac7405f..e0bfc1cf 100644 --- a/src/test/java/org/qora/test/apps/RewardShareKeys.java +++ b/src/test/java/org/qortal/test/apps/RewardShareKeys.java @@ -1,12 +1,12 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.security.Security; 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.utils.Base58; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.account.PublicKeyAccount; +import org.qortal.utils.Base58; public class RewardShareKeys { diff --git a/src/test/java/org/qora/test/apps/SettingsTests.java b/src/test/java/org/qortal/test/apps/SettingsTests.java similarity index 93% rename from src/test/java/org/qora/test/apps/SettingsTests.java rename to src/test/java/org/qortal/test/apps/SettingsTests.java index 10edd227..30ead476 100644 --- a/src/test/java/org/qora/test/apps/SettingsTests.java +++ b/src/test/java/org/qortal/test/apps/SettingsTests.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.FileReader; import java.io.IOException; @@ -11,9 +11,9 @@ import javax.xml.transform.stream.StreamSource; import org.eclipse.persistence.jaxb.JAXBContextFactory; import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import org.qora.block.BlockChain; -import org.qora.data.transaction.TransactionData; -import org.qora.settings.Settings; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.TransactionData; +import org.qortal.settings.Settings; public class SettingsTests { diff --git a/src/test/java/org/qora/test/apps/SyncReport.java b/src/test/java/org/qortal/test/apps/SyncReport.java similarity index 99% rename from src/test/java/org/qora/test/apps/SyncReport.java rename to src/test/java/org/qortal/test/apps/SyncReport.java index 6dcf054b..323b2ed9 100644 --- a/src/test/java/org/qora/test/apps/SyncReport.java +++ b/src/test/java/org/qortal/test/apps/SyncReport.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/org/qora/test/apps/VanityGen.java b/src/test/java/org/qortal/test/apps/VanityGen.java similarity index 93% rename from src/test/java/org/qora/test/apps/VanityGen.java rename to src/test/java/org/qortal/test/apps/VanityGen.java index af8c7384..f697087f 100644 --- a/src/test/java/org/qora/test/apps/VanityGen.java +++ b/src/test/java/org/qortal/test/apps/VanityGen.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.security.SecureRandom; import java.security.Security; @@ -8,10 +8,10 @@ import java.util.concurrent.Executors; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider; -import org.qora.account.PrivateKeyAccount; -import org.qora.crypto.Crypto; -import org.qora.utils.BIP39; -import org.qora.utils.Base58; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.crypto.Crypto; +import org.qortal.utils.BIP39; +import org.qortal.utils.Base58; import com.google.common.primitives.Bytes; diff --git a/src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java b/src/test/java/org/qortal/test/apps/WindowsTimeServiceTests.java similarity index 98% rename from src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java rename to src/test/java/org/qortal/test/apps/WindowsTimeServiceTests.java index e7b0d45f..2344ebe8 100644 --- a/src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java +++ b/src/test/java/org/qortal/test/apps/WindowsTimeServiceTests.java @@ -1,4 +1,4 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/org/qora/test/apps/brokenmd160.java b/src/test/java/org/qortal/test/apps/brokenmd160.java similarity index 87% rename from src/test/java/org/qora/test/apps/brokenmd160.java rename to src/test/java/org/qortal/test/apps/brokenmd160.java index 74aa97a3..d83969ff 100644 --- a/src/test/java/org/qora/test/apps/brokenmd160.java +++ b/src/test/java/org/qortal/test/apps/brokenmd160.java @@ -1,5 +1,5 @@ -package org.qora.test.apps; -import org.qora.crypto.BrokenMD160; +package org.qortal.test.apps; +import org.qortal.crypto.BrokenMD160; import com.google.common.hash.HashCode; diff --git a/src/test/java/org/qora/test/apps/orphan.java b/src/test/java/org/qortal/test/apps/orphan.java similarity index 77% rename from src/test/java/org/qora/test/apps/orphan.java rename to src/test/java/org/qortal/test/apps/orphan.java index e6d77107..58853e55 100644 --- a/src/test/java/org/qora/test/apps/orphan.java +++ b/src/test/java/org/qortal/test/apps/orphan.java @@ -1,14 +1,14 @@ -package org.qora.test.apps; +package org.qortal.test.apps; import java.security.Security; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.qora.block.BlockChain; -import org.qora.controller.Controller; -import org.qora.repository.DataException; -import org.qora.repository.RepositoryFactory; -import org.qora.repository.RepositoryManager; -import org.qora.repository.hsqldb.HSQLDBRepositoryFactory; -import org.qora.settings.Settings; +import org.qortal.block.BlockChain; +import org.qortal.controller.Controller; +import org.qortal.repository.DataException; +import org.qortal.repository.RepositoryFactory; +import org.qortal.repository.RepositoryManager; +import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory; +import org.qortal.settings.Settings; public class orphan { diff --git a/src/test/java/org/qora/test/assets/CancellingTests.java b/src/test/java/org/qortal/test/assets/CancellingTests.java similarity index 97% rename from src/test/java/org/qora/test/assets/CancellingTests.java rename to src/test/java/org/qortal/test/assets/CancellingTests.java index 49149422..6329e50e 100644 --- a/src/test/java/org/qora/test/assets/CancellingTests.java +++ b/src/test/java/org/qortal/test/assets/CancellingTests.java @@ -1,4 +1,4 @@ -package org.qora.test.assets; +package org.qortal.test.assets; import static org.junit.Assert.*; @@ -9,15 +9,14 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; - -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.AssetUtils; -import org.qora.test.common.Common; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.ValidationResult; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.AssetUtils; +import org.qortal.test.common.Common; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.ValidationResult; public class CancellingTests extends Common { diff --git a/src/test/java/org/qora/test/assets/GranularityTests.java b/src/test/java/org/qortal/test/assets/GranularityTests.java similarity index 95% rename from src/test/java/org/qora/test/assets/GranularityTests.java rename to src/test/java/org/qortal/test/assets/GranularityTests.java index d8d75d8e..2fcb2f6a 100644 --- a/src/test/java/org/qora/test/assets/GranularityTests.java +++ b/src/test/java/org/qortal/test/assets/GranularityTests.java @@ -1,4 +1,4 @@ -package org.qora.test.assets; +package org.qortal.test.assets; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,9 +6,9 @@ import java.math.RoundingMode; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.asset.Order; -import org.qora.repository.DataException; -import org.qora.test.common.Common; +import org.qortal.asset.Order; +import org.qortal.repository.DataException; +import org.qortal.test.common.Common; public class GranularityTests extends Common { diff --git a/src/test/java/org/qora/test/assets/MixedPricingTests.java b/src/test/java/org/qortal/test/assets/MixedPricingTests.java similarity index 81% rename from src/test/java/org/qora/test/assets/MixedPricingTests.java rename to src/test/java/org/qortal/test/assets/MixedPricingTests.java index 4a9d709b..c4294468 100644 --- a/src/test/java/org/qora/test/assets/MixedPricingTests.java +++ b/src/test/java/org/qortal/test/assets/MixedPricingTests.java @@ -1,9 +1,9 @@ -package org.qora.test.assets; +package org.qortal.test.assets; import org.junit.After; import org.junit.Before; -import org.qora.repository.DataException; -import org.qora.test.common.Common; +import org.qortal.repository.DataException; +import org.qortal.test.common.Common; public class MixedPricingTests extends Common{ diff --git a/src/test/java/org/qora/test/assets/NewTradingTests.java b/src/test/java/org/qortal/test/assets/NewTradingTests.java similarity index 98% rename from src/test/java/org/qora/test/assets/NewTradingTests.java rename to src/test/java/org/qortal/test/assets/NewTradingTests.java index 09065522..80003d83 100644 --- a/src/test/java/org/qora/test/assets/NewTradingTests.java +++ b/src/test/java/org/qortal/test/assets/NewTradingTests.java @@ -1,16 +1,15 @@ -package org.qora.test.assets; +package org.qortal.test.assets; import org.junit.After; import org.junit.Before; import org.junit.Test; - -import org.qora.data.asset.OrderData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.AssetUtils; -import org.qora.test.common.Common; +import org.qortal.data.asset.OrderData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.AssetUtils; +import org.qortal.test.common.Common; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/test/java/org/qora/test/assets/OldTradingTests.java b/src/test/java/org/qortal/test/assets/OldTradingTests.java similarity index 96% rename from src/test/java/org/qora/test/assets/OldTradingTests.java rename to src/test/java/org/qortal/test/assets/OldTradingTests.java index 46c78815..52cfc097 100644 --- a/src/test/java/org/qora/test/assets/OldTradingTests.java +++ b/src/test/java/org/qortal/test/assets/OldTradingTests.java @@ -1,16 +1,15 @@ -package org.qora.test.assets; +package org.qortal.test.assets; import org.junit.After; import org.junit.Before; import org.junit.Test; - -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.AssetUtils; -import org.qora.test.common.Common; -import org.qora.utils.NTP; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.AssetUtils; +import org.qortal.test.common.Common; +import org.qortal.utils.NTP; import java.math.BigDecimal; import java.util.Map; diff --git a/src/test/java/org/qora/test/common/AccountUtils.java b/src/test/java/org/qortal/test/common/AccountUtils.java similarity index 90% rename from src/test/java/org/qora/test/common/AccountUtils.java rename to src/test/java/org/qortal/test/common/AccountUtils.java index d8ac4e87..8b304b50 100644 --- a/src/test/java/org/qora/test/common/AccountUtils.java +++ b/src/test/java/org/qortal/test/common/AccountUtils.java @@ -1,17 +1,17 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.RewardShareTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.RewardShareTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AccountUtils { diff --git a/src/test/java/org/qora/test/common/ApiCommon.java b/src/test/java/org/qortal/test/common/ApiCommon.java similarity index 94% rename from src/test/java/org/qora/test/common/ApiCommon.java rename to src/test/java/org/qortal/test/common/ApiCommon.java index 2707b2a9..2a6f0c37 100644 --- a/src/test/java/org/qora/test/common/ApiCommon.java +++ b/src/test/java/org/qortal/test/common/ApiCommon.java @@ -1,10 +1,10 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.lang.reflect.Field; import org.eclipse.jetty.server.Request; import org.junit.Before; -import org.qora.repository.DataException; +import org.qortal.repository.DataException; public class ApiCommon extends Common { diff --git a/src/test/java/org/qora/test/common/AssetUtils.java b/src/test/java/org/qortal/test/common/AssetUtils.java similarity index 90% rename from src/test/java/org/qora/test/common/AssetUtils.java rename to src/test/java/org/qortal/test/common/AssetUtils.java index 99fa30da..d16ffa0a 100644 --- a/src/test/java/org/qora/test/common/AssetUtils.java +++ b/src/test/java/org/qortal/test/common/AssetUtils.java @@ -1,28 +1,29 @@ -package org.qora.test.common; +package org.qortal.test.common; import static org.junit.Assert.assertNotNull; import java.math.BigDecimal; import java.util.Base64; import java.util.Base64.Encoder; + +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.BlockChain; +import org.qortal.data.asset.OrderData; +import org.qortal.data.transaction.BaseTransactionData; +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.group.Group; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.transaction.Transaction; + import java.util.Map; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.BlockChain; -import org.qora.data.asset.OrderData; -import org.qora.data.transaction.BaseTransactionData; -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.group.Group; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.transaction.Transaction; - public class AssetUtils { public static final int txGroupId = Group.NO_GROUP; diff --git a/src/test/java/org/qora/test/common/BlockUtils.java b/src/test/java/org/qortal/test/common/BlockUtils.java similarity index 85% rename from src/test/java/org/qora/test/common/BlockUtils.java rename to src/test/java/org/qortal/test/common/BlockUtils.java index 12f2b2c3..2bc02931 100644 --- a/src/test/java/org/qora/test/common/BlockUtils.java +++ b/src/test/java/org/qortal/test/common/BlockUtils.java @@ -1,16 +1,16 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.math.BigDecimal; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.Block; -import org.qora.block.BlockChain; -import org.qora.block.BlockMinter; -import org.qora.data.block.BlockData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.Block; +import org.qortal.block.BlockChain; +import org.qortal.block.BlockMinter; +import org.qortal.data.block.BlockData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class BlockUtils { diff --git a/src/test/java/org/qora/test/common/Common.java b/src/test/java/org/qortal/test/common/Common.java similarity index 94% rename from src/test/java/org/qora/test/common/Common.java rename to src/test/java/org/qortal/test/common/Common.java index 0ab7d5d3..bd3c3d9b 100644 --- a/src/test/java/org/qora/test/common/Common.java +++ b/src/test/java/org/qortal/test/common/Common.java @@ -1,4 +1,4 @@ -package org.qora.test.common; +package org.qortal.test.common; import static org.junit.Assert.*; @@ -21,18 +21,18 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.qora.block.BlockChain; -import org.qora.data.account.AccountBalanceData; -import org.qora.data.asset.AssetData; -import org.qora.data.group.GroupData; -import org.qora.repository.AccountRepository.BalanceOrdering; -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.utils.NTP; +import org.qortal.block.BlockChain; +import org.qortal.data.account.AccountBalanceData; +import org.qortal.data.asset.AssetData; +import org.qortal.data.group.GroupData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryFactory; +import org.qortal.repository.RepositoryManager; +import org.qortal.repository.AccountRepository.BalanceOrdering; +import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory; +import org.qortal.settings.Settings; +import org.qortal.utils.NTP; public class Common { diff --git a/src/test/java/org/qora/test/common/FakePeer.java b/src/test/java/org/qortal/test/common/FakePeer.java similarity index 97% rename from src/test/java/org/qora/test/common/FakePeer.java rename to src/test/java/org/qortal/test/common/FakePeer.java index 042ed194..13d9a15e 100644 --- a/src/test/java/org/qora/test/common/FakePeer.java +++ b/src/test/java/org/qortal/test/common/FakePeer.java @@ -1,4 +1,4 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.util.ArrayList; import java.util.Collections; @@ -7,7 +7,7 @@ import java.util.Random; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.qora.network.message.Message; +import org.qortal.network.message.Message; public abstract class FakePeer implements Runnable { private static final long DEFAULT_BROADCAST_INTERVAL = 60 * 1000; diff --git a/src/test/java/org/qora/test/common/GroupUtils.java b/src/test/java/org/qortal/test/common/GroupUtils.java similarity index 83% rename from src/test/java/org/qora/test/common/GroupUtils.java rename to src/test/java/org/qortal/test/common/GroupUtils.java index 774e2be8..75aa8a99 100644 --- a/src/test/java/org/qora/test/common/GroupUtils.java +++ b/src/test/java/org/qortal/test/common/GroupUtils.java @@ -1,18 +1,18 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.CreateGroupTransactionData; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.JoinGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.transaction.Transaction.ApprovalStatus; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.CreateGroupTransactionData; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.JoinGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.transaction.Transaction.ApprovalStatus; public class GroupUtils { diff --git a/src/test/java/org/qora/test/common/ObjectUtils.java b/src/test/java/org/qortal/test/common/ObjectUtils.java similarity index 95% rename from src/test/java/org/qora/test/common/ObjectUtils.java rename to src/test/java/org/qortal/test/common/ObjectUtils.java index 4acd035c..686cb201 100644 --- a/src/test/java/org/qora/test/common/ObjectUtils.java +++ b/src/test/java/org/qortal/test/common/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.qora.test.common; +package org.qortal.test.common; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/test/java/org/qora/test/common/PeerMessage.java b/src/test/java/org/qortal/test/common/PeerMessage.java similarity index 72% rename from src/test/java/org/qora/test/common/PeerMessage.java rename to src/test/java/org/qortal/test/common/PeerMessage.java index be9527de..92f69621 100644 --- a/src/test/java/org/qora/test/common/PeerMessage.java +++ b/src/test/java/org/qortal/test/common/PeerMessage.java @@ -1,7 +1,7 @@ -package org.qora.test.common; +package org.qortal.test.common; -import org.qora.network.message.Message; -import org.qora.test.common.FakePeer; +import org.qortal.network.message.Message; +import org.qortal.test.common.FakePeer; public class PeerMessage { public final FakePeer peer; diff --git a/src/test/java/org/qora/test/common/TestAccount.java b/src/test/java/org/qortal/test/common/TestAccount.java similarity index 78% rename from src/test/java/org/qora/test/common/TestAccount.java rename to src/test/java/org/qortal/test/common/TestAccount.java index bd95267d..9f06c471 100644 --- a/src/test/java/org/qora/test/common/TestAccount.java +++ b/src/test/java/org/qortal/test/common/TestAccount.java @@ -1,8 +1,8 @@ -package org.qora.test.common; +package org.qortal.test.common; -import org.qora.account.PrivateKeyAccount; -import org.qora.repository.Repository; -import org.qora.utils.Base58; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.repository.Repository; +import org.qortal.utils.Base58; public class TestAccount extends PrivateKeyAccount { diff --git a/src/test/java/org/qora/test/common/TransactionUtils.java b/src/test/java/org/qortal/test/common/TransactionUtils.java similarity index 84% rename from src/test/java/org/qora/test/common/TransactionUtils.java rename to src/test/java/org/qortal/test/common/TransactionUtils.java index 2c3c93c2..3b795e4a 100644 --- a/src/test/java/org/qora/test/common/TransactionUtils.java +++ b/src/test/java/org/qortal/test/common/TransactionUtils.java @@ -1,4 +1,4 @@ -package org.qora.test.common; +package org.qortal.test.common; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -6,14 +6,14 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.test.common.transaction.TestTransaction; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.TransactionType; -import org.qora.transaction.Transaction.ValidationResult; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.test.common.transaction.TestTransaction; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.TransactionType; +import org.qortal.transaction.Transaction.ValidationResult; public class TransactionUtils { diff --git a/src/test/java/org/qora/test/common/transaction/AccountFlagsTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/AccountFlagsTestTransaction.java similarity index 58% rename from src/test/java/org/qora/test/common/transaction/AccountFlagsTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/AccountFlagsTestTransaction.java index a78f7aa2..86cbd206 100644 --- a/src/test/java/org/qora/test/common/transaction/AccountFlagsTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/AccountFlagsTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.AccountFlagsTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.AccountFlagsTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AccountFlagsTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/AccountLevelTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/AccountLevelTestTransaction.java similarity index 58% rename from src/test/java/org/qora/test/common/transaction/AccountLevelTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/AccountLevelTestTransaction.java index c537d8d3..6de63cf6 100644 --- a/src/test/java/org/qora/test/common/transaction/AccountLevelTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/AccountLevelTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.AccountLevelTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.AccountLevelTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AccountLevelTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/AddGroupAdminTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/AddGroupAdminTestTransaction.java similarity index 55% rename from src/test/java/org/qora/test/common/transaction/AddGroupAdminTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/AddGroupAdminTestTransaction.java index 6160f397..4e25a85a 100644 --- a/src/test/java/org/qora/test/common/transaction/AddGroupAdminTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/AddGroupAdminTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.AddGroupAdminTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.AddGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AddGroupAdminTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/ArbitraryTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/ArbitraryTestTransaction.java similarity index 65% rename from src/test/java/org/qora/test/common/transaction/ArbitraryTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/ArbitraryTestTransaction.java index 3ada2849..6be80575 100644 --- a/src/test/java/org/qora/test/common/transaction/ArbitraryTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/ArbitraryTestTransaction.java @@ -1,17 +1,17 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.PaymentData; -import org.qora.data.transaction.ArbitraryTransactionData; -import org.qora.data.transaction.ArbitraryTransactionData.DataType; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.PaymentData; +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; public class ArbitraryTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/AtTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/AtTestTransaction.java similarity index 65% rename from src/test/java/org/qora/test/common/transaction/AtTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/AtTestTransaction.java index b5ceba18..c0daf668 100644 --- a/src/test/java/org/qora/test/common/transaction/AtTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/AtTestTransaction.java @@ -1,14 +1,14 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.crypto.Crypto; -import org.qora.data.transaction.ATTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.crypto.Crypto; +import org.qortal.data.transaction.ATTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class AtTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/BuyNameTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/BuyNameTestTransaction.java similarity index 63% rename from src/test/java/org/qora/test/common/transaction/BuyNameTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/BuyNameTestTransaction.java index 854309e3..bf69fc86 100644 --- a/src/test/java/org/qora/test/common/transaction/BuyNameTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/BuyNameTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.BuyNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.BuyNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class BuyNameTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CancelAssetOrderTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CancelAssetOrderTestTransaction.java similarity index 58% rename from src/test/java/org/qora/test/common/transaction/CancelAssetOrderTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CancelAssetOrderTestTransaction.java index 36dc5232..026364dc 100644 --- a/src/test/java/org/qora/test/common/transaction/CancelAssetOrderTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CancelAssetOrderTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CancelAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CancelAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelAssetOrderTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CancelGroupBanTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CancelGroupBanTestTransaction.java similarity index 55% rename from src/test/java/org/qora/test/common/transaction/CancelGroupBanTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CancelGroupBanTestTransaction.java index 416515f1..df691c04 100644 --- a/src/test/java/org/qora/test/common/transaction/CancelGroupBanTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CancelGroupBanTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CancelGroupBanTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CancelGroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelGroupBanTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CancelGroupInviteTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CancelGroupInviteTestTransaction.java similarity index 55% rename from src/test/java/org/qora/test/common/transaction/CancelGroupInviteTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CancelGroupInviteTestTransaction.java index 0ed8120f..5844ee5d 100644 --- a/src/test/java/org/qora/test/common/transaction/CancelGroupInviteTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CancelGroupInviteTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CancelGroupInviteTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CancelGroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelGroupInviteTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CancelSellNameTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CancelSellNameTestTransaction.java similarity index 52% rename from src/test/java/org/qora/test/common/transaction/CancelSellNameTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CancelSellNameTestTransaction.java index 3357bbff..0162f760 100644 --- a/src/test/java/org/qora/test/common/transaction/CancelSellNameTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CancelSellNameTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CancelSellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CancelSellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CancelSellNameTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CreateAssetOrderTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CreateAssetOrderTestTransaction.java similarity index 61% rename from src/test/java/org/qora/test/common/transaction/CreateAssetOrderTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CreateAssetOrderTestTransaction.java index dc3911b5..f15079e4 100644 --- a/src/test/java/org/qora/test/common/transaction/CreateAssetOrderTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CreateAssetOrderTestTransaction.java @@ -1,13 +1,13 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.CreateAssetOrderTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.CreateAssetOrderTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CreateAssetOrderTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CreateGroupTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CreateGroupTestTransaction.java similarity index 68% rename from src/test/java/org/qora/test/common/transaction/CreateGroupTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CreateGroupTestTransaction.java index eabda103..c81527c7 100644 --- a/src/test/java/org/qora/test/common/transaction/CreateGroupTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CreateGroupTestTransaction.java @@ -1,13 +1,13 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CreateGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CreateGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CreateGroupTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/CreatePollTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/CreatePollTestTransaction.java similarity index 70% rename from src/test/java/org/qora/test/common/transaction/CreatePollTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/CreatePollTestTransaction.java index e7d95f10..789e8b2a 100644 --- a/src/test/java/org/qora/test/common/transaction/CreatePollTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/CreatePollTestTransaction.java @@ -1,15 +1,15 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.CreatePollTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.data.voting.PollOptionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.CreatePollTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.voting.PollOptionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class CreatePollTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/DeployAtTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/DeployAtTestTransaction.java similarity index 70% rename from src/test/java/org/qora/test/common/transaction/DeployAtTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/DeployAtTestTransaction.java index 34e25389..df4356b8 100644 --- a/src/test/java/org/qora/test/common/transaction/DeployAtTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/DeployAtTestTransaction.java @@ -1,14 +1,14 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.DeployAtTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.DeployAtTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class DeployAtTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/GenesisTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/GenesisTestTransaction.java similarity index 59% rename from src/test/java/org/qora/test/common/transaction/GenesisTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/GenesisTestTransaction.java index 2c8d3ddf..8c0ed0a2 100644 --- a/src/test/java/org/qora/test/common/transaction/GenesisTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/GenesisTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.GenesisTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.GenesisTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GenesisTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/GroupApprovalTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/GroupApprovalTestTransaction.java similarity index 62% rename from src/test/java/org/qora/test/common/transaction/GroupApprovalTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/GroupApprovalTestTransaction.java index 8e02e50c..3d52462c 100644 --- a/src/test/java/org/qora/test/common/transaction/GroupApprovalTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/GroupApprovalTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.GroupApprovalTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.GroupApprovalTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupApprovalTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/GroupBanTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/GroupBanTestTransaction.java similarity index 61% rename from src/test/java/org/qora/test/common/transaction/GroupBanTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/GroupBanTestTransaction.java index 9df3acc2..2a8db3d4 100644 --- a/src/test/java/org/qora/test/common/transaction/GroupBanTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/GroupBanTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.GroupBanTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.GroupBanTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupBanTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/GroupInviteTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/GroupInviteTestTransaction.java similarity index 58% rename from src/test/java/org/qora/test/common/transaction/GroupInviteTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/GroupInviteTestTransaction.java index 8353a272..5545de9d 100644 --- a/src/test/java/org/qora/test/common/transaction/GroupInviteTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/GroupInviteTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.GroupInviteTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.GroupInviteTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupInviteTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/GroupKickTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/GroupKickTestTransaction.java similarity index 58% rename from src/test/java/org/qora/test/common/transaction/GroupKickTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/GroupKickTestTransaction.java index 48fefe0e..d3da0f31 100644 --- a/src/test/java/org/qora/test/common/transaction/GroupKickTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/GroupKickTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.GroupKickTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.GroupKickTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class GroupKickTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/IssueAssetTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/IssueAssetTestTransaction.java similarity index 68% rename from src/test/java/org/qora/test/common/transaction/IssueAssetTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/IssueAssetTestTransaction.java index 1347d130..659f1878 100644 --- a/src/test/java/org/qora/test/common/transaction/IssueAssetTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/IssueAssetTestTransaction.java @@ -1,13 +1,13 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.IssueAssetTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.test.common.AssetUtils; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.IssueAssetTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.test.common.AssetUtils; public class IssueAssetTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/JoinGroupTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/JoinGroupTestTransaction.java similarity index 52% rename from src/test/java/org/qora/test/common/transaction/JoinGroupTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/JoinGroupTestTransaction.java index 3d7627d1..f597d933 100644 --- a/src/test/java/org/qora/test/common/transaction/JoinGroupTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/JoinGroupTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.JoinGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.JoinGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class JoinGroupTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/LeaveGroupTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/LeaveGroupTestTransaction.java similarity index 52% rename from src/test/java/org/qora/test/common/transaction/LeaveGroupTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/LeaveGroupTestTransaction.java index 7769ae6d..f553910a 100644 --- a/src/test/java/org/qora/test/common/transaction/LeaveGroupTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/LeaveGroupTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.LeaveGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.LeaveGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class LeaveGroupTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/MessageTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/MessageTestTransaction.java similarity index 66% rename from src/test/java/org/qora/test/common/transaction/MessageTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/MessageTestTransaction.java index 64a8c3eb..e7a2a080 100644 --- a/src/test/java/org/qora/test/common/transaction/MessageTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/MessageTestTransaction.java @@ -1,13 +1,13 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.MessageTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.MessageTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class MessageTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/MultiPaymentTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/MultiPaymentTestTransaction.java similarity index 63% rename from src/test/java/org/qora/test/common/transaction/MultiPaymentTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/MultiPaymentTestTransaction.java index 46e80487..68344f5f 100644 --- a/src/test/java/org/qora/test/common/transaction/MultiPaymentTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/MultiPaymentTestTransaction.java @@ -1,16 +1,16 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.PaymentData; -import org.qora.data.transaction.MultiPaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.PaymentData; +import org.qortal.data.transaction.MultiPaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class MultiPaymentTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/PaymentTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/PaymentTestTransaction.java similarity index 59% rename from src/test/java/org/qora/test/common/transaction/PaymentTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/PaymentTestTransaction.java index c6dde054..a8d73731 100644 --- a/src/test/java/org/qora/test/common/transaction/PaymentTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/PaymentTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class PaymentTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/RegisterNameTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/RegisterNameTestTransaction.java similarity index 62% rename from src/test/java/org/qora/test/common/transaction/RegisterNameTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/RegisterNameTestTransaction.java index 71704638..14f93657 100644 --- a/src/test/java/org/qora/test/common/transaction/RegisterNameTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/RegisterNameTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.RegisterNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.RegisterNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class RegisterNameTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/RemoveGroupAdminTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/RemoveGroupAdminTestTransaction.java similarity index 55% rename from src/test/java/org/qora/test/common/transaction/RemoveGroupAdminTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/RemoveGroupAdminTestTransaction.java index d5141051..69776add 100644 --- a/src/test/java/org/qora/test/common/transaction/RemoveGroupAdminTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/RemoveGroupAdminTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.RemoveGroupAdminTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.RemoveGroupAdminTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class RemoveGroupAdminTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/RewardShareTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/RewardShareTestTransaction.java similarity index 65% rename from src/test/java/org/qora/test/common/transaction/RewardShareTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/RewardShareTestTransaction.java index 9c48df09..2adaf08d 100644 --- a/src/test/java/org/qora/test/common/transaction/RewardShareTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/RewardShareTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.RewardShareTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.RewardShareTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class RewardShareTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/SellNameTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/SellNameTestTransaction.java similarity index 61% rename from src/test/java/org/qora/test/common/transaction/SellNameTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/SellNameTestTransaction.java index 2ee92feb..310f108a 100644 --- a/src/test/java/org/qora/test/common/transaction/SellNameTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/SellNameTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.SellNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.SellNameTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class SellNameTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/SetGroupTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/SetGroupTestTransaction.java similarity index 53% rename from src/test/java/org/qora/test/common/transaction/SetGroupTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/SetGroupTestTransaction.java index 2fb490af..5a87f7cf 100644 --- a/src/test/java/org/qora/test/common/transaction/SetGroupTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/SetGroupTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.SetGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.SetGroupTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class SetGroupTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/TestTransaction.java b/src/test/java/org/qortal/test/common/transaction/TestTransaction.java similarity index 67% rename from src/test/java/org/qora/test/common/transaction/TestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/TestTransaction.java index 623f9328..ddb91939 100644 --- a/src/test/java/org/qora/test/common/transaction/TestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/TestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.block.BlockChain; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.group.Group; -import org.qora.repository.DataException; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.block.BlockChain; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.group.Group; +import org.qortal.repository.DataException; public abstract class TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/TransferAssetTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/TransferAssetTestTransaction.java similarity index 59% rename from src/test/java/org/qora/test/common/transaction/TransferAssetTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/TransferAssetTestTransaction.java index 879c35fe..10d29c99 100644 --- a/src/test/java/org/qora/test/common/transaction/TransferAssetTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/TransferAssetTestTransaction.java @@ -1,13 +1,13 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.math.BigDecimal; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.TransferAssetTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class TransferAssetTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/TransferPrivsTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/TransferPrivsTestTransaction.java similarity index 53% rename from src/test/java/org/qora/test/common/transaction/TransferPrivsTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/TransferPrivsTestTransaction.java index bd0b3162..08f7642c 100644 --- a/src/test/java/org/qora/test/common/transaction/TransferPrivsTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/TransferPrivsTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.TransferPrivsTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.TransferPrivsTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class TransferPrivsTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/UpdateAssetTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/UpdateAssetTestTransaction.java similarity index 59% rename from src/test/java/org/qora/test/common/transaction/UpdateAssetTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/UpdateAssetTestTransaction.java index 669749a1..e14c01bc 100644 --- a/src/test/java/org/qora/test/common/transaction/UpdateAssetTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/UpdateAssetTestTransaction.java @@ -1,11 +1,11 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.UpdateAssetTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.test.common.AssetUtils; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateAssetTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.test.common.AssetUtils; public class UpdateAssetTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/UpdateGroupTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/UpdateGroupTestTransaction.java similarity index 67% rename from src/test/java/org/qora/test/common/transaction/UpdateGroupTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/UpdateGroupTestTransaction.java index dd8104d9..e0575a32 100644 --- a/src/test/java/org/qora/test/common/transaction/UpdateGroupTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/UpdateGroupTestTransaction.java @@ -1,11 +1,11 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.UpdateGroupTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateGroupTransactionData; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class UpdateGroupTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/UpdateNameTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/UpdateNameTestTransaction.java similarity index 63% rename from src/test/java/org/qora/test/common/transaction/UpdateNameTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/UpdateNameTestTransaction.java index e3521054..b2c65d6e 100644 --- a/src/test/java/org/qora/test/common/transaction/UpdateNameTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/UpdateNameTestTransaction.java @@ -1,10 +1,10 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.UpdateNameTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.UpdateNameTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class UpdateNameTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/common/transaction/VoteOnPollTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/VoteOnPollTestTransaction.java similarity index 61% rename from src/test/java/org/qora/test/common/transaction/VoteOnPollTestTransaction.java rename to src/test/java/org/qortal/test/common/transaction/VoteOnPollTestTransaction.java index 74789b48..b5217b33 100644 --- a/src/test/java/org/qora/test/common/transaction/VoteOnPollTestTransaction.java +++ b/src/test/java/org/qortal/test/common/transaction/VoteOnPollTestTransaction.java @@ -1,12 +1,12 @@ -package org.qora.test.common.transaction; +package org.qortal.test.common.transaction; import java.util.Random; -import org.qora.account.PrivateKeyAccount; -import org.qora.data.transaction.VoteOnPollTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.repository.DataException; -import org.qora.repository.Repository; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.data.transaction.TransactionData; +import org.qortal.data.transaction.VoteOnPollTransactionData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; public class VoteOnPollTestTransaction extends TestTransaction { diff --git a/src/test/java/org/qora/test/group/GroupApprovalTests.java b/src/test/java/org/qortal/test/group/GroupApprovalTests.java similarity index 96% rename from src/test/java/org/qora/test/group/GroupApprovalTests.java rename to src/test/java/org/qortal/test/group/GroupApprovalTests.java index ff70ebb1..c476e40f 100644 --- a/src/test/java/org/qora/test/group/GroupApprovalTests.java +++ b/src/test/java/org/qortal/test/group/GroupApprovalTests.java @@ -1,26 +1,26 @@ -package org.qora.test.group; +package org.qortal.test.group; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.data.transaction.BaseTransactionData; -import org.qora.data.transaction.IssueAssetTransactionData; -import org.qora.data.transaction.PaymentTransactionData; -import org.qora.data.transaction.TransactionData; -import org.qora.group.Group; -import org.qora.group.Group.ApprovalThreshold; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.GroupUtils; -import org.qora.test.common.TransactionUtils; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.ApprovalStatus; -import org.qora.transaction.Transaction.ValidationResult; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.data.transaction.BaseTransactionData; +import org.qortal.data.transaction.IssueAssetTransactionData; +import org.qortal.data.transaction.PaymentTransactionData; +import org.qortal.data.transaction.TransactionData; +import org.qortal.group.Group; +import org.qortal.group.Group.ApprovalThreshold; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.GroupUtils; +import org.qortal.test.common.TransactionUtils; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.ApprovalStatus; +import org.qortal.transaction.Transaction.ValidationResult; import static org.junit.Assert.*; diff --git a/src/test/java/org/qora/test/minting/RewardShareTests.java b/src/test/java/org/qortal/test/minting/RewardShareTests.java similarity index 93% rename from src/test/java/org/qora/test/minting/RewardShareTests.java rename to src/test/java/org/qortal/test/minting/RewardShareTests.java index 42ef8ba0..cb0afd71 100644 --- a/src/test/java/org/qora/test/minting/RewardShareTests.java +++ b/src/test/java/org/qortal/test/minting/RewardShareTests.java @@ -1,4 +1,4 @@ -package org.qora.test.minting; +package org.qortal.test.minting; import static org.junit.Assert.*; @@ -7,19 +7,19 @@ import java.math.BigDecimal; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -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.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TransactionUtils; -import org.qora.transaction.Transaction; -import org.qora.transaction.Transaction.ValidationResult; -import org.qora.utils.Base58; +import org.qortal.account.PrivateKeyAccount; +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.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TransactionUtils; +import org.qortal.transaction.Transaction; +import org.qortal.transaction.Transaction.ValidationResult; +import org.qortal.utils.Base58; public class RewardShareTests extends Common { diff --git a/src/test/java/org/qora/test/minting/RewardTests.java b/src/test/java/org/qortal/test/minting/RewardTests.java similarity index 92% rename from src/test/java/org/qora/test/minting/RewardTests.java rename to src/test/java/org/qortal/test/minting/RewardTests.java index 0b5861c9..c2d3bd17 100644 --- a/src/test/java/org/qora/test/minting/RewardTests.java +++ b/src/test/java/org/qortal/test/minting/RewardTests.java @@ -1,4 +1,4 @@ -package org.qora.test.minting; +package org.qortal.test.minting; import static org.junit.Assert.*; @@ -10,19 +10,19 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -import org.qora.asset.Asset; -import org.qora.block.BlockChain; -import org.qora.block.BlockChain.RewardByHeight; -import org.qora.data.account.AccountBalanceData; -import org.qora.block.BlockMinter; -import org.qora.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.AccountUtils; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TestAccount; +import org.qortal.account.PrivateKeyAccount; +import org.qortal.asset.Asset; +import org.qortal.block.BlockChain; +import org.qortal.block.BlockMinter; +import org.qortal.block.BlockChain.RewardByHeight; +import org.qortal.data.account.AccountBalanceData; +import org.qortal.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.AccountUtils; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TestAccount; public class RewardTests extends Common { diff --git a/src/test/java/org/qora/test/naming/BuySellTests.java b/src/test/java/org/qortal/test/naming/BuySellTests.java similarity index 92% rename from src/test/java/org/qora/test/naming/BuySellTests.java rename to src/test/java/org/qortal/test/naming/BuySellTests.java index ecd577cd..5c077996 100644 --- a/src/test/java/org/qora/test/naming/BuySellTests.java +++ b/src/test/java/org/qortal/test/naming/BuySellTests.java @@ -1,4 +1,4 @@ -package org.qora.test.naming; +package org.qortal.test.naming; import static org.junit.Assert.*; @@ -8,19 +8,19 @@ import java.util.Random; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.qora.account.PrivateKeyAccount; -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.repository.DataException; -import org.qora.repository.Repository; -import org.qora.repository.RepositoryManager; -import org.qora.test.common.BlockUtils; -import org.qora.test.common.Common; -import org.qora.test.common.TransactionUtils; -import org.qora.test.common.transaction.TestTransaction; +import org.qortal.account.PrivateKeyAccount; +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.repository.DataException; +import org.qortal.repository.Repository; +import org.qortal.repository.RepositoryManager; +import org.qortal.test.common.BlockUtils; +import org.qortal.test.common.Common; +import org.qortal.test.common.TransactionUtils; +import org.qortal.test.common.transaction.TestTransaction; public class BuySellTests extends Common { diff --git a/src/test/resources/demo-node-ui.html b/src/test/resources/demo-node-ui.html index 33c70ac1..dad8f5bd 100644 --- a/src/test/resources/demo-node-ui.html +++ b/src/test/resources/demo-node-ui.html @@ -114,8 +114,8 @@ If minting address's private key is not available decrypted then do pop-up asking for password then decrypt and save into cachedPrivateKeys.
See <script> code in this page's source.

- If recipient does not have public key yet (fetch using API) then do pop-up asking if minting account should send small amount of QORA.
- When recipient receives QORA they need to do a transaction, for example: JOIN_GROUP 2, which will make their public key available from the blockchain/API. + If recipient does not have public key yet (fetch using API) then do pop-up asking if minting account should send small amount of QORT.
+ When recipient receives QORT they need to do a transaction, for example: JOIN_GROUP 2, which will make their public key available from the blockchain/API. diff --git a/src/test/resources/test-chain-v1.json b/src/test/resources/test-chain-v1.json index b93659d9..f3685db1 100644 --- a/src/test/resources/test-chain-v1.json +++ b/src/test/resources/test-chain-v1.json @@ -36,7 +36,7 @@ "votingTimestamp": 0, "arbitraryTimestamp": 0, "powfixTimestamp": 0, - "v2Timestamp": 1600000000000, + "qortalTimestamp": 1600000000000, "newAssetPricingTimestamp": 1600000000000, "groupApprovalTimestamp": 0 }, diff --git a/src/test/resources/test-chain-v2-minting.json b/src/test/resources/test-chain-v2-minting.json index dda924a0..625c225a 100644 --- a/src/test/resources/test-chain-v2-minting.json +++ b/src/test/resources/test-chain-v2-minting.json @@ -36,7 +36,7 @@ "votingTimestamp": 0, "arbitraryTimestamp": 0, "powfixTimestamp": 0, - "v2Timestamp": 0, + "qortalTimestamp": 0, "newAssetPricingTimestamp": 0, "groupApprovalTimestamp": 0 }, diff --git a/src/test/resources/test-chain-v2-qora-holder.json b/src/test/resources/test-chain-v2-qora-holder.json index 615df136..088f7d44 100644 --- a/src/test/resources/test-chain-v2-qora-holder.json +++ b/src/test/resources/test-chain-v2-qora-holder.json @@ -36,7 +36,7 @@ "votingTimestamp": 0, "arbitraryTimestamp": 0, "powfixTimestamp": 0, - "v2Timestamp": 0, + "qortalTimestamp": 0, "newAssetPricingTimestamp": 0, "groupApprovalTimestamp": 0 }, diff --git a/src/test/resources/test-chain-v2.json b/src/test/resources/test-chain-v2.json index bb0e882b..1ea8bb57 100644 --- a/src/test/resources/test-chain-v2.json +++ b/src/test/resources/test-chain-v2.json @@ -36,7 +36,7 @@ "votingTimestamp": 0, "arbitraryTimestamp": 0, "powfixTimestamp": 0, - "v2Timestamp": 0, + "qortalTimestamp": 0, "newAssetPricingTimestamp": 0, "groupApprovalTimestamp": 0 },