diff --git a/conf/brs-default.properties b/conf/brs-default.properties index 5ba7a1333..ecc922977 100644 --- a/conf/brs-default.properties +++ b/conf/brs-default.properties @@ -313,3 +313,7 @@ brs.debugLogUnconfirmed = false # Timeout in Seconds to wait for a graceful shutdown brs.ShutdownTimeout = 180 + +# Enable the indirect incoming tracker service. This allows you to see transactions where you are paid +# but are not the direct recipient eg. Multi-Outs. +IndirectIncomingService.Enable = true diff --git a/html/ui/js/brs.messages.js b/html/ui/js/brs.messages.js index 53b3d68b4..00b23cf1b 100644 --- a/html/ui/js/brs.messages.js +++ b/html/ui/js/brs.messages.js @@ -23,7 +23,8 @@ var BRS = (function(BRS, $, undefined) { "firstIndex": 0, "lastIndex": 74, "type": 1, - "subtype": 0 + "subtype": 0, + "includeIndirect": false }, function(response) { if (response.transactions && response.transactions.length) { for (var i = 0; i < response.transactions.length; i++) { diff --git a/html/ui/js/brs.modals.account.js b/html/ui/js/brs.modals.account.js index 39a404fa0..36fa29784 100644 --- a/html/ui/js/brs.modals.account.js +++ b/html/ui/js/brs.modals.account.js @@ -118,7 +118,8 @@ var BRS = (function(BRS, $, undefined) { BRS.sendRequest("getAccountTransactions", { "account": BRS.userInfoModal.user, "firstIndex": 0, - "lastIndex": 99 + "lastIndex": 99, + "includeIndirect": true }, function(response) { if (response.transactions && response.transactions.length) { var rows = ""; @@ -129,13 +130,22 @@ var BRS = (function(BRS, $, undefined) { var transactionType = "Unknown"; if (transaction.type == 0) { - transactionType = $.t("ordinary_payment"); + switch (transaction.subtype) { + case 0: + transactionType = $.t("ordinary_payment"); + break; + + case 1: + transactionType = "Multi-out payment"; + break; + + case 2: + transactionType = "Multi-out Same payment"; + break; + } } else if (transaction.type == 1) { switch (transaction.subtype) { - case 0: - transactionType = $.t("arbitrary_message"); - break; case 1: transactionType = $.t("alias_assignment"); break; diff --git a/html/ui/js/brs.modals.transaction.js b/html/ui/js/brs.modals.transaction.js index 593a18b32..2a5c8d5cc 100644 --- a/html/ui/js/brs.modals.transaction.js +++ b/html/ui/js/brs.modals.transaction.js @@ -93,24 +93,92 @@ var BRS = (function(BRS, $, undefined) { } if (transaction.type == 0) { - switch (transaction.subtype) { - case 0: - data = { - "type": $.t("ordinary_payment"), - "amount": transaction.amountNQT, - "fee": transaction.feeNQT, - "recipient": BRS.getAccountTitle(transaction, "recipient"), - "sender": BRS.getAccountTitle(transaction, "sender") - }; - - $("#transaction_info_table tbody").append(BRS.createInfoTable(data)); - $("#transaction_info_table").show(); + switch (transaction.subtype) { + case 0: + data = { + "type": $.t("ordinary_payment"), + "amount": transaction.amountNQT, + "fee": transaction.feeNQT, + "recipient": BRS.getAccountTitle(transaction, "recipient"), + "sender": BRS.getAccountTitle(transaction, "sender") + }; + + $("#transaction_info_table tbody").append(BRS.createInfoTable(data)); + $("#transaction_info_table").show(); + + break; + case 1: + if (transaction.attachment == null || transaction.attachment.recipients == null) { + incorrect = true; + return; + } + var recipientHtml = ""; + var nxtAddress = new NxtAddress(); + for (var i = 0; i < transaction.attachment.recipients.length; i++) { + var recipient = transaction.attachment.recipients[i]; + nxtAddress.set(recipient[0]); + var address = nxtAddress.toString(); + var amount = BRS.formatAmount(recipient[1]) + " BURST"; + if (i !== 0) { + recipientHtml += "
"; + } + if (address === BRS.accountRS) { + recipientHtml += ""+address+": "+amount+""; + } else { + recipientHtml += address+": "+amount; + } + } - break; - default: - incorrect = true; - break; - } + data = { + "type": "Multi-out Payment", + "amount": transaction.amountNQT, + "fee": transaction.feeNQT, + "recipient_formatted_html": recipientHtml, + "sender": BRS.getAccountTitle(transaction, "sender") + }; + + $("#transaction_info_table tbody").append(BRS.createInfoTable(data)); + $("#transaction_info_table").show(); + + break; + case 2: + if (transaction.attachment == null || transaction.attachment.recipients == null) { + incorrect = true; + return; + } + var amountEach = parseInt(transaction.amountNQT) / transaction.attachment.recipients.length; + var recipientHtml = ""; + var nxtAddress = new NxtAddress(); + for (var i = 0; i < transaction.attachment.recipients.length; i++) { + var recipient = transaction.attachment.recipients[i]; + nxtAddress.set(recipient); + var address = nxtAddress.toString(); + if (i !== 0) { + recipientHtml += "
"; + } + if (address === BRS.accountRS) { + recipientHtml += ""+address+""; + } else { + recipientHtml += address; + } + } + + data = { + "type": "Multi-out Same Payment", + "amount_formatted_html": BRS.formatAmount(transaction.amountNQT) + " BURST (" + BRS.formatAmount(amountEach.toString()) + " BURST for each recipient)", + "fee": transaction.feeNQT, + "recipient_formatted_html": recipientHtml, + "sender": BRS.getAccountTitle(transaction, "sender") + }; + + $("#transaction_info_table tbody").append(BRS.createInfoTable(data)); + $("#transaction_info_table").show(); + + break; + default: + incorrect = true; + break; + } } else if (transaction.type == 1) { switch (transaction.subtype) { diff --git a/html/ui/js/brs.transactions.js b/html/ui/js/brs.transactions.js index 18c403372..34503d5da 100644 --- a/html/ui/js/brs.transactions.js +++ b/html/ui/js/brs.transactions.js @@ -14,7 +14,8 @@ var BRS = (function(BRS, $, undefined) { BRS.sendRequest("getAccountTransactions", { "account": BRS.account, "firstIndex": 0, - "lastIndex": 9 + "lastIndex": 9, + "includeIndirect": true }, function(response) { if (response.transactions && response.transactions.length) { var transactions = []; @@ -56,7 +57,27 @@ var BRS = (function(BRS, $, undefined) { var transactionType = BRS.getTransactionNameFromType(transaction); var receiving = transaction.recipient == BRS.account; - + var amount = transaction.amountNQT; + if (transaction.type === 0) { + if (transaction.subtype === 1) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + var recipient = transaction.attachment.recipients[i1]; + if (recipient[0] === BRS.account) { + receiving = true; + amount = recipient[1]; + } + } + } else if (transaction.subtype === 2) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + if (transaction.attachment.recipients[i1] === BRS.account) { + receiving = true; + amount = (parseInt(transaction.amountNQT) / transaction.attachment.recipients.length).toString(); + } + } + } + } var account = (receiving ? "sender" : "recipient"); if (transaction.amountNQT) { @@ -64,7 +85,7 @@ var BRS = (function(BRS, $, undefined) { transaction.fee = new BigInteger(transaction.feeNQT); } - rows += "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(transaction.amount) + " + " + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (transaction.confirmations > 10 ? "10+" : String(transaction.confirmations).escapeHTML()) + ""; + rows += "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(amount) + " + " + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (transaction.confirmations > 10 ? "10+" : String(transaction.confirmations).escapeHTML()) + ""; } $("#dashboard_transactions_table tbody").empty().append(rows); @@ -86,7 +107,8 @@ var BRS = (function(BRS, $, undefined) { BRS.sendRequest("getAccountTransactions", { "account": BRS.account, "firstIndex": 0, - "lastIndex": 9 + "lastIndex": 9, + "includeIndirect": true }, function(response) { if (response.transactions && response.transactions.length) { var transactionIds = []; @@ -249,6 +271,27 @@ var BRS = (function(BRS, $, undefined) { var transactionType = BRS.getTransactionNameFromType(transaction); var receiving = transaction.recipient == BRS.account; + var amount = transaction.amountNQT; + if (transaction.type === 0) { + if (transaction.subtype === 1) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + var recipient = transaction.attachment.recipients[i1]; + if (recipient[0] === BRS.account) { + receiving = true; + amount = recipient[1]; + } + } + } else if (transaction.subtype === 2) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + if (transaction.attachment.recipients[i1] === BRS.account) { + receiving = true; + amount = (parseInt(transaction.amountNQT) / transaction.attachment.recipients.length).toString(); + } + } + } + } var account = (receiving ? "sender" : "recipient"); if (transaction.confirmed) { @@ -260,7 +303,7 @@ var BRS = (function(BRS, $, undefined) { transaction.fee = new BigInteger(transaction.feeNQT); } - rows += "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(transaction.amount) + " + " + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (transaction.confirmations > 10 ? "10+" : String(transaction.confirmations).escapeHTML()) + ""; + rows += "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(amount) + " + " + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (transaction.confirmations > 10 ? "10+" : String(transaction.confirmations).escapeHTML()) + ""; } if (onlyUnconfirmed) { @@ -351,7 +394,8 @@ var BRS = (function(BRS, $, undefined) { var params = { "account": BRS.account, "firstIndex": 0, - "lastIndex": 99 + "lastIndex": 99, + "includeIndirect": true }; if (BRS.transactionsPageType) { @@ -408,7 +452,19 @@ var BRS = (function(BRS, $, undefined) { BRS.getTransactionNameFromType = function(transaction) { var transactionType = $.t("unknown"); if (transaction.type === 0) { - transactionType = $.t("ordinary_payment"); + switch (transaction.subtype) { + case 0: + transactionType = $.t("ordinary_payment"); + break; + + case 1: + transactionType = "Multi-out payment"; + break; + + case 2: + transactionType = "Multi-out Same payment"; + break; + } } else if (transaction.type == 1) { switch (transaction.subtype) { @@ -551,6 +607,27 @@ var BRS = (function(BRS, $, undefined) { var transactionType = BRS.getTransactionNameFromType(transaction); var receiving = transaction.recipient == BRS.account; + var amount = transaction.amountNQT; + if (transaction.type === 0) { + if (transaction.subtype === 1) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + var recipient = transaction.attachment.recipients[i1]; + if (recipient[0] === BRS.account) { + receiving = true; + amount = recipient[1]; + } + } + } else if (transaction.subtype === 2) { + receiving = false; + for (var i1 = 0; i1 < transaction.attachment.recipients.length; i1++) { + if (transaction.attachment.recipients[i1] === BRS.account) { + receiving = true; + amount = (parseInt(transaction.amountNQT) / transaction.attachment.recipients.length).toString(); + } + } + } + } var account = (receiving ? "sender" : "recipient"); if (transaction.amountNQT) { @@ -569,7 +646,7 @@ var BRS = (function(BRS, $, undefined) { } } - return "" + String(transaction.transaction).escapeHTML() + "" + (hasMessage ? " " : "/") + "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(transaction.amount) + "" + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (!transaction.confirmed ? "/" : (transaction.confirmations > 1440 ? "1440+" : BRS.formatAmount(transaction.confirmations))) + ""; + return "" + String(transaction.transaction).escapeHTML() + "" + (hasMessage ? " " : "/") + "" + BRS.formatTimestamp(transaction.timestamp) + "" + transactionType + "" + (transaction.type == 0 ? (receiving ? "" : "") : "") + " 0 ? " style='color:red'" : "")) + ">" + BRS.formatAmount(amount) + "" + BRS.formatAmount(transaction.fee) + "" + BRS.getAccountLink(transaction, account) + "" + (!transaction.confirmed ? "/" : (transaction.confirmations > 1440 ? "1440+" : BRS.formatAmount(transaction.confirmations))) + ""; }; $("#transactions_page_type li a").click(function(e) { diff --git a/resources/db/migration_h2/V2__indirect_incoming.sql b/resources/db/migration_h2/V2__indirect_incoming.sql new file mode 100644 index 000000000..2378990b5 --- /dev/null +++ b/resources/db/migration_h2/V2__indirect_incoming.sql @@ -0,0 +1,8 @@ +CREATE TABLE IF NOT EXISTS indirect_incoming +( + db_id IDENTITY, + account_id bigint NOT NULL, + transaction_id bigint NOT NULL, + height INT NOT NULL +); +CREATE UNIQUE INDEX indirect_incoming_db_id_uindex ON indirect_incoming (account_id, transaction_id); \ No newline at end of file diff --git a/resources/db/migration_mariadb/V2__indirect_incoming.sql b/resources/db/migration_mariadb/V2__indirect_incoming.sql new file mode 100644 index 000000000..1bc73432c --- /dev/null +++ b/resources/db/migration_mariadb/V2__indirect_incoming.sql @@ -0,0 +1,9 @@ +CREATE TABLE IF NOT EXISTS indirect_incoming +( + db_id bigint(20) AUTO_INCREMENT, + account_id bigint(20) NOT NULL, + transaction_id bigint(20) NOT NULL, + height INT NOT NULL, + PRIMARY KEY (db_id) +); +CREATE UNIQUE INDEX indirect_incoming_db_id_uindex ON indirect_incoming (account_id, transaction_id); \ No newline at end of file diff --git a/src/brs/Attachment.java b/src/brs/Attachment.java index e2c44cd0a..1b74c7786 100644 --- a/src/brs/Attachment.java +++ b/src/brs/Attachment.java @@ -100,7 +100,7 @@ public TransactionType getTransactionType() { }; - final class PaymentMultiOutCreation extends AbstractAttachment { + class PaymentMultiOutCreation extends AbstractAttachment { private final ArrayList> recipients = new ArrayList<>(); @@ -219,7 +219,7 @@ public Long getAmountNQT() { return amountNQT; } - public Collection> getRecipients() { + public Collection> getRecipients() { return Collections.unmodifiableCollection(recipients); } @@ -236,7 +236,7 @@ public Any getProtobufMessage() { } } - final class PaymentMultiSameOutCreation extends AbstractAttachment { + class PaymentMultiSameOutCreation extends AbstractAttachment { private final ArrayList recipients = new ArrayList<>(); diff --git a/src/brs/Blockchain.java b/src/brs/Blockchain.java index a68501772..3e9dfb85b 100644 --- a/src/brs/Blockchain.java +++ b/src/brs/Blockchain.java @@ -44,8 +44,7 @@ public interface Blockchain { BurstIterator getAllTransactions(); - BurstIterator getTransactions(Account account, byte type, byte subtype, int blockImplTimestamp); - - BurstIterator getTransactions(Account account, int numberOfConfirmations, byte type, byte subtype, int blockImplTimestamp, int from, int to); + BurstIterator getTransactions(Account account, byte type, byte subtype, int blockImplTimestamp, boolean includeIndirectIncoming); + BurstIterator getTransactions(Account account, int numberOfConfirmations, byte type, byte subtype, int blockImplTimestamp, int from, int to, boolean includeIndirectIncoming); } diff --git a/src/brs/BlockchainImpl.java b/src/brs/BlockchainImpl.java index b1706c70e..88c22e5dc 100644 --- a/src/brs/BlockchainImpl.java +++ b/src/brs/BlockchainImpl.java @@ -193,15 +193,13 @@ public BurstIterator getAllTransactions() { } @Override - public BurstIterator getTransactions(Account account, byte type, byte subtype, int blockTimestamp) { - return getTransactions(account, 0, type, subtype, blockTimestamp, 0, -1); + public BurstIterator getTransactions(Account account, byte type, byte subtype, int blockTimestamp, boolean includeIndirectIncoming) { + return getTransactions(account, 0, type, subtype, blockTimestamp, 0, -1, includeIndirectIncoming); } @Override public BurstIterator getTransactions(Account account, int numberOfConfirmations, byte type, byte subtype, - int blockTimestamp, int from, int to) { - return blockchainStore.getTransactions(account, numberOfConfirmations, type, subtype, blockTimestamp, from, to); + int blockTimestamp, int from, int to, boolean includeIndirectIncoming) { + return blockchainStore.getTransactions(account, numberOfConfirmations, type, subtype, blockTimestamp, from, to, includeIndirectIncoming); } - - } diff --git a/src/brs/BlockchainProcessorImpl.java b/src/brs/BlockchainProcessorImpl.java index 3578b3008..ffbd7b302 100644 --- a/src/brs/BlockchainProcessorImpl.java +++ b/src/brs/BlockchainProcessorImpl.java @@ -64,6 +64,7 @@ public final class BlockchainProcessorImpl implements BlockchainProcessor { private final StatisticsManagerImpl statisticsManager; private final Generator generator; private final DBCacheManagerImpl dbCacheManager; + private final IndirectIncomingService indirectIncomingService; private static final int MAX_TIMESTAMP_DIFFERENCE = 15; private boolean oclVerify; @@ -96,11 +97,11 @@ public final Boolean getOclVerify() { } public BlockchainProcessorImpl(ThreadPool threadPool, BlockService blockService, TransactionProcessorImpl transactionProcessor, BlockchainImpl blockchain, - PropertyService propertyService, - SubscriptionService subscriptionService, TimeService timeService, DerivedTableManager derivedTableManager, - BlockDb blockDb, TransactionDb transactionDb, EconomicClustering economicClustering, BlockchainStore blockchainStore, Stores stores, EscrowService escrowService, - TransactionService transactionService, DownloadCacheImpl downloadCache, Generator generator, StatisticsManagerImpl statisticsManager, DBCacheManagerImpl dbCacheManager, - AccountService accountService) { + PropertyService propertyService, + SubscriptionService subscriptionService, TimeService timeService, DerivedTableManager derivedTableManager, + BlockDb blockDb, TransactionDb transactionDb, EconomicClustering economicClustering, BlockchainStore blockchainStore, Stores stores, EscrowService escrowService, + TransactionService transactionService, DownloadCacheImpl downloadCache, Generator generator, StatisticsManagerImpl statisticsManager, DBCacheManagerImpl dbCacheManager, + AccountService accountService, IndirectIncomingService indirectIncomingService) { this.blockService = blockService; this.transactionProcessor = transactionProcessor; this.timeService = timeService; @@ -119,6 +120,7 @@ public BlockchainProcessorImpl(ThreadPool threadPool, BlockService blockService, this.statisticsManager = statisticsManager; this.dbCacheManager = dbCacheManager; this.accountService = accountService; + this.indirectIncomingService = indirectIncomingService; oclVerify = propertyService.getBoolean(Props.GPU_ACCELERATION); // use GPU acceleration ? oclUnverifiedQueue = propertyService.getInt(Props.GPU_UNVERIFIED_QUEUE); @@ -1000,6 +1002,7 @@ private void pushBlock(final Block block) throws BlockNotAcceptedException { calculatedTotalAmount += transaction.getAmountNQT(); calculatedTotalFee += transaction.getFeeNQT(); digest.update(transaction.getBytes()); + indirectIncomingService.processTransaction(transaction); } if (calculatedTotalAmount > block.getTotalAmountNQT() diff --git a/src/brs/Burst.java b/src/brs/Burst.java index 2bf0e9a74..f120ea9d6 100644 --- a/src/brs/Burst.java +++ b/src/brs/Burst.java @@ -201,11 +201,13 @@ private static void loadWallet(PropertyService propertyService) { final DownloadCacheImpl downloadCache = new DownloadCacheImpl(propertyService, fluxCapacitor, blockchain); + final IndirectIncomingService indirectIncomingService = new IndirectIncomingServiceImpl(stores.getIndirectIncomingStore(), propertyService); + final BlockService blockService = new BlockServiceImpl(accountService, transactionService, blockchain, downloadCache, generator); blockchainProcessor = new BlockchainProcessorImpl(threadPool, blockService, transactionProcessor, blockchain, propertyService, subscriptionService, timeService, derivedTableManager, blockDb, transactionDb, economicClustering, blockchainStore, stores, escrowService, transactionService, downloadCache, generator, statisticsManager, - dbCacheManager, accountService); + dbCacheManager, accountService, indirectIncomingService); final FeeSuggestionCalculator feeSuggestionCalculator = new FeeSuggestionCalculator(blockchainProcessor, blockchainStore, 10); diff --git a/src/brs/db/sql/SqlBlockchainStore.java b/src/brs/db/sql/SqlBlockchainStore.java index cac586e7c..daeb1a4ae 100644 --- a/src/brs/db/sql/SqlBlockchainStore.java +++ b/src/brs/db/sql/SqlBlockchainStore.java @@ -5,7 +5,9 @@ import brs.db.BlockDb; import brs.db.BurstIterator; import brs.db.store.BlockchainStore; +import brs.db.store.IndirectIncomingStore; import brs.schema.tables.records.BlockRecord; +import brs.schema.tables.records.TransactionRecord; import org.jooq.*; import java.sql.ResultSet; @@ -19,6 +21,11 @@ public class SqlBlockchainStore implements BlockchainStore { private final TransactionDb transactionDb = Burst.getDbs().getTransactionDb(); private final BlockDb blockDb = Burst.getDbs().getBlockDb(); + private final IndirectIncomingStore indirectIncomingStore; + + public SqlBlockchainStore(IndirectIncomingStore indirectIncomingStore) { + this.indirectIncomingStore = indirectIncomingStore; + } @Override public BurstIterator getBlocks(int from, int to) { @@ -117,7 +124,7 @@ public BurstIterator getAllTransactions() { @Override public BurstIterator getTransactions(Account account, int numberOfConfirmations, byte type, byte subtype, - int blockTimestamp, int from, int to) { + int blockTimestamp, int from, int to, boolean includeIndirectIncoming) { int height = numberOfConfirmations > 0 ? Burst.getBlockchain().getHeight() - numberOfConfirmations : Integer.MAX_VALUE; if (height < 0) { throw new IllegalArgumentException("Number of confirmations required " + numberOfConfirmations @@ -137,16 +144,28 @@ public BurstIterator getTransactions(Account account, int numberOfC if (height < Integer.MAX_VALUE) { conditions.add(TRANSACTION.HEIGHT.le(height)); } - SelectQuery selectQuery = ctx.selectFrom(TRANSACTION).where(conditions).and( - TRANSACTION.RECIPIENT_ID.eq(account.getId()).and( - TRANSACTION.SENDER_ID.ne(account.getId()) - ) - ).unionAll( - ctx.selectFrom(TRANSACTION).where(conditions).and( - TRANSACTION.SENDER_ID.eq(account.getId()) - ) - ) - .orderBy(TRANSACTION.BLOCK_TIMESTAMP.desc(), TRANSACTION.ID.desc()).getQuery(); + + SelectOrderByStep select = ctx.selectFrom(TRANSACTION).where(conditions).and( + TRANSACTION.RECIPIENT_ID.eq(account.getId()).and( + TRANSACTION.SENDER_ID.ne(account.getId()) + ) + ).unionAll( + ctx.selectFrom(TRANSACTION).where(conditions).and( + TRANSACTION.SENDER_ID.eq(account.getId()) + ) + ); + + if (includeIndirectIncoming) { + select = select.unionAll(ctx.selectFrom(TRANSACTION) + .where(conditions) + .and(TRANSACTION.ID.in(indirectIncomingStore.getIndirectIncomings(account.getId(), from, to)))); + + } + + SelectQuery selectQuery = select + .orderBy(TRANSACTION.BLOCK_TIMESTAMP.desc(), TRANSACTION.ID.desc()) + .getQuery(); + DbUtils.applyLimits(selectQuery, from, to); return getTransactions( diff --git a/src/brs/db/sql/SqlIndirectIncomingStore.java b/src/brs/db/sql/SqlIndirectIncomingStore.java new file mode 100644 index 000000000..f07c1012b --- /dev/null +++ b/src/brs/db/sql/SqlIndirectIncomingStore.java @@ -0,0 +1,58 @@ +package brs.db.sql; + +import brs.db.BurstIterator; +import brs.db.BurstKey; +import brs.db.store.DerivedTableManager; +import brs.db.store.IndirectIncomingStore; +import org.jooq.DSLContext; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static brs.schema.Tables.INDIRECT_INCOMING; + +public class SqlIndirectIncomingStore implements IndirectIncomingStore { + + private final EntitySqlTable indirectIncomingTable; + + public SqlIndirectIncomingStore(DerivedTableManager derivedTableManager) { + BurstKey.LinkKeyFactory indirectIncomingDbKeyFactory = new DbKey.LinkKeyFactory("account_id", "transaction_id") { + @Override + public BurstKey newKey(IndirectIncoming indirectIncoming) { + return newKey(indirectIncoming.getAccountId(), indirectIncoming.getTransactionId()); + } + }; + + this.indirectIncomingTable = new EntitySqlTable("indirect_incoming", INDIRECT_INCOMING, indirectIncomingDbKeyFactory, derivedTableManager) { + @Override + protected IndirectIncoming load(DSLContext ctx, ResultSet rs) throws SQLException { + return new IndirectIncoming(rs.getLong("account_id"), rs.getLong("transaction_id"), rs.getInt("height")); + } + + @Override + void save(DSLContext ctx, IndirectIncoming indirectIncoming) { + ctx.insertInto(INDIRECT_INCOMING, INDIRECT_INCOMING.ACCOUNT_ID, INDIRECT_INCOMING.TRANSACTION_ID, INDIRECT_INCOMING.HEIGHT) + .values(indirectIncoming.getAccountId(), indirectIncoming.getTransactionId(), indirectIncoming.getHeight()) + .execute(); + } + }; + } + + @Override + public void addIndirectIncomings(Collection indirectIncomings) { + try (DSLContext ctx = Db.getDSLContext()) { + indirectIncomings.forEach(indirectIncoming -> indirectIncomingTable.save(ctx, indirectIncoming)); + } + } + + @Override + public List getIndirectIncomings(long accountId, int from, int to) { + BurstIterator result = indirectIncomingTable.getManyBy(INDIRECT_INCOMING.ACCOUNT_ID.eq(accountId), from, to); + List transactionIDs = new ArrayList<>(); + result.forEachRemaining(indirectIncoming -> transactionIDs.add(indirectIncoming.getTransactionId())); + return transactionIDs; + } +} diff --git a/src/brs/db/store/BlockchainStore.java b/src/brs/db/store/BlockchainStore.java index d69d7a5df..be14671e7 100644 --- a/src/brs/db/store/BlockchainStore.java +++ b/src/brs/db/store/BlockchainStore.java @@ -31,7 +31,7 @@ public interface BlockchainStore { BurstIterator getAllTransactions(); BurstIterator getTransactions(Account account, int numberOfConfirmations, byte type, byte subtype, - int blockTimestamp, int from, int to); + int blockTimestamp, int from, int to, boolean includeIndirectIncoming); BurstIterator getTransactions(DSLContext ctx, ResultSet rs); diff --git a/src/brs/db/store/IndirectIncomingStore.java b/src/brs/db/store/IndirectIncomingStore.java new file mode 100644 index 000000000..90609bc58 --- /dev/null +++ b/src/brs/db/store/IndirectIncomingStore.java @@ -0,0 +1,53 @@ +package brs.db.store; + +import java.util.Collection; +import java.util.List; + +public interface IndirectIncomingStore { + void addIndirectIncomings(Collection indirectIncomings); + List getIndirectIncomings(long accountId, int from, int to); + + class IndirectIncoming { + private final long accountId; + private final long transactionId; + private final int height; + + public IndirectIncoming(long accountId, long transactionId, int height) { + this.accountId = accountId; + this.transactionId = transactionId; + this.height = height; + } + + public long getAccountId() { + return accountId; + } + + public long getTransactionId() { + return transactionId; + } + + public int getHeight() { + return height; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + IndirectIncoming that = (IndirectIncoming) o; + + if (accountId != that.accountId) return false; + if (transactionId != that.transactionId) return false; + return height == that.height; + } + + @Override + public int hashCode() { + int result = (int) (accountId ^ (accountId >>> 32)); + result = 31 * result + (int) (transactionId ^ (transactionId >>> 32)); + result = 31 * result + height; + return result; + } + } +} diff --git a/src/brs/db/store/Stores.java b/src/brs/db/store/Stores.java index b64c37e18..484114a09 100644 --- a/src/brs/db/store/Stores.java +++ b/src/brs/db/store/Stores.java @@ -20,6 +20,7 @@ public class Stores { private final TradeStore tradeStore; private final SubscriptionStore subscriptionStore; private final UnconfirmedTransactionStore unconfirmedTransactionStore; + private final IndirectIncomingStore indirectIncomingStore; public Stores(DerivedTableManager derivedTableManager, DBCacheManagerImpl dbCacheManager, TimeService timeService, PropertyService propertyService) { this.accountStore = new SqlAccountStore(derivedTableManager, dbCacheManager); @@ -27,13 +28,14 @@ public Stores(DerivedTableManager derivedTableManager, DBCacheManagerImpl dbCach this.assetStore = new SqlAssetStore(derivedTableManager); this.assetTransferStore = new SqlAssetTransferStore(derivedTableManager); this.atStore = new SqlATStore(derivedTableManager); - this.blockchainStore = new SqlBlockchainStore(); this.digitalGoodsStoreStore = new SqlDigitalGoodsStoreStore(derivedTableManager); this.escrowStore = new SqlEscrowStore(derivedTableManager); this.orderStore = new SqlOrderStore(derivedTableManager); this.tradeStore = new SqlTradeStore(derivedTableManager); this.subscriptionStore = new SqlSubscriptionStore(derivedTableManager); this.unconfirmedTransactionStore = new UnconfirmedTransactionStoreImpl(timeService, propertyService, accountStore); + this.indirectIncomingStore = new SqlIndirectIncomingStore(derivedTableManager); + this.blockchainStore = new SqlBlockchainStore(indirectIncomingStore); } public AccountStore getAccountStore() { @@ -100,4 +102,7 @@ public SubscriptionStore getSubscriptionStore() { return subscriptionStore; } + public IndirectIncomingStore getIndirectIncomingStore() { + return indirectIncomingStore; + } } diff --git a/src/brs/http/APIServlet.java b/src/brs/http/APIServlet.java index 13e8c2c73..72ff27d2d 100644 --- a/src/brs/http/APIServlet.java +++ b/src/brs/http/APIServlet.java @@ -91,7 +91,7 @@ public APIServlet(TransactionProcessor transactionProcessor, Blockchain blockcha map.put("getPeer", GetPeer.instance); map.put("getMyPeerInfo", new GetMyPeerInfo(blockchainProcessor, transactionProcessor)); map.put("getPeers", GetPeers.instance); - map.put("getState", new GetState(blockchain, assetExchange, accountService, escrowService, aliasService, timeService, generator)); + map.put("getState", new GetState(blockchain, assetExchange, accountService, escrowService, aliasService, timeService, generator, propertyService)); map.put("getTime", new GetTime(timeService)); map.put("getTrades", new GetTrades(parameterService, assetExchange)); map.put("getAllTrades", new GetAllTrades(assetExchange)); diff --git a/src/brs/http/GetAccountTransactionIds.java b/src/brs/http/GetAccountTransactionIds.java index 929b13fe4..d6721537e 100644 --- a/src/brs/http/GetAccountTransactionIds.java +++ b/src/brs/http/GetAccountTransactionIds.java @@ -21,7 +21,7 @@ final class GetAccountTransactionIds extends APIServlet.APIRequestHandler { GetAccountTransactionIds(ParameterService parameterService, Blockchain blockchain) { super(new APITag[]{APITag.ACCOUNTS}, ACCOUNT_PARAMETER, TIMESTAMP_PARAMETER, TYPE_PARAMETER, SUBTYPE_PARAMETER, ACCOUNT_PARAMETER, TIMESTAMP_PARAMETER, FIRST_INDEX_PARAMETER, LAST_INDEX_PARAMETER, - NUMBER_OF_CONFIRMATIONS_PARAMETER); + NUMBER_OF_CONFIRMATIONS_PARAMETER, INCLUDE_INDIRECT_PARAMETER); this.parameterService = parameterService; this.blockchain = blockchain; } @@ -51,7 +51,7 @@ JsonElement processRequest(HttpServletRequest req) throws BurstException { JsonArray transactionIds = new JsonArray(); try (BurstIterator iterator = blockchain.getTransactions(account, numberOfConfirmations, type, subtype, timestamp, - firstIndex, lastIndex)) { + firstIndex, lastIndex, parameterService.getIncludeIndirect(req))) { while (iterator.hasNext()) { Transaction transaction = iterator.next(); transactionIds.add(transaction.getStringId()); diff --git a/src/brs/http/GetAccountTransactions.java b/src/brs/http/GetAccountTransactions.java index 84cc9d2c9..761f7a0b8 100644 --- a/src/brs/http/GetAccountTransactions.java +++ b/src/brs/http/GetAccountTransactions.java @@ -21,7 +21,7 @@ final class GetAccountTransactions extends APIServlet.APIRequestHandler { private final Blockchain blockchain; GetAccountTransactions(ParameterService parameterService, Blockchain blockchain) { - super(new APITag[] {APITag.ACCOUNTS}, ACCOUNT_PARAMETER, TIMESTAMP_PARAMETER, TYPE_PARAMETER, SUBTYPE_PARAMETER, FIRST_INDEX_PARAMETER, LAST_INDEX_PARAMETER, NUMBER_OF_CONFIRMATIONS_PARAMETER); + super(new APITag[] {APITag.ACCOUNTS}, ACCOUNT_PARAMETER, TIMESTAMP_PARAMETER, TYPE_PARAMETER, SUBTYPE_PARAMETER, FIRST_INDEX_PARAMETER, LAST_INDEX_PARAMETER, NUMBER_OF_CONFIRMATIONS_PARAMETER, INCLUDE_INDIRECT_PARAMETER); this.parameterService = parameterService; this.blockchain = blockchain; } @@ -56,7 +56,7 @@ JsonElement processRequest(HttpServletRequest req) throws BurstException { JsonArray transactions = new JsonArray(); try (BurstIterator iterator = blockchain.getTransactions(account, numberOfConfirmations, type, subtype, timestamp, - firstIndex, lastIndex)) { + firstIndex, lastIndex, parameterService.getIncludeIndirect(req))) { while (iterator.hasNext()) { Transaction transaction = iterator.next(); transactions.add(JSONData.transaction(transaction, blockchain.getHeight())); diff --git a/src/brs/http/GetState.java b/src/brs/http/GetState.java index 5ac4205f6..cd4d90651 100644 --- a/src/brs/http/GetState.java +++ b/src/brs/http/GetState.java @@ -5,6 +5,8 @@ import brs.db.BurstIterator; import brs.peer.Peer; import brs.peer.Peers; +import brs.props.PropertyService; +import brs.props.Props; import brs.services.AccountService; import brs.services.AliasService; import brs.services.EscrowService; @@ -26,9 +28,10 @@ final class GetState extends APIServlet.APIRequestHandler { private final AliasService aliasService; private final TimeService timeService; private final Generator generator; + private final PropertyService propertyService; GetState(Blockchain blockchain, AssetExchange assetExchange, AccountService accountService, EscrowService escrowService, - AliasService aliasService, TimeService timeService, Generator generator) { + AliasService aliasService, TimeService timeService, Generator generator, PropertyService propertyService) { super(new APITag[] {APITag.INFO}, INCLUDE_COUNTS_PARAMETER); this.blockchain = blockchain; this.assetExchange = assetExchange; @@ -37,6 +40,7 @@ final class GetState extends APIServlet.APIRequestHandler { this.aliasService = aliasService; this.timeService = timeService; this.generator = generator; + this.propertyService = propertyService; } @Override @@ -94,6 +98,7 @@ JsonElement processRequest(HttpServletRequest req) { response.addProperty("maxMemory", Runtime.getRuntime().maxMemory()); response.addProperty("totalMemory", Runtime.getRuntime().totalMemory()); response.addProperty("freeMemory", Runtime.getRuntime().freeMemory()); + response.addProperty("indirectIncomingServiceEnabled", propertyService.getBoolean(Props.INDIRECT_INCOMING_SERVICE_ENABLE)); return response; } diff --git a/src/brs/http/common/Parameters.java b/src/brs/http/common/Parameters.java index 9a6866785..bb1c4cd7e 100644 --- a/src/brs/http/common/Parameters.java +++ b/src/brs/http/common/Parameters.java @@ -1,7 +1,6 @@ package brs.http.common; -public class Parameters { - +public final class Parameters { public static final String ALIAS_PARAMETER = "alias"; public static final String AMOUNT_NQT_PARAMETER = "amountNQT"; public static final String ALIAS_NAME_PARAMETER = "aliasName"; @@ -45,13 +44,11 @@ public class Parameters { public static final String NAME_PARAMETER = "name"; public static final String DESCRIPTION_PARAMETER = "description"; public static final String FREQUENCY_PARAMETER = "frequency"; - public static final String AT_PARAMETER = "at"; public static final String CREATION_BYTES_PARAMETER = "creationBytes"; public static final String HEX_STRING_PARAMETER = "hexString"; public static final String TRANSACTION_BYTES_PARAMETER = "transactionBytes"; public static final String TRANSACTION_JSON_PARAMETER = "transactionJSON"; - public static final String CODE_PARAMETER = "code"; public static final String DPAGES_PARAMETER = "dpages"; public static final String CSPAGES_PARAMETER = "cspages"; @@ -75,12 +72,9 @@ public class Parameters { public static final String INCLUDE_TRANSACTIONS_PARAMETER = "includeTransactions"; public static final String TYPE_PARAMETER = "type"; public static final String SUBTYPE_PARAMETER = "subtype"; - public static final String UNSIGNED_TRANSACTION_BYTES_PARAMETER = "unsignedTransactionBytes"; public static final String SIGNATURE_HASH_PARAMETER = "signatureHash"; - public static final String FULL_HASH_RESPONSE = "fullHash"; - public static final String TRANSACTION_PARAMETER = "transaction"; public static final String FULL_HASH_PARAMETER = "fullHash"; public static final String ACCOUNT_ID_PARAMETER = "accountId"; @@ -125,8 +119,8 @@ public class Parameters { public static final String RECEIVER_ID_PARAMETER = "receiverId"; public static final String FEE_SUGGESTION_TYPE_PARAMETER = "feeSuggestionType"; public static final String IMMUTABLE_PARAMETER = "immutable"; - public static final String FEE_SUGGESTION_RESPONSE = "feeSuggestion"; + public static final String INCLUDE_INDIRECT_PARAMETER = "includeIndirect"; public static boolean isFalse(String text) { return "false".equalsIgnoreCase(text); diff --git a/src/brs/peer/GetAccountRecentTransactions.java b/src/brs/peer/GetAccountRecentTransactions.java index a8f0bbf08..655908551 100644 --- a/src/brs/peer/GetAccountRecentTransactions.java +++ b/src/brs/peer/GetAccountRecentTransactions.java @@ -31,7 +31,7 @@ JsonElement processRequest(JsonObject request, Peer peer) { Account account = accountService.getAccount(accountId); JsonArray transactions = new JsonArray(); if(account != null) { - BurstIterator iterator = blockchain.getTransactions(account, 0, (byte)-1, (byte)0, 0, 0, 9); + BurstIterator iterator = blockchain.getTransactions(account, 0, (byte)-1, (byte)0, 0, 0, 9, false); while(iterator.hasNext()) { Transaction transaction = iterator.next(); transactions.add(brs.http.JSONData.transaction(transaction, blockchain.getHeight())); diff --git a/src/brs/props/Props.java b/src/brs/props/Props.java index 16bff7fe2..a989fa6d9 100644 --- a/src/brs/props/Props.java +++ b/src/brs/props/Props.java @@ -166,6 +166,8 @@ public class Props { public static final Prop JETTY_P2P_DOS_FILTER_IP_WHITELIST = new Prop<>("JETTY.P2P.DoSFilter.ipWhitelist", ""); public static final Prop JETTY_P2P_DOS_FILTER_MANAGED_ATTR = new Prop<>("JETTY.P2P.DoSFilter.managedAttr", "true"); + public static final Prop INDIRECT_INCOMING_SERVICE_ENABLE = new Prop<>("IndirectIncomingService.Enable", true); + private Props() { //no need to construct } } diff --git a/src/brs/schema/Db.java b/src/brs/schema/Db.java index 55a8ba300..3740b2e86 100644 --- a/src/brs/schema/Db.java +++ b/src/brs/schema/Db.java @@ -21,14 +21,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Db extends SchemaImpl { - private static final long serialVersionUID = -2088179033; + private static final long serialVersionUID = -471554061; /** * The reference instance of DB @@ -100,11 +100,21 @@ public class Db extends SchemaImpl { */ public final EscrowDecision ESCROW_DECISION = brs.schema.tables.EscrowDecision.ESCROW_DECISION; + /** + * The table DB.flyway_schema_history. + */ + public final FlywaySchemaHistory FLYWAY_SCHEMA_HISTORY = brs.schema.tables.FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY; + /** * The table DB.goods. */ public final Goods GOODS = brs.schema.tables.Goods.GOODS; + /** + * The table DB.indirect_incoming. + */ + public final IndirectIncoming INDIRECT_INCOMING = brs.schema.tables.IndirectIncoming.INDIRECT_INCOMING; + /** * The table DB.peer. */ @@ -150,11 +160,6 @@ public class Db extends SchemaImpl { */ public final UnconfirmedTransaction UNCONFIRMED_TRANSACTION = brs.schema.tables.UnconfirmedTransaction.UNCONFIRMED_TRANSACTION; - /** - * The table DB.version. - */ - public final Version VERSION = brs.schema.tables.Version.VERSION; - /** * No further instances allowed */ @@ -193,7 +198,9 @@ private final List> getTables0() { Block.BLOCK, Escrow.ESCROW, EscrowDecision.ESCROW_DECISION, + FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY, Goods.GOODS, + IndirectIncoming.INDIRECT_INCOMING, Peer.PEER, Purchase.PURCHASE, PurchaseFeedback.PURCHASE_FEEDBACK, @@ -202,7 +209,6 @@ private final List> getTables0() { Subscription.SUBSCRIPTION, Trade.TRADE, Transaction.TRANSACTION, - UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, - Version.VERSION); + UnconfirmedTransaction.UNCONFIRMED_TRANSACTION); } } diff --git a/src/brs/schema/DefaultCatalog.java b/src/brs/schema/DefaultCatalog.java index 342d89c6a..a249f71eb 100644 --- a/src/brs/schema/DefaultCatalog.java +++ b/src/brs/schema/DefaultCatalog.java @@ -19,14 +19,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 2030991148; + private static final long serialVersionUID = 1295203975; /** * The reference instance of diff --git a/src/brs/schema/Indexes.java b/src/brs/schema/Indexes.java index 0bff8cd2a..e6f08071d 100644 --- a/src/brs/schema/Indexes.java +++ b/src/brs/schema/Indexes.java @@ -7,7 +7,7 @@ import brs.schema.tables.*; import org.jooq.Index; import org.jooq.OrderField; -import org.jooq.impl.AbstractKeys; +import org.jooq.impl.Internal; import javax.annotation.Generated; @@ -18,7 +18,7 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @@ -31,7 +31,7 @@ public class Indexes { public static final Index ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX = Indexes0.ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX; public static final Index ACCOUNT_ACCOUNT_ID_HEIGHT_IDX = Indexes0.ACCOUNT_ACCOUNT_ID_HEIGHT_IDX; - public static final Index ACCOUNT_ACCOUNT_NAME_IDX = Indexes0.ACCOUNT_ACCOUNT_NAME_IDX; + public static final Index ACCOUNT_ACCOUNT_ID_LATEST_IDX = Indexes0.ACCOUNT_ACCOUNT_ID_LATEST_IDX; public static final Index ACCOUNT_PRIMARY = Indexes0.ACCOUNT_PRIMARY; public static final Index ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX = Indexes0.ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX; public static final Index ACCOUNT_ASSET_ACCOUNT_ASSET_QUANTITY_IDX = Indexes0.ACCOUNT_ASSET_ACCOUNT_ASSET_QUANTITY_IDX; @@ -82,10 +82,14 @@ public class Indexes { public static final Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = Indexes0.ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX; public static final Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_HEIGHT_IDX = Indexes0.ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_HEIGHT_IDX; public static final Index ESCROW_DECISION_PRIMARY = Indexes0.ESCROW_DECISION_PRIMARY; + public static final Index FLYWAY_SCHEMA_HISTORY_FLYWAY_SCHEMA_HISTORY_S_IDX = Indexes0.FLYWAY_SCHEMA_HISTORY_FLYWAY_SCHEMA_HISTORY_S_IDX; + public static final Index FLYWAY_SCHEMA_HISTORY_PRIMARY = Indexes0.FLYWAY_SCHEMA_HISTORY_PRIMARY; public static final Index GOODS_GOODS_ID_HEIGHT_IDX = Indexes0.GOODS_GOODS_ID_HEIGHT_IDX; public static final Index GOODS_GOODS_SELLER_ID_NAME_IDX = Indexes0.GOODS_GOODS_SELLER_ID_NAME_IDX; public static final Index GOODS_GOODS_TIMESTAMP_IDX = Indexes0.GOODS_GOODS_TIMESTAMP_IDX; public static final Index GOODS_PRIMARY = Indexes0.GOODS_PRIMARY; + public static final Index INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX = Indexes0.INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX; + public static final Index INDIRECT_INCOMING_PRIMARY = Indexes0.INDIRECT_INCOMING_PRIMARY; public static final Index PEER_PRIMARY = Indexes0.PEER_PRIMARY; public static final Index PURCHASE_PRIMARY = Indexes0.PURCHASE_PRIMARY; public static final Index PURCHASE_PURCHASE_BUYER_ID_HEIGHT_IDX = Indexes0.PURCHASE_PURCHASE_BUYER_ID_HEIGHT_IDX; @@ -111,14 +115,12 @@ public class Indexes { public static final Index TRADE_TRADE_SELLER_ID_IDX = Indexes0.TRADE_TRADE_SELLER_ID_IDX; public static final Index TRANSACTION_CONSTRAINT_FF = Indexes0.TRANSACTION_CONSTRAINT_FF; public static final Index TRANSACTION_PRIMARY = Indexes0.TRANSACTION_PRIMARY; - public static final Index TRANSACTION_TRANSACTION_BLOCK_ID_IDX = Indexes0.TRANSACTION_TRANSACTION_BLOCK_ID_IDX; public static final Index TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX = Indexes0.TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX; public static final Index TRANSACTION_TRANSACTION_FULL_HASH_IDX = Indexes0.TRANSACTION_TRANSACTION_FULL_HASH_IDX; public static final Index TRANSACTION_TRANSACTION_ID_IDX = Indexes0.TRANSACTION_TRANSACTION_ID_IDX; public static final Index TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX = Indexes0.TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX; public static final Index TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX = Indexes0.TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX; public static final Index TRANSACTION_TRANSACTION_SENDER_ID_IDX = Indexes0.TRANSACTION_TRANSACTION_SENDER_ID_IDX; - public static final Index TRANSACTION_TRANSACTION_TIMESTAMP_IDX = Indexes0.TRANSACTION_TRANSACTION_TIMESTAMP_IDX; public static final Index UNCONFIRMED_TRANSACTION_PRIMARY = Indexes0.UNCONFIRMED_TRANSACTION_PRIMARY; public static final Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_HEIGHT_FEE_TIMESTAMP_IDX = Indexes0.UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_HEIGHT_FEE_TIMESTAMP_IDX; public static final Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX = Indexes0.UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX; @@ -127,99 +129,101 @@ public class Indexes { // [#1459] distribute members to avoid static initialisers > 64kb // ------------------------------------------------------------------------- - private static class Indexes0 extends AbstractKeys { - public static Index ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX = createIndex("account_id_balance_height_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.ID, Account.ACCOUNT.BALANCE, Account.ACCOUNT.HEIGHT }, false); - public static Index ACCOUNT_ACCOUNT_ID_HEIGHT_IDX = createIndex("account_id_height_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.ID, Account.ACCOUNT.HEIGHT }, true); - public static Index ACCOUNT_ACCOUNT_NAME_IDX = createIndex("account_name_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.NAME, Account.ACCOUNT.LATEST }, false); - public static Index ACCOUNT_PRIMARY = createIndex("PRIMARY", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.DB_ID }, true); - public static Index ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX = createIndex("account_asset_id_height_idx", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.ACCOUNT_ID, AccountAsset.ACCOUNT_ASSET.ASSET_ID, AccountAsset.ACCOUNT_ASSET.HEIGHT }, true); - public static Index ACCOUNT_ASSET_ACCOUNT_ASSET_QUANTITY_IDX = createIndex("account_asset_quantity_idx", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.QUANTITY }, false); - public static Index ACCOUNT_ASSET_PRIMARY = createIndex("PRIMARY", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.DB_ID }, true); - public static Index ALIAS_ALIAS_ACCOUNT_ID_IDX = createIndex("alias_account_id_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ACCOUNT_ID, Alias.ALIAS.HEIGHT }, false); - public static Index ALIAS_ALIAS_ID_HEIGHT_IDX = createIndex("alias_id_height_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ID, Alias.ALIAS.HEIGHT }, true); - public static Index ALIAS_ALIAS_NAME_LOWER_IDX = createIndex("alias_name_lower_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ALIAS_NAME_LOWER }, false); - public static Index ALIAS_PRIMARY = createIndex("PRIMARY", Alias.ALIAS, new OrderField[] { Alias.ALIAS.DB_ID }, true); - public static Index ALIAS_OFFER_ALIAS_OFFER_ID_HEIGHT_IDX = createIndex("alias_offer_id_height_idx", AliasOffer.ALIAS_OFFER, new OrderField[] { AliasOffer.ALIAS_OFFER.ID, AliasOffer.ALIAS_OFFER.HEIGHT }, true); - public static Index ALIAS_OFFER_PRIMARY = createIndex("PRIMARY", AliasOffer.ALIAS_OFFER, new OrderField[] { AliasOffer.ALIAS_OFFER.DB_ID }, true); - public static Index ASK_ORDER_ASK_ORDER_ACCOUNT_ID_IDX = createIndex("ask_order_account_id_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ACCOUNT_ID, AskOrder.ASK_ORDER.HEIGHT }, false); - public static Index ASK_ORDER_ASK_ORDER_ASSET_ID_PRICE_IDX = createIndex("ask_order_asset_id_price_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ASSET_ID, AskOrder.ASK_ORDER.PRICE }, false); - public static Index ASK_ORDER_ASK_ORDER_CREATION_IDX = createIndex("ask_order_creation_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.CREATION_HEIGHT }, false); - public static Index ASK_ORDER_ASK_ORDER_ID_HEIGHT_IDX = createIndex("ask_order_id_height_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ID, AskOrder.ASK_ORDER.HEIGHT }, true); - public static Index ASK_ORDER_PRIMARY = createIndex("PRIMARY", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.DB_ID }, true); - public static Index ASSET_ASSET_ACCOUNT_ID_IDX = createIndex("asset_account_id_idx", Asset.ASSET, new OrderField[] { Asset.ASSET.ACCOUNT_ID }, false); - public static Index ASSET_ASSET_ID_IDX = createIndex("asset_id_idx", Asset.ASSET, new OrderField[] { Asset.ASSET.ID }, true); - public static Index ASSET_PRIMARY = createIndex("PRIMARY", Asset.ASSET, new OrderField[] { Asset.ASSET.DB_ID }, true); - public static Index ASSET_TRANSFER_ASSET_TRANSFER_ASSET_ID_IDX = createIndex("asset_transfer_asset_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.ASSET_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); - public static Index ASSET_TRANSFER_ASSET_TRANSFER_ID_IDX = createIndex("asset_transfer_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.ID }, true); - public static Index ASSET_TRANSFER_ASSET_TRANSFER_RECIPIENT_ID_IDX = createIndex("asset_transfer_recipient_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.RECIPIENT_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); - public static Index ASSET_TRANSFER_ASSET_TRANSFER_SENDER_ID_IDX = createIndex("asset_transfer_sender_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.SENDER_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); - public static Index ASSET_TRANSFER_PRIMARY = createIndex("PRIMARY", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.DB_ID }, true); - public static Index AT_AT_CREATOR_ID_HEIGHT_IDX = createIndex("at_creator_id_height_idx", At.AT, new OrderField[] { At.AT.CREATOR_ID, At.AT.HEIGHT }, false); - public static Index AT_AT_ID_HEIGHT_IDX = createIndex("at_id_height_idx", At.AT, new OrderField[] { At.AT.ID, At.AT.HEIGHT }, true); - public static Index AT_PRIMARY = createIndex("PRIMARY", At.AT, new OrderField[] { At.AT.DB_ID }, true); - public static Index AT_STATE_AT_STATE_AT_ID_HEIGHT_IDX = createIndex("at_state_at_id_height_idx", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.AT_ID, AtState.AT_STATE.HEIGHT }, true); - public static Index AT_STATE_AT_STATE_ID_NEXT_HEIGHT_HEIGHT_IDX = createIndex("at_state_id_next_height_height_idx", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.AT_ID, AtState.AT_STATE.NEXT_HEIGHT, AtState.AT_STATE.HEIGHT }, false); - public static Index AT_STATE_PRIMARY = createIndex("PRIMARY", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.DB_ID }, true); - public static Index BID_ORDER_BID_ORDER_ACCOUNT_ID_IDX = createIndex("bid_order_account_id_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ACCOUNT_ID, BidOrder.BID_ORDER.HEIGHT }, false); - public static Index BID_ORDER_BID_ORDER_ASSET_ID_PRICE_IDX = createIndex("bid_order_asset_id_price_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ASSET_ID, BidOrder.BID_ORDER.PRICE }, false); - public static Index BID_ORDER_BID_ORDER_CREATION_IDX = createIndex("bid_order_creation_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.CREATION_HEIGHT }, false); - public static Index BID_ORDER_BID_ORDER_ID_HEIGHT_IDX = createIndex("bid_order_id_height_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ID, BidOrder.BID_ORDER.HEIGHT }, true); - public static Index BID_ORDER_PRIMARY = createIndex("PRIMARY", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.DB_ID }, true); - public static Index BLOCK_BLOCK_GENERATOR_ID_IDX = createIndex("block_generator_id_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.GENERATOR_ID }, false); - public static Index BLOCK_BLOCK_HEIGHT_IDX = createIndex("block_height_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.HEIGHT }, true); - public static Index BLOCK_BLOCK_ID_IDX = createIndex("block_id_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.ID }, true); - public static Index BLOCK_BLOCK_TIMESTAMP_IDX = createIndex("block_timestamp_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.TIMESTAMP }, true); - public static Index BLOCK_CONSTRAINT_3C = createIndex("constraint_3c", Block.BLOCK, new OrderField[] { Block.BLOCK.PREVIOUS_BLOCK_ID }, false); - public static Index BLOCK_CONSTRAINT_3C5 = createIndex("constraint_3c5", Block.BLOCK, new OrderField[] { Block.BLOCK.NEXT_BLOCK_ID }, false); - public static Index BLOCK_PRIMARY = createIndex("PRIMARY", Block.BLOCK, new OrderField[] { Block.BLOCK.DB_ID }, true); - public static Index ESCROW_ESCROW_DEADLINE_HEIGHT_IDX = createIndex("escrow_deadline_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.DEADLINE, Escrow.ESCROW.HEIGHT }, false); - public static Index ESCROW_ESCROW_ID_HEIGHT_IDX = createIndex("escrow_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.ID, Escrow.ESCROW.HEIGHT }, true); - public static Index ESCROW_ESCROW_RECIPIENT_ID_HEIGHT_IDX = createIndex("escrow_recipient_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.RECIPIENT_ID, Escrow.ESCROW.HEIGHT }, false); - public static Index ESCROW_ESCROW_SENDER_ID_HEIGHT_IDX = createIndex("escrow_sender_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.SENDER_ID, Escrow.ESCROW.HEIGHT }, false); - public static Index ESCROW_PRIMARY = createIndex("PRIMARY", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.DB_ID }, true); - public static Index ESCROW_DECISION_ESCROW_DECISION_ACCOUNT_ID_HEIGHT_IDX = createIndex("escrow_decision_account_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, false); - public static Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = createIndex("escrow_decision_escrow_id_account_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, true); - public static Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_HEIGHT_IDX = createIndex("escrow_decision_escrow_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, false); - public static Index ESCROW_DECISION_PRIMARY = createIndex("PRIMARY", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.DB_ID }, true); - public static Index GOODS_GOODS_ID_HEIGHT_IDX = createIndex("goods_id_height_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.ID, Goods.GOODS.HEIGHT }, true); - public static Index GOODS_GOODS_SELLER_ID_NAME_IDX = createIndex("goods_seller_id_name_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.SELLER_ID, Goods.GOODS.NAME }, false); - public static Index GOODS_GOODS_TIMESTAMP_IDX = createIndex("goods_timestamp_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.TIMESTAMP, Goods.GOODS.HEIGHT }, false); - public static Index GOODS_PRIMARY = createIndex("PRIMARY", Goods.GOODS, new OrderField[] { Goods.GOODS.DB_ID }, true); - public static Index PEER_PRIMARY = createIndex("PRIMARY", Peer.PEER, new OrderField[] { Peer.PEER.ADDRESS }, true); - public static Index PURCHASE_PRIMARY = createIndex("PRIMARY", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.DB_ID }, true); - public static Index PURCHASE_PURCHASE_BUYER_ID_HEIGHT_IDX = createIndex("purchase_buyer_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.BUYER_ID, Purchase.PURCHASE.HEIGHT }, false); - public static Index PURCHASE_PURCHASE_DEADLINE_IDX = createIndex("purchase_deadline_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.DEADLINE, Purchase.PURCHASE.HEIGHT }, false); - public static Index PURCHASE_PURCHASE_ID_HEIGHT_IDX = createIndex("purchase_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.ID, Purchase.PURCHASE.HEIGHT }, true); - public static Index PURCHASE_PURCHASE_SELLER_ID_HEIGHT_IDX = createIndex("purchase_seller_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.SELLER_ID, Purchase.PURCHASE.HEIGHT }, false); - public static Index PURCHASE_PURCHASE_TIMESTAMP_IDX = createIndex("purchase_timestamp_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.TIMESTAMP, Purchase.PURCHASE.ID }, false); - public static Index PURCHASE_FEEDBACK_PRIMARY = createIndex("PRIMARY", PurchaseFeedback.PURCHASE_FEEDBACK, new OrderField[] { PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID }, true); - public static Index PURCHASE_FEEDBACK_PURCHASE_FEEDBACK_ID_HEIGHT_IDX = createIndex("purchase_feedback_id_height_idx", PurchaseFeedback.PURCHASE_FEEDBACK, new OrderField[] { PurchaseFeedback.PURCHASE_FEEDBACK.ID, PurchaseFeedback.PURCHASE_FEEDBACK.HEIGHT }, false); - public static Index PURCHASE_PUBLIC_FEEDBACK_PRIMARY = createIndex("PRIMARY", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, new OrderField[] { PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID }, true); - public static Index PURCHASE_PUBLIC_FEEDBACK_PURCHASE_PUBLIC_FEEDBACK_ID_HEIGHT_IDX = createIndex("purchase_public_feedback_id_height_idx", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, new OrderField[] { PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.ID, PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.HEIGHT }, false); - public static Index REWARD_RECIP_ASSIGN_PRIMARY = createIndex("PRIMARY", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID }, true); - public static Index REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_ACCOUNT_ID_HEIGHT_IDX = createIndex("reward_recip_assign_account_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.ACCOUNT_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT }, true); - public static Index REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_RECIP_ID_HEIGHT_IDX = createIndex("reward_recip_assign_recip_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.RECIP_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT }, false); - public static Index SUBSCRIPTION_PRIMARY = createIndex("PRIMARY", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.DB_ID }, true); - public static Index SUBSCRIPTION_SUBSCRIPTION_ID_HEIGHT_IDX = createIndex("subscription_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.ID, Subscription.SUBSCRIPTION.HEIGHT }, true); - public static Index SUBSCRIPTION_SUBSCRIPTION_RECIPIENT_ID_HEIGHT_IDX = createIndex("subscription_recipient_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.RECIPIENT_ID, Subscription.SUBSCRIPTION.HEIGHT }, false); - public static Index SUBSCRIPTION_SUBSCRIPTION_SENDER_ID_HEIGHT_IDX = createIndex("subscription_sender_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.SENDER_ID, Subscription.SUBSCRIPTION.HEIGHT }, false); - public static Index TRADE_PRIMARY = createIndex("PRIMARY", Trade.TRADE, new OrderField[] { Trade.TRADE.DB_ID }, true); - public static Index TRADE_TRADE_ASK_BID_IDX = createIndex("trade_ask_bid_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.ASK_ORDER_ID, Trade.TRADE.BID_ORDER_ID }, true); - public static Index TRADE_TRADE_ASSET_ID_IDX = createIndex("trade_asset_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.ASSET_ID, Trade.TRADE.HEIGHT }, false); - public static Index TRADE_TRADE_BUYER_ID_IDX = createIndex("trade_buyer_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.BUYER_ID, Trade.TRADE.HEIGHT }, false); - public static Index TRADE_TRADE_SELLER_ID_IDX = createIndex("trade_seller_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.SELLER_ID, Trade.TRADE.HEIGHT }, false); - public static Index TRANSACTION_CONSTRAINT_FF = createIndex("constraint_ff", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.BLOCK_ID }, false); - public static Index TRANSACTION_PRIMARY = createIndex("PRIMARY", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.DB_ID }, true); - public static Index TRANSACTION_TRANSACTION_BLOCK_ID_IDX = createIndex("transaction_block_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.BLOCK_ID }, false); - public static Index TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX = createIndex("transaction_block_timestamp_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.BLOCK_TIMESTAMP }, false); - public static Index TRANSACTION_TRANSACTION_FULL_HASH_IDX = createIndex("transaction_full_hash_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.FULL_HASH }, true); - public static Index TRANSACTION_TRANSACTION_ID_IDX = createIndex("transaction_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.ID }, true); - public static Index TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX = createIndex("transaction_recipient_id_amount_height_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.RECIPIENT_ID, Transaction.TRANSACTION.AMOUNT, Transaction.TRANSACTION.HEIGHT }, false); - public static Index TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX = createIndex("transaction_recipient_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.RECIPIENT_ID }, false); - public static Index TRANSACTION_TRANSACTION_SENDER_ID_IDX = createIndex("transaction_sender_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.SENDER_ID }, false); - public static Index TRANSACTION_TRANSACTION_TIMESTAMP_IDX = createIndex("transaction_timestamp_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.TIMESTAMP }, false); - public static Index UNCONFIRMED_TRANSACTION_PRIMARY = createIndex("PRIMARY", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID }, true); - public static Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_HEIGHT_FEE_TIMESTAMP_IDX = createIndex("unconfirmed_transaction_height_fee_timestamp_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.TRANSACTION_HEIGHT, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.FEE_PER_BYTE, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.TIMESTAMP }, false); - public static Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX = createIndex("unconfirmed_transaction_id_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.ID }, true); + private static class Indexes0 { + public static Index ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX = Internal.createIndex("account_id_balance_height_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.ID, Account.ACCOUNT.BALANCE, Account.ACCOUNT.HEIGHT }, false); + public static Index ACCOUNT_ACCOUNT_ID_HEIGHT_IDX = Internal.createIndex("account_id_height_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.ID, Account.ACCOUNT.HEIGHT }, true); + public static Index ACCOUNT_ACCOUNT_ID_LATEST_IDX = Internal.createIndex("account_id_latest_idx", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.ID, Account.ACCOUNT.LATEST }, false); + public static Index ACCOUNT_PRIMARY = Internal.createIndex("PRIMARY", Account.ACCOUNT, new OrderField[] { Account.ACCOUNT.DB_ID }, true); + public static Index ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX = Internal.createIndex("account_asset_id_height_idx", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.ACCOUNT_ID, AccountAsset.ACCOUNT_ASSET.ASSET_ID, AccountAsset.ACCOUNT_ASSET.HEIGHT }, true); + public static Index ACCOUNT_ASSET_ACCOUNT_ASSET_QUANTITY_IDX = Internal.createIndex("account_asset_quantity_idx", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.QUANTITY }, false); + public static Index ACCOUNT_ASSET_PRIMARY = Internal.createIndex("PRIMARY", AccountAsset.ACCOUNT_ASSET, new OrderField[] { AccountAsset.ACCOUNT_ASSET.DB_ID }, true); + public static Index ALIAS_ALIAS_ACCOUNT_ID_IDX = Internal.createIndex("alias_account_id_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ACCOUNT_ID, Alias.ALIAS.HEIGHT }, false); + public static Index ALIAS_ALIAS_ID_HEIGHT_IDX = Internal.createIndex("alias_id_height_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ID, Alias.ALIAS.HEIGHT }, true); + public static Index ALIAS_ALIAS_NAME_LOWER_IDX = Internal.createIndex("alias_name_lower_idx", Alias.ALIAS, new OrderField[] { Alias.ALIAS.ALIAS_NAME_LOWER }, false); + public static Index ALIAS_PRIMARY = Internal.createIndex("PRIMARY", Alias.ALIAS, new OrderField[] { Alias.ALIAS.DB_ID }, true); + public static Index ALIAS_OFFER_ALIAS_OFFER_ID_HEIGHT_IDX = Internal.createIndex("alias_offer_id_height_idx", AliasOffer.ALIAS_OFFER, new OrderField[] { AliasOffer.ALIAS_OFFER.ID, AliasOffer.ALIAS_OFFER.HEIGHT }, true); + public static Index ALIAS_OFFER_PRIMARY = Internal.createIndex("PRIMARY", AliasOffer.ALIAS_OFFER, new OrderField[] { AliasOffer.ALIAS_OFFER.DB_ID }, true); + public static Index ASK_ORDER_ASK_ORDER_ACCOUNT_ID_IDX = Internal.createIndex("ask_order_account_id_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ACCOUNT_ID, AskOrder.ASK_ORDER.HEIGHT }, false); + public static Index ASK_ORDER_ASK_ORDER_ASSET_ID_PRICE_IDX = Internal.createIndex("ask_order_asset_id_price_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ASSET_ID, AskOrder.ASK_ORDER.PRICE }, false); + public static Index ASK_ORDER_ASK_ORDER_CREATION_IDX = Internal.createIndex("ask_order_creation_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.CREATION_HEIGHT }, false); + public static Index ASK_ORDER_ASK_ORDER_ID_HEIGHT_IDX = Internal.createIndex("ask_order_id_height_idx", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.ID, AskOrder.ASK_ORDER.HEIGHT }, true); + public static Index ASK_ORDER_PRIMARY = Internal.createIndex("PRIMARY", AskOrder.ASK_ORDER, new OrderField[] { AskOrder.ASK_ORDER.DB_ID }, true); + public static Index ASSET_ASSET_ACCOUNT_ID_IDX = Internal.createIndex("asset_account_id_idx", Asset.ASSET, new OrderField[] { Asset.ASSET.ACCOUNT_ID }, false); + public static Index ASSET_ASSET_ID_IDX = Internal.createIndex("asset_id_idx", Asset.ASSET, new OrderField[] { Asset.ASSET.ID }, true); + public static Index ASSET_PRIMARY = Internal.createIndex("PRIMARY", Asset.ASSET, new OrderField[] { Asset.ASSET.DB_ID }, true); + public static Index ASSET_TRANSFER_ASSET_TRANSFER_ASSET_ID_IDX = Internal.createIndex("asset_transfer_asset_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.ASSET_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); + public static Index ASSET_TRANSFER_ASSET_TRANSFER_ID_IDX = Internal.createIndex("asset_transfer_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.ID }, true); + public static Index ASSET_TRANSFER_ASSET_TRANSFER_RECIPIENT_ID_IDX = Internal.createIndex("asset_transfer_recipient_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.RECIPIENT_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); + public static Index ASSET_TRANSFER_ASSET_TRANSFER_SENDER_ID_IDX = Internal.createIndex("asset_transfer_sender_id_idx", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.SENDER_ID, AssetTransfer.ASSET_TRANSFER.HEIGHT }, false); + public static Index ASSET_TRANSFER_PRIMARY = Internal.createIndex("PRIMARY", AssetTransfer.ASSET_TRANSFER, new OrderField[] { AssetTransfer.ASSET_TRANSFER.DB_ID }, true); + public static Index AT_AT_CREATOR_ID_HEIGHT_IDX = Internal.createIndex("at_creator_id_height_idx", At.AT, new OrderField[] { At.AT.CREATOR_ID, At.AT.HEIGHT }, false); + public static Index AT_AT_ID_HEIGHT_IDX = Internal.createIndex("at_id_height_idx", At.AT, new OrderField[] { At.AT.ID, At.AT.HEIGHT }, true); + public static Index AT_PRIMARY = Internal.createIndex("PRIMARY", At.AT, new OrderField[] { At.AT.DB_ID }, true); + public static Index AT_STATE_AT_STATE_AT_ID_HEIGHT_IDX = Internal.createIndex("at_state_at_id_height_idx", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.AT_ID, AtState.AT_STATE.HEIGHT }, true); + public static Index AT_STATE_AT_STATE_ID_NEXT_HEIGHT_HEIGHT_IDX = Internal.createIndex("at_state_id_next_height_height_idx", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.AT_ID, AtState.AT_STATE.NEXT_HEIGHT, AtState.AT_STATE.HEIGHT }, false); + public static Index AT_STATE_PRIMARY = Internal.createIndex("PRIMARY", AtState.AT_STATE, new OrderField[] { AtState.AT_STATE.DB_ID }, true); + public static Index BID_ORDER_BID_ORDER_ACCOUNT_ID_IDX = Internal.createIndex("bid_order_account_id_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ACCOUNT_ID, BidOrder.BID_ORDER.HEIGHT }, false); + public static Index BID_ORDER_BID_ORDER_ASSET_ID_PRICE_IDX = Internal.createIndex("bid_order_asset_id_price_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ASSET_ID, BidOrder.BID_ORDER.PRICE }, false); + public static Index BID_ORDER_BID_ORDER_CREATION_IDX = Internal.createIndex("bid_order_creation_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.CREATION_HEIGHT }, false); + public static Index BID_ORDER_BID_ORDER_ID_HEIGHT_IDX = Internal.createIndex("bid_order_id_height_idx", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.ID, BidOrder.BID_ORDER.HEIGHT }, true); + public static Index BID_ORDER_PRIMARY = Internal.createIndex("PRIMARY", BidOrder.BID_ORDER, new OrderField[] { BidOrder.BID_ORDER.DB_ID }, true); + public static Index BLOCK_BLOCK_GENERATOR_ID_IDX = Internal.createIndex("block_generator_id_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.GENERATOR_ID }, false); + public static Index BLOCK_BLOCK_HEIGHT_IDX = Internal.createIndex("block_height_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.HEIGHT }, true); + public static Index BLOCK_BLOCK_ID_IDX = Internal.createIndex("block_id_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.ID }, true); + public static Index BLOCK_BLOCK_TIMESTAMP_IDX = Internal.createIndex("block_timestamp_idx", Block.BLOCK, new OrderField[] { Block.BLOCK.TIMESTAMP }, true); + public static Index BLOCK_CONSTRAINT_3C = Internal.createIndex("constraint_3c", Block.BLOCK, new OrderField[] { Block.BLOCK.PREVIOUS_BLOCK_ID }, false); + public static Index BLOCK_CONSTRAINT_3C5 = Internal.createIndex("constraint_3c5", Block.BLOCK, new OrderField[] { Block.BLOCK.NEXT_BLOCK_ID }, false); + public static Index BLOCK_PRIMARY = Internal.createIndex("PRIMARY", Block.BLOCK, new OrderField[] { Block.BLOCK.DB_ID }, true); + public static Index ESCROW_ESCROW_DEADLINE_HEIGHT_IDX = Internal.createIndex("escrow_deadline_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.DEADLINE, Escrow.ESCROW.HEIGHT }, false); + public static Index ESCROW_ESCROW_ID_HEIGHT_IDX = Internal.createIndex("escrow_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.ID, Escrow.ESCROW.HEIGHT }, true); + public static Index ESCROW_ESCROW_RECIPIENT_ID_HEIGHT_IDX = Internal.createIndex("escrow_recipient_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.RECIPIENT_ID, Escrow.ESCROW.HEIGHT }, false); + public static Index ESCROW_ESCROW_SENDER_ID_HEIGHT_IDX = Internal.createIndex("escrow_sender_id_height_idx", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.SENDER_ID, Escrow.ESCROW.HEIGHT }, false); + public static Index ESCROW_PRIMARY = Internal.createIndex("PRIMARY", Escrow.ESCROW, new OrderField[] { Escrow.ESCROW.DB_ID }, true); + public static Index ESCROW_DECISION_ESCROW_DECISION_ACCOUNT_ID_HEIGHT_IDX = Internal.createIndex("escrow_decision_account_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, false); + public static Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = Internal.createIndex("escrow_decision_escrow_id_account_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, true); + public static Index ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_HEIGHT_IDX = Internal.createIndex("escrow_decision_escrow_id_height_idx", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.HEIGHT }, false); + public static Index ESCROW_DECISION_PRIMARY = Internal.createIndex("PRIMARY", EscrowDecision.ESCROW_DECISION, new OrderField[] { EscrowDecision.ESCROW_DECISION.DB_ID }, true); + public static Index FLYWAY_SCHEMA_HISTORY_FLYWAY_SCHEMA_HISTORY_S_IDX = Internal.createIndex("flyway_schema_history_s_idx", FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY, new OrderField[] { FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.SUCCESS }, false); + public static Index FLYWAY_SCHEMA_HISTORY_PRIMARY = Internal.createIndex("PRIMARY", FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY, new OrderField[] { FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.INSTALLED_RANK }, true); + public static Index GOODS_GOODS_ID_HEIGHT_IDX = Internal.createIndex("goods_id_height_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.ID, Goods.GOODS.HEIGHT }, true); + public static Index GOODS_GOODS_SELLER_ID_NAME_IDX = Internal.createIndex("goods_seller_id_name_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.SELLER_ID, Goods.GOODS.NAME }, false); + public static Index GOODS_GOODS_TIMESTAMP_IDX = Internal.createIndex("goods_timestamp_idx", Goods.GOODS, new OrderField[] { Goods.GOODS.TIMESTAMP, Goods.GOODS.HEIGHT }, false); + public static Index GOODS_PRIMARY = Internal.createIndex("PRIMARY", Goods.GOODS, new OrderField[] { Goods.GOODS.DB_ID }, true); + public static Index INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX = Internal.createIndex("indirect_incoming_db_id_uindex", IndirectIncoming.INDIRECT_INCOMING, new OrderField[] { IndirectIncoming.INDIRECT_INCOMING.ACCOUNT_ID, IndirectIncoming.INDIRECT_INCOMING.TRANSACTION_ID }, true); + public static Index INDIRECT_INCOMING_PRIMARY = Internal.createIndex("PRIMARY", IndirectIncoming.INDIRECT_INCOMING, new OrderField[] { IndirectIncoming.INDIRECT_INCOMING.DB_ID }, true); + public static Index PEER_PRIMARY = Internal.createIndex("PRIMARY", Peer.PEER, new OrderField[] { Peer.PEER.ADDRESS }, true); + public static Index PURCHASE_PRIMARY = Internal.createIndex("PRIMARY", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.DB_ID }, true); + public static Index PURCHASE_PURCHASE_BUYER_ID_HEIGHT_IDX = Internal.createIndex("purchase_buyer_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.BUYER_ID, Purchase.PURCHASE.HEIGHT }, false); + public static Index PURCHASE_PURCHASE_DEADLINE_IDX = Internal.createIndex("purchase_deadline_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.DEADLINE, Purchase.PURCHASE.HEIGHT }, false); + public static Index PURCHASE_PURCHASE_ID_HEIGHT_IDX = Internal.createIndex("purchase_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.ID, Purchase.PURCHASE.HEIGHT }, true); + public static Index PURCHASE_PURCHASE_SELLER_ID_HEIGHT_IDX = Internal.createIndex("purchase_seller_id_height_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.SELLER_ID, Purchase.PURCHASE.HEIGHT }, false); + public static Index PURCHASE_PURCHASE_TIMESTAMP_IDX = Internal.createIndex("purchase_timestamp_idx", Purchase.PURCHASE, new OrderField[] { Purchase.PURCHASE.TIMESTAMP, Purchase.PURCHASE.ID }, false); + public static Index PURCHASE_FEEDBACK_PRIMARY = Internal.createIndex("PRIMARY", PurchaseFeedback.PURCHASE_FEEDBACK, new OrderField[] { PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID }, true); + public static Index PURCHASE_FEEDBACK_PURCHASE_FEEDBACK_ID_HEIGHT_IDX = Internal.createIndex("purchase_feedback_id_height_idx", PurchaseFeedback.PURCHASE_FEEDBACK, new OrderField[] { PurchaseFeedback.PURCHASE_FEEDBACK.ID, PurchaseFeedback.PURCHASE_FEEDBACK.HEIGHT }, false); + public static Index PURCHASE_PUBLIC_FEEDBACK_PRIMARY = Internal.createIndex("PRIMARY", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, new OrderField[] { PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID }, true); + public static Index PURCHASE_PUBLIC_FEEDBACK_PURCHASE_PUBLIC_FEEDBACK_ID_HEIGHT_IDX = Internal.createIndex("purchase_public_feedback_id_height_idx", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, new OrderField[] { PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.ID, PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.HEIGHT }, false); + public static Index REWARD_RECIP_ASSIGN_PRIMARY = Internal.createIndex("PRIMARY", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID }, true); + public static Index REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_ACCOUNT_ID_HEIGHT_IDX = Internal.createIndex("reward_recip_assign_account_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.ACCOUNT_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT }, true); + public static Index REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_RECIP_ID_HEIGHT_IDX = Internal.createIndex("reward_recip_assign_recip_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN, new OrderField[] { RewardRecipAssign.REWARD_RECIP_ASSIGN.RECIP_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT }, false); + public static Index SUBSCRIPTION_PRIMARY = Internal.createIndex("PRIMARY", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.DB_ID }, true); + public static Index SUBSCRIPTION_SUBSCRIPTION_ID_HEIGHT_IDX = Internal.createIndex("subscription_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.ID, Subscription.SUBSCRIPTION.HEIGHT }, true); + public static Index SUBSCRIPTION_SUBSCRIPTION_RECIPIENT_ID_HEIGHT_IDX = Internal.createIndex("subscription_recipient_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.RECIPIENT_ID, Subscription.SUBSCRIPTION.HEIGHT }, false); + public static Index SUBSCRIPTION_SUBSCRIPTION_SENDER_ID_HEIGHT_IDX = Internal.createIndex("subscription_sender_id_height_idx", Subscription.SUBSCRIPTION, new OrderField[] { Subscription.SUBSCRIPTION.SENDER_ID, Subscription.SUBSCRIPTION.HEIGHT }, false); + public static Index TRADE_PRIMARY = Internal.createIndex("PRIMARY", Trade.TRADE, new OrderField[] { Trade.TRADE.DB_ID }, true); + public static Index TRADE_TRADE_ASK_BID_IDX = Internal.createIndex("trade_ask_bid_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.ASK_ORDER_ID, Trade.TRADE.BID_ORDER_ID }, true); + public static Index TRADE_TRADE_ASSET_ID_IDX = Internal.createIndex("trade_asset_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.ASSET_ID, Trade.TRADE.HEIGHT }, false); + public static Index TRADE_TRADE_BUYER_ID_IDX = Internal.createIndex("trade_buyer_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.BUYER_ID, Trade.TRADE.HEIGHT }, false); + public static Index TRADE_TRADE_SELLER_ID_IDX = Internal.createIndex("trade_seller_id_idx", Trade.TRADE, new OrderField[] { Trade.TRADE.SELLER_ID, Trade.TRADE.HEIGHT }, false); + public static Index TRANSACTION_CONSTRAINT_FF = Internal.createIndex("constraint_ff", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.BLOCK_ID }, false); + public static Index TRANSACTION_PRIMARY = Internal.createIndex("PRIMARY", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.DB_ID }, true); + public static Index TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX = Internal.createIndex("transaction_block_timestamp_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.BLOCK_TIMESTAMP }, false); + public static Index TRANSACTION_TRANSACTION_FULL_HASH_IDX = Internal.createIndex("transaction_full_hash_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.FULL_HASH }, true); + public static Index TRANSACTION_TRANSACTION_ID_IDX = Internal.createIndex("transaction_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.ID }, true); + public static Index TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX = Internal.createIndex("transaction_recipient_id_amount_height_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.RECIPIENT_ID, Transaction.TRANSACTION.AMOUNT, Transaction.TRANSACTION.HEIGHT }, false); + public static Index TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX = Internal.createIndex("transaction_recipient_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.RECIPIENT_ID }, false); + public static Index TRANSACTION_TRANSACTION_SENDER_ID_IDX = Internal.createIndex("transaction_sender_id_idx", Transaction.TRANSACTION, new OrderField[] { Transaction.TRANSACTION.SENDER_ID }, false); + public static Index UNCONFIRMED_TRANSACTION_PRIMARY = Internal.createIndex("PRIMARY", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID }, true); + public static Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_HEIGHT_FEE_TIMESTAMP_IDX = Internal.createIndex("unconfirmed_transaction_height_fee_timestamp_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.TRANSACTION_HEIGHT, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.FEE_PER_BYTE, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.TIMESTAMP }, false); + public static Index UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX = Internal.createIndex("unconfirmed_transaction_id_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, new OrderField[] { UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.ID }, true); } } diff --git a/src/brs/schema/Keys.java b/src/brs/schema/Keys.java index 13e28ca44..04b5c12c0 100644 --- a/src/brs/schema/Keys.java +++ b/src/brs/schema/Keys.java @@ -9,7 +9,7 @@ import org.jooq.ForeignKey; import org.jooq.Identity; import org.jooq.UniqueKey; -import org.jooq.impl.AbstractKeys; +import org.jooq.impl.Internal; import javax.annotation.Generated; @@ -21,7 +21,7 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @@ -46,6 +46,7 @@ public class Keys { public static final Identity IDENTITY_ESCROW = Identities0.IDENTITY_ESCROW; public static final Identity IDENTITY_ESCROW_DECISION = Identities0.IDENTITY_ESCROW_DECISION; public static final Identity IDENTITY_GOODS = Identities0.IDENTITY_GOODS; + public static final Identity IDENTITY_INDIRECT_INCOMING = Identities0.IDENTITY_INDIRECT_INCOMING; public static final Identity IDENTITY_PURCHASE = Identities0.IDENTITY_PURCHASE; public static final Identity IDENTITY_PURCHASE_FEEDBACK = Identities0.IDENTITY_PURCHASE_FEEDBACK; public static final Identity IDENTITY_PURCHASE_PUBLIC_FEEDBACK = Identities0.IDENTITY_PURCHASE_PUBLIC_FEEDBACK; @@ -87,8 +88,11 @@ public class Keys { public static final UniqueKey KEY_ESCROW_ESCROW_ID_HEIGHT_IDX = UniqueKeys0.KEY_ESCROW_ESCROW_ID_HEIGHT_IDX; public static final UniqueKey KEY_ESCROW_DECISION_PRIMARY = UniqueKeys0.KEY_ESCROW_DECISION_PRIMARY; public static final UniqueKey KEY_ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = UniqueKeys0.KEY_ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX; + public static final UniqueKey KEY_FLYWAY_SCHEMA_HISTORY_PRIMARY = UniqueKeys0.KEY_FLYWAY_SCHEMA_HISTORY_PRIMARY; public static final UniqueKey KEY_GOODS_PRIMARY = UniqueKeys0.KEY_GOODS_PRIMARY; public static final UniqueKey KEY_GOODS_GOODS_ID_HEIGHT_IDX = UniqueKeys0.KEY_GOODS_GOODS_ID_HEIGHT_IDX; + public static final UniqueKey KEY_INDIRECT_INCOMING_PRIMARY = UniqueKeys0.KEY_INDIRECT_INCOMING_PRIMARY; + public static final UniqueKey KEY_INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX = UniqueKeys0.KEY_INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX; public static final UniqueKey KEY_PEER_PRIMARY = UniqueKeys0.KEY_PEER_PRIMARY; public static final UniqueKey KEY_PURCHASE_PRIMARY = UniqueKeys0.KEY_PURCHASE_PRIMARY; public static final UniqueKey KEY_PURCHASE_PURCHASE_ID_HEIGHT_IDX = UniqueKeys0.KEY_PURCHASE_PURCHASE_ID_HEIGHT_IDX; @@ -118,83 +122,87 @@ public class Keys { // [#1459] distribute members to avoid static initialisers > 64kb // ------------------------------------------------------------------------- - private static class Identities0 extends AbstractKeys { - public static Identity IDENTITY_ACCOUNT = createIdentity(Account.ACCOUNT, Account.ACCOUNT.DB_ID); - public static Identity IDENTITY_ACCOUNT_ASSET = createIdentity(AccountAsset.ACCOUNT_ASSET, AccountAsset.ACCOUNT_ASSET.DB_ID); - public static Identity IDENTITY_ALIAS = createIdentity(Alias.ALIAS, Alias.ALIAS.DB_ID); - public static Identity IDENTITY_ALIAS_OFFER = createIdentity(AliasOffer.ALIAS_OFFER, AliasOffer.ALIAS_OFFER.DB_ID); - public static Identity IDENTITY_ASK_ORDER = createIdentity(AskOrder.ASK_ORDER, AskOrder.ASK_ORDER.DB_ID); - public static Identity IDENTITY_ASSET = createIdentity(Asset.ASSET, Asset.ASSET.DB_ID); - public static Identity IDENTITY_ASSET_TRANSFER = createIdentity(AssetTransfer.ASSET_TRANSFER, AssetTransfer.ASSET_TRANSFER.DB_ID); - public static Identity IDENTITY_AT = createIdentity(At.AT, At.AT.DB_ID); - public static Identity IDENTITY_AT_STATE = createIdentity(AtState.AT_STATE, AtState.AT_STATE.DB_ID); - public static Identity IDENTITY_BID_ORDER = createIdentity(BidOrder.BID_ORDER, BidOrder.BID_ORDER.DB_ID); - public static Identity IDENTITY_BLOCK = createIdentity(Block.BLOCK, Block.BLOCK.DB_ID); - public static Identity IDENTITY_ESCROW = createIdentity(Escrow.ESCROW, Escrow.ESCROW.DB_ID); - public static Identity IDENTITY_ESCROW_DECISION = createIdentity(EscrowDecision.ESCROW_DECISION, EscrowDecision.ESCROW_DECISION.DB_ID); - public static Identity IDENTITY_GOODS = createIdentity(Goods.GOODS, Goods.GOODS.DB_ID); - public static Identity IDENTITY_PURCHASE = createIdentity(Purchase.PURCHASE, Purchase.PURCHASE.DB_ID); - public static Identity IDENTITY_PURCHASE_FEEDBACK = createIdentity(PurchaseFeedback.PURCHASE_FEEDBACK, PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID); - public static Identity IDENTITY_PURCHASE_PUBLIC_FEEDBACK = createIdentity(PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID); - public static Identity IDENTITY_REWARD_RECIP_ASSIGN = createIdentity(RewardRecipAssign.REWARD_RECIP_ASSIGN, RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID); - public static Identity IDENTITY_SUBSCRIPTION = createIdentity(Subscription.SUBSCRIPTION, Subscription.SUBSCRIPTION.DB_ID); - public static Identity IDENTITY_TRADE = createIdentity(Trade.TRADE, Trade.TRADE.DB_ID); - public static Identity IDENTITY_TRANSACTION = createIdentity(Transaction.TRANSACTION, Transaction.TRANSACTION.DB_ID); - public static Identity IDENTITY_UNCONFIRMED_TRANSACTION = createIdentity(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID); + private static class Identities0 { + public static Identity IDENTITY_ACCOUNT = Internal.createIdentity(Account.ACCOUNT, Account.ACCOUNT.DB_ID); + public static Identity IDENTITY_ACCOUNT_ASSET = Internal.createIdentity(AccountAsset.ACCOUNT_ASSET, AccountAsset.ACCOUNT_ASSET.DB_ID); + public static Identity IDENTITY_ALIAS = Internal.createIdentity(Alias.ALIAS, Alias.ALIAS.DB_ID); + public static Identity IDENTITY_ALIAS_OFFER = Internal.createIdentity(AliasOffer.ALIAS_OFFER, AliasOffer.ALIAS_OFFER.DB_ID); + public static Identity IDENTITY_ASK_ORDER = Internal.createIdentity(AskOrder.ASK_ORDER, AskOrder.ASK_ORDER.DB_ID); + public static Identity IDENTITY_ASSET = Internal.createIdentity(Asset.ASSET, Asset.ASSET.DB_ID); + public static Identity IDENTITY_ASSET_TRANSFER = Internal.createIdentity(AssetTransfer.ASSET_TRANSFER, AssetTransfer.ASSET_TRANSFER.DB_ID); + public static Identity IDENTITY_AT = Internal.createIdentity(At.AT, At.AT.DB_ID); + public static Identity IDENTITY_AT_STATE = Internal.createIdentity(AtState.AT_STATE, AtState.AT_STATE.DB_ID); + public static Identity IDENTITY_BID_ORDER = Internal.createIdentity(BidOrder.BID_ORDER, BidOrder.BID_ORDER.DB_ID); + public static Identity IDENTITY_BLOCK = Internal.createIdentity(Block.BLOCK, Block.BLOCK.DB_ID); + public static Identity IDENTITY_ESCROW = Internal.createIdentity(Escrow.ESCROW, Escrow.ESCROW.DB_ID); + public static Identity IDENTITY_ESCROW_DECISION = Internal.createIdentity(EscrowDecision.ESCROW_DECISION, EscrowDecision.ESCROW_DECISION.DB_ID); + public static Identity IDENTITY_GOODS = Internal.createIdentity(Goods.GOODS, Goods.GOODS.DB_ID); + public static Identity IDENTITY_INDIRECT_INCOMING = Internal.createIdentity(IndirectIncoming.INDIRECT_INCOMING, IndirectIncoming.INDIRECT_INCOMING.DB_ID); + public static Identity IDENTITY_PURCHASE = Internal.createIdentity(Purchase.PURCHASE, Purchase.PURCHASE.DB_ID); + public static Identity IDENTITY_PURCHASE_FEEDBACK = Internal.createIdentity(PurchaseFeedback.PURCHASE_FEEDBACK, PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID); + public static Identity IDENTITY_PURCHASE_PUBLIC_FEEDBACK = Internal.createIdentity(PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID); + public static Identity IDENTITY_REWARD_RECIP_ASSIGN = Internal.createIdentity(RewardRecipAssign.REWARD_RECIP_ASSIGN, RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID); + public static Identity IDENTITY_SUBSCRIPTION = Internal.createIdentity(Subscription.SUBSCRIPTION, Subscription.SUBSCRIPTION.DB_ID); + public static Identity IDENTITY_TRADE = Internal.createIdentity(Trade.TRADE, Trade.TRADE.DB_ID); + public static Identity IDENTITY_TRANSACTION = Internal.createIdentity(Transaction.TRANSACTION, Transaction.TRANSACTION.DB_ID); + public static Identity IDENTITY_UNCONFIRMED_TRANSACTION = Internal.createIdentity(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID); } - private static class UniqueKeys0 extends AbstractKeys { - public static final UniqueKey KEY_ACCOUNT_PRIMARY = createUniqueKey(Account.ACCOUNT, "KEY_account_PRIMARY", Account.ACCOUNT.DB_ID); - public static final UniqueKey KEY_ACCOUNT_ACCOUNT_ID_HEIGHT_IDX = createUniqueKey(Account.ACCOUNT, "KEY_account_account_id_height_idx", Account.ACCOUNT.ID, Account.ACCOUNT.HEIGHT); - public static final UniqueKey KEY_ACCOUNT_ASSET_PRIMARY = createUniqueKey(AccountAsset.ACCOUNT_ASSET, "KEY_account_asset_PRIMARY", AccountAsset.ACCOUNT_ASSET.DB_ID); - public static final UniqueKey KEY_ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX = createUniqueKey(AccountAsset.ACCOUNT_ASSET, "KEY_account_asset_account_asset_id_height_idx", AccountAsset.ACCOUNT_ASSET.ACCOUNT_ID, AccountAsset.ACCOUNT_ASSET.ASSET_ID, AccountAsset.ACCOUNT_ASSET.HEIGHT); - public static final UniqueKey KEY_ALIAS_PRIMARY = createUniqueKey(Alias.ALIAS, "KEY_alias_PRIMARY", Alias.ALIAS.DB_ID); - public static final UniqueKey KEY_ALIAS_ALIAS_ID_HEIGHT_IDX = createUniqueKey(Alias.ALIAS, "KEY_alias_alias_id_height_idx", Alias.ALIAS.ID, Alias.ALIAS.HEIGHT); - public static final UniqueKey KEY_ALIAS_OFFER_PRIMARY = createUniqueKey(AliasOffer.ALIAS_OFFER, "KEY_alias_offer_PRIMARY", AliasOffer.ALIAS_OFFER.DB_ID); - public static final UniqueKey KEY_ALIAS_OFFER_ALIAS_OFFER_ID_HEIGHT_IDX = createUniqueKey(AliasOffer.ALIAS_OFFER, "KEY_alias_offer_alias_offer_id_height_idx", AliasOffer.ALIAS_OFFER.ID, AliasOffer.ALIAS_OFFER.HEIGHT); - public static final UniqueKey KEY_ASK_ORDER_PRIMARY = createUniqueKey(AskOrder.ASK_ORDER, "KEY_ask_order_PRIMARY", AskOrder.ASK_ORDER.DB_ID); - public static final UniqueKey KEY_ASK_ORDER_ASK_ORDER_ID_HEIGHT_IDX = createUniqueKey(AskOrder.ASK_ORDER, "KEY_ask_order_ask_order_id_height_idx", AskOrder.ASK_ORDER.ID, AskOrder.ASK_ORDER.HEIGHT); - public static final UniqueKey KEY_ASSET_PRIMARY = createUniqueKey(Asset.ASSET, "KEY_asset_PRIMARY", Asset.ASSET.DB_ID); - public static final UniqueKey KEY_ASSET_ASSET_ID_IDX = createUniqueKey(Asset.ASSET, "KEY_asset_asset_id_idx", Asset.ASSET.ID); - public static final UniqueKey KEY_ASSET_TRANSFER_PRIMARY = createUniqueKey(AssetTransfer.ASSET_TRANSFER, "KEY_asset_transfer_PRIMARY", AssetTransfer.ASSET_TRANSFER.DB_ID); - public static final UniqueKey KEY_ASSET_TRANSFER_ASSET_TRANSFER_ID_IDX = createUniqueKey(AssetTransfer.ASSET_TRANSFER, "KEY_asset_transfer_asset_transfer_id_idx", AssetTransfer.ASSET_TRANSFER.ID); - public static final UniqueKey KEY_AT_PRIMARY = createUniqueKey(At.AT, "KEY_at_PRIMARY", At.AT.DB_ID); - public static final UniqueKey KEY_AT_AT_ID_HEIGHT_IDX = createUniqueKey(At.AT, "KEY_at_at_id_height_idx", At.AT.ID, At.AT.HEIGHT); - public static final UniqueKey KEY_AT_STATE_PRIMARY = createUniqueKey(AtState.AT_STATE, "KEY_at_state_PRIMARY", AtState.AT_STATE.DB_ID); - public static final UniqueKey KEY_AT_STATE_AT_STATE_AT_ID_HEIGHT_IDX = createUniqueKey(AtState.AT_STATE, "KEY_at_state_at_state_at_id_height_idx", AtState.AT_STATE.AT_ID, AtState.AT_STATE.HEIGHT); - public static final UniqueKey KEY_BID_ORDER_PRIMARY = createUniqueKey(BidOrder.BID_ORDER, "KEY_bid_order_PRIMARY", BidOrder.BID_ORDER.DB_ID); - public static final UniqueKey KEY_BID_ORDER_BID_ORDER_ID_HEIGHT_IDX = createUniqueKey(BidOrder.BID_ORDER, "KEY_bid_order_bid_order_id_height_idx", BidOrder.BID_ORDER.ID, BidOrder.BID_ORDER.HEIGHT); - public static final UniqueKey KEY_BLOCK_PRIMARY = createUniqueKey(Block.BLOCK, "KEY_block_PRIMARY", Block.BLOCK.DB_ID); - public static final UniqueKey KEY_BLOCK_BLOCK_ID_IDX = createUniqueKey(Block.BLOCK, "KEY_block_block_id_idx", Block.BLOCK.ID); - public static final UniqueKey KEY_BLOCK_BLOCK_TIMESTAMP_IDX = createUniqueKey(Block.BLOCK, "KEY_block_block_timestamp_idx", Block.BLOCK.TIMESTAMP); - public static final UniqueKey KEY_BLOCK_BLOCK_HEIGHT_IDX = createUniqueKey(Block.BLOCK, "KEY_block_block_height_idx", Block.BLOCK.HEIGHT); - public static final UniqueKey KEY_ESCROW_PRIMARY = createUniqueKey(Escrow.ESCROW, "KEY_escrow_PRIMARY", Escrow.ESCROW.DB_ID); - public static final UniqueKey KEY_ESCROW_ESCROW_ID_HEIGHT_IDX = createUniqueKey(Escrow.ESCROW, "KEY_escrow_escrow_id_height_idx", Escrow.ESCROW.ID, Escrow.ESCROW.HEIGHT); - public static final UniqueKey KEY_ESCROW_DECISION_PRIMARY = createUniqueKey(EscrowDecision.ESCROW_DECISION, "KEY_escrow_decision_PRIMARY", EscrowDecision.ESCROW_DECISION.DB_ID); - public static final UniqueKey KEY_ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = createUniqueKey(EscrowDecision.ESCROW_DECISION, "KEY_escrow_decision_escrow_decision_escrow_id_account_id_height_idx", EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT); - public static final UniqueKey KEY_GOODS_PRIMARY = createUniqueKey(Goods.GOODS, "KEY_goods_PRIMARY", Goods.GOODS.DB_ID); - public static final UniqueKey KEY_GOODS_GOODS_ID_HEIGHT_IDX = createUniqueKey(Goods.GOODS, "KEY_goods_goods_id_height_idx", Goods.GOODS.ID, Goods.GOODS.HEIGHT); - public static final UniqueKey KEY_PEER_PRIMARY = createUniqueKey(Peer.PEER, "KEY_peer_PRIMARY", Peer.PEER.ADDRESS); - public static final UniqueKey KEY_PURCHASE_PRIMARY = createUniqueKey(Purchase.PURCHASE, "KEY_purchase_PRIMARY", Purchase.PURCHASE.DB_ID); - public static final UniqueKey KEY_PURCHASE_PURCHASE_ID_HEIGHT_IDX = createUniqueKey(Purchase.PURCHASE, "KEY_purchase_purchase_id_height_idx", Purchase.PURCHASE.ID, Purchase.PURCHASE.HEIGHT); - public static final UniqueKey KEY_PURCHASE_FEEDBACK_PRIMARY = createUniqueKey(PurchaseFeedback.PURCHASE_FEEDBACK, "KEY_purchase_feedback_PRIMARY", PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID); - public static final UniqueKey KEY_PURCHASE_PUBLIC_FEEDBACK_PRIMARY = createUniqueKey(PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, "KEY_purchase_public_feedback_PRIMARY", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID); - public static final UniqueKey KEY_REWARD_RECIP_ASSIGN_PRIMARY = createUniqueKey(RewardRecipAssign.REWARD_RECIP_ASSIGN, "KEY_reward_recip_assign_PRIMARY", RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID); - public static final UniqueKey KEY_REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_ACCOUNT_ID_HEIGHT_IDX = createUniqueKey(RewardRecipAssign.REWARD_RECIP_ASSIGN, "KEY_reward_recip_assign_reward_recip_assign_account_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN.ACCOUNT_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT); - public static final UniqueKey KEY_SUBSCRIPTION_PRIMARY = createUniqueKey(Subscription.SUBSCRIPTION, "KEY_subscription_PRIMARY", Subscription.SUBSCRIPTION.DB_ID); - public static final UniqueKey KEY_SUBSCRIPTION_SUBSCRIPTION_ID_HEIGHT_IDX = createUniqueKey(Subscription.SUBSCRIPTION, "KEY_subscription_subscription_id_height_idx", Subscription.SUBSCRIPTION.ID, Subscription.SUBSCRIPTION.HEIGHT); - public static final UniqueKey KEY_TRADE_PRIMARY = createUniqueKey(Trade.TRADE, "KEY_trade_PRIMARY", Trade.TRADE.DB_ID); - public static final UniqueKey KEY_TRADE_TRADE_ASK_BID_IDX = createUniqueKey(Trade.TRADE, "KEY_trade_trade_ask_bid_idx", Trade.TRADE.ASK_ORDER_ID, Trade.TRADE.BID_ORDER_ID); - public static final UniqueKey KEY_TRANSACTION_PRIMARY = createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_PRIMARY", Transaction.TRANSACTION.DB_ID); - public static final UniqueKey KEY_TRANSACTION_TRANSACTION_ID_IDX = createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_transaction_id_idx", Transaction.TRANSACTION.ID); - public static final UniqueKey KEY_TRANSACTION_TRANSACTION_FULL_HASH_IDX = createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_transaction_full_hash_idx", Transaction.TRANSACTION.FULL_HASH); - public static final UniqueKey KEY_UNCONFIRMED_TRANSACTION_PRIMARY = createUniqueKey(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, "KEY_unconfirmed_transaction_PRIMARY", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID); - public static final UniqueKey KEY_UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX = createUniqueKey(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, "KEY_unconfirmed_transaction_unconfirmed_transaction_id_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.ID); + private static class UniqueKeys0 { + public static final UniqueKey KEY_ACCOUNT_PRIMARY = Internal.createUniqueKey(Account.ACCOUNT, "KEY_account_PRIMARY", Account.ACCOUNT.DB_ID); + public static final UniqueKey KEY_ACCOUNT_ACCOUNT_ID_HEIGHT_IDX = Internal.createUniqueKey(Account.ACCOUNT, "KEY_account_account_id_height_idx", Account.ACCOUNT.ID, Account.ACCOUNT.HEIGHT); + public static final UniqueKey KEY_ACCOUNT_ASSET_PRIMARY = Internal.createUniqueKey(AccountAsset.ACCOUNT_ASSET, "KEY_account_asset_PRIMARY", AccountAsset.ACCOUNT_ASSET.DB_ID); + public static final UniqueKey KEY_ACCOUNT_ASSET_ACCOUNT_ASSET_ID_HEIGHT_IDX = Internal.createUniqueKey(AccountAsset.ACCOUNT_ASSET, "KEY_account_asset_account_asset_id_height_idx", AccountAsset.ACCOUNT_ASSET.ACCOUNT_ID, AccountAsset.ACCOUNT_ASSET.ASSET_ID, AccountAsset.ACCOUNT_ASSET.HEIGHT); + public static final UniqueKey KEY_ALIAS_PRIMARY = Internal.createUniqueKey(Alias.ALIAS, "KEY_alias_PRIMARY", Alias.ALIAS.DB_ID); + public static final UniqueKey KEY_ALIAS_ALIAS_ID_HEIGHT_IDX = Internal.createUniqueKey(Alias.ALIAS, "KEY_alias_alias_id_height_idx", Alias.ALIAS.ID, Alias.ALIAS.HEIGHT); + public static final UniqueKey KEY_ALIAS_OFFER_PRIMARY = Internal.createUniqueKey(AliasOffer.ALIAS_OFFER, "KEY_alias_offer_PRIMARY", AliasOffer.ALIAS_OFFER.DB_ID); + public static final UniqueKey KEY_ALIAS_OFFER_ALIAS_OFFER_ID_HEIGHT_IDX = Internal.createUniqueKey(AliasOffer.ALIAS_OFFER, "KEY_alias_offer_alias_offer_id_height_idx", AliasOffer.ALIAS_OFFER.ID, AliasOffer.ALIAS_OFFER.HEIGHT); + public static final UniqueKey KEY_ASK_ORDER_PRIMARY = Internal.createUniqueKey(AskOrder.ASK_ORDER, "KEY_ask_order_PRIMARY", AskOrder.ASK_ORDER.DB_ID); + public static final UniqueKey KEY_ASK_ORDER_ASK_ORDER_ID_HEIGHT_IDX = Internal.createUniqueKey(AskOrder.ASK_ORDER, "KEY_ask_order_ask_order_id_height_idx", AskOrder.ASK_ORDER.ID, AskOrder.ASK_ORDER.HEIGHT); + public static final UniqueKey KEY_ASSET_PRIMARY = Internal.createUniqueKey(Asset.ASSET, "KEY_asset_PRIMARY", Asset.ASSET.DB_ID); + public static final UniqueKey KEY_ASSET_ASSET_ID_IDX = Internal.createUniqueKey(Asset.ASSET, "KEY_asset_asset_id_idx", Asset.ASSET.ID); + public static final UniqueKey KEY_ASSET_TRANSFER_PRIMARY = Internal.createUniqueKey(AssetTransfer.ASSET_TRANSFER, "KEY_asset_transfer_PRIMARY", AssetTransfer.ASSET_TRANSFER.DB_ID); + public static final UniqueKey KEY_ASSET_TRANSFER_ASSET_TRANSFER_ID_IDX = Internal.createUniqueKey(AssetTransfer.ASSET_TRANSFER, "KEY_asset_transfer_asset_transfer_id_idx", AssetTransfer.ASSET_TRANSFER.ID); + public static final UniqueKey KEY_AT_PRIMARY = Internal.createUniqueKey(At.AT, "KEY_at_PRIMARY", At.AT.DB_ID); + public static final UniqueKey KEY_AT_AT_ID_HEIGHT_IDX = Internal.createUniqueKey(At.AT, "KEY_at_at_id_height_idx", At.AT.ID, At.AT.HEIGHT); + public static final UniqueKey KEY_AT_STATE_PRIMARY = Internal.createUniqueKey(AtState.AT_STATE, "KEY_at_state_PRIMARY", AtState.AT_STATE.DB_ID); + public static final UniqueKey KEY_AT_STATE_AT_STATE_AT_ID_HEIGHT_IDX = Internal.createUniqueKey(AtState.AT_STATE, "KEY_at_state_at_state_at_id_height_idx", AtState.AT_STATE.AT_ID, AtState.AT_STATE.HEIGHT); + public static final UniqueKey KEY_BID_ORDER_PRIMARY = Internal.createUniqueKey(BidOrder.BID_ORDER, "KEY_bid_order_PRIMARY", BidOrder.BID_ORDER.DB_ID); + public static final UniqueKey KEY_BID_ORDER_BID_ORDER_ID_HEIGHT_IDX = Internal.createUniqueKey(BidOrder.BID_ORDER, "KEY_bid_order_bid_order_id_height_idx", BidOrder.BID_ORDER.ID, BidOrder.BID_ORDER.HEIGHT); + public static final UniqueKey KEY_BLOCK_PRIMARY = Internal.createUniqueKey(Block.BLOCK, "KEY_block_PRIMARY", Block.BLOCK.DB_ID); + public static final UniqueKey KEY_BLOCK_BLOCK_ID_IDX = Internal.createUniqueKey(Block.BLOCK, "KEY_block_block_id_idx", Block.BLOCK.ID); + public static final UniqueKey KEY_BLOCK_BLOCK_TIMESTAMP_IDX = Internal.createUniqueKey(Block.BLOCK, "KEY_block_block_timestamp_idx", Block.BLOCK.TIMESTAMP); + public static final UniqueKey KEY_BLOCK_BLOCK_HEIGHT_IDX = Internal.createUniqueKey(Block.BLOCK, "KEY_block_block_height_idx", Block.BLOCK.HEIGHT); + public static final UniqueKey KEY_ESCROW_PRIMARY = Internal.createUniqueKey(Escrow.ESCROW, "KEY_escrow_PRIMARY", Escrow.ESCROW.DB_ID); + public static final UniqueKey KEY_ESCROW_ESCROW_ID_HEIGHT_IDX = Internal.createUniqueKey(Escrow.ESCROW, "KEY_escrow_escrow_id_height_idx", Escrow.ESCROW.ID, Escrow.ESCROW.HEIGHT); + public static final UniqueKey KEY_ESCROW_DECISION_PRIMARY = Internal.createUniqueKey(EscrowDecision.ESCROW_DECISION, "KEY_escrow_decision_PRIMARY", EscrowDecision.ESCROW_DECISION.DB_ID); + public static final UniqueKey KEY_ESCROW_DECISION_ESCROW_DECISION_ESCROW_ID_ACCOUNT_ID_HEIGHT_IDX = Internal.createUniqueKey(EscrowDecision.ESCROW_DECISION, "KEY_escrow_decision_escrow_decision_escrow_id_account_id_height_idx", EscrowDecision.ESCROW_DECISION.ESCROW_ID, EscrowDecision.ESCROW_DECISION.ACCOUNT_ID, EscrowDecision.ESCROW_DECISION.HEIGHT); + public static final UniqueKey KEY_FLYWAY_SCHEMA_HISTORY_PRIMARY = Internal.createUniqueKey(FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY, "KEY_flyway_schema_history_PRIMARY", FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.INSTALLED_RANK); + public static final UniqueKey KEY_GOODS_PRIMARY = Internal.createUniqueKey(Goods.GOODS, "KEY_goods_PRIMARY", Goods.GOODS.DB_ID); + public static final UniqueKey KEY_GOODS_GOODS_ID_HEIGHT_IDX = Internal.createUniqueKey(Goods.GOODS, "KEY_goods_goods_id_height_idx", Goods.GOODS.ID, Goods.GOODS.HEIGHT); + public static final UniqueKey KEY_INDIRECT_INCOMING_PRIMARY = Internal.createUniqueKey(IndirectIncoming.INDIRECT_INCOMING, "KEY_indirect_incoming_PRIMARY", IndirectIncoming.INDIRECT_INCOMING.DB_ID); + public static final UniqueKey KEY_INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX = Internal.createUniqueKey(IndirectIncoming.INDIRECT_INCOMING, "KEY_indirect_incoming_indirect_incoming_db_id_uindex", IndirectIncoming.INDIRECT_INCOMING.ACCOUNT_ID, IndirectIncoming.INDIRECT_INCOMING.TRANSACTION_ID); + public static final UniqueKey KEY_PEER_PRIMARY = Internal.createUniqueKey(Peer.PEER, "KEY_peer_PRIMARY", Peer.PEER.ADDRESS); + public static final UniqueKey KEY_PURCHASE_PRIMARY = Internal.createUniqueKey(Purchase.PURCHASE, "KEY_purchase_PRIMARY", Purchase.PURCHASE.DB_ID); + public static final UniqueKey KEY_PURCHASE_PURCHASE_ID_HEIGHT_IDX = Internal.createUniqueKey(Purchase.PURCHASE, "KEY_purchase_purchase_id_height_idx", Purchase.PURCHASE.ID, Purchase.PURCHASE.HEIGHT); + public static final UniqueKey KEY_PURCHASE_FEEDBACK_PRIMARY = Internal.createUniqueKey(PurchaseFeedback.PURCHASE_FEEDBACK, "KEY_purchase_feedback_PRIMARY", PurchaseFeedback.PURCHASE_FEEDBACK.DB_ID); + public static final UniqueKey KEY_PURCHASE_PUBLIC_FEEDBACK_PRIMARY = Internal.createUniqueKey(PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK, "KEY_purchase_public_feedback_PRIMARY", PurchasePublicFeedback.PURCHASE_PUBLIC_FEEDBACK.DB_ID); + public static final UniqueKey KEY_REWARD_RECIP_ASSIGN_PRIMARY = Internal.createUniqueKey(RewardRecipAssign.REWARD_RECIP_ASSIGN, "KEY_reward_recip_assign_PRIMARY", RewardRecipAssign.REWARD_RECIP_ASSIGN.DB_ID); + public static final UniqueKey KEY_REWARD_RECIP_ASSIGN_REWARD_RECIP_ASSIGN_ACCOUNT_ID_HEIGHT_IDX = Internal.createUniqueKey(RewardRecipAssign.REWARD_RECIP_ASSIGN, "KEY_reward_recip_assign_reward_recip_assign_account_id_height_idx", RewardRecipAssign.REWARD_RECIP_ASSIGN.ACCOUNT_ID, RewardRecipAssign.REWARD_RECIP_ASSIGN.HEIGHT); + public static final UniqueKey KEY_SUBSCRIPTION_PRIMARY = Internal.createUniqueKey(Subscription.SUBSCRIPTION, "KEY_subscription_PRIMARY", Subscription.SUBSCRIPTION.DB_ID); + public static final UniqueKey KEY_SUBSCRIPTION_SUBSCRIPTION_ID_HEIGHT_IDX = Internal.createUniqueKey(Subscription.SUBSCRIPTION, "KEY_subscription_subscription_id_height_idx", Subscription.SUBSCRIPTION.ID, Subscription.SUBSCRIPTION.HEIGHT); + public static final UniqueKey KEY_TRADE_PRIMARY = Internal.createUniqueKey(Trade.TRADE, "KEY_trade_PRIMARY", Trade.TRADE.DB_ID); + public static final UniqueKey KEY_TRADE_TRADE_ASK_BID_IDX = Internal.createUniqueKey(Trade.TRADE, "KEY_trade_trade_ask_bid_idx", Trade.TRADE.ASK_ORDER_ID, Trade.TRADE.BID_ORDER_ID); + public static final UniqueKey KEY_TRANSACTION_PRIMARY = Internal.createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_PRIMARY", Transaction.TRANSACTION.DB_ID); + public static final UniqueKey KEY_TRANSACTION_TRANSACTION_ID_IDX = Internal.createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_transaction_id_idx", Transaction.TRANSACTION.ID); + public static final UniqueKey KEY_TRANSACTION_TRANSACTION_FULL_HASH_IDX = Internal.createUniqueKey(Transaction.TRANSACTION, "KEY_transaction_transaction_full_hash_idx", Transaction.TRANSACTION.FULL_HASH); + public static final UniqueKey KEY_UNCONFIRMED_TRANSACTION_PRIMARY = Internal.createUniqueKey(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, "KEY_unconfirmed_transaction_PRIMARY", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.DB_ID); + public static final UniqueKey KEY_UNCONFIRMED_TRANSACTION_UNCONFIRMED_TRANSACTION_ID_IDX = Internal.createUniqueKey(UnconfirmedTransaction.UNCONFIRMED_TRANSACTION, "KEY_unconfirmed_transaction_unconfirmed_transaction_id_idx", UnconfirmedTransaction.UNCONFIRMED_TRANSACTION.ID); } - private static class ForeignKeys0 extends AbstractKeys { - public static final ForeignKey CONSTRAINT_3C = createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Block.BLOCK, "constraint_3c", Block.BLOCK.PREVIOUS_BLOCK_ID); - public static final ForeignKey CONSTRAINT_3C5 = createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Block.BLOCK, "constraint_3c5", Block.BLOCK.NEXT_BLOCK_ID); - public static final ForeignKey CONSTRAINT_FF = createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Transaction.TRANSACTION, "constraint_ff", Transaction.TRANSACTION.BLOCK_ID); + private static class ForeignKeys0 { + public static final ForeignKey CONSTRAINT_3C = Internal.createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Block.BLOCK, "constraint_3c", Block.BLOCK.PREVIOUS_BLOCK_ID); + public static final ForeignKey CONSTRAINT_3C5 = Internal.createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Block.BLOCK, "constraint_3c5", Block.BLOCK.NEXT_BLOCK_ID); + public static final ForeignKey CONSTRAINT_FF = Internal.createForeignKey(brs.schema.Keys.KEY_BLOCK_BLOCK_ID_IDX, Transaction.TRANSACTION, "constraint_ff", Transaction.TRANSACTION.BLOCK_ID); } } diff --git a/src/brs/schema/Tables.java b/src/brs/schema/Tables.java index 49668bf4f..e1f7ad31e 100644 --- a/src/brs/schema/Tables.java +++ b/src/brs/schema/Tables.java @@ -15,7 +15,7 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @@ -87,11 +87,21 @@ public class Tables { */ public static final EscrowDecision ESCROW_DECISION = brs.schema.tables.EscrowDecision.ESCROW_DECISION; + /** + * The table DB.flyway_schema_history. + */ + public static final FlywaySchemaHistory FLYWAY_SCHEMA_HISTORY = brs.schema.tables.FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY; + /** * The table DB.goods. */ public static final Goods GOODS = brs.schema.tables.Goods.GOODS; + /** + * The table DB.indirect_incoming. + */ + public static final IndirectIncoming INDIRECT_INCOMING = brs.schema.tables.IndirectIncoming.INDIRECT_INCOMING; + /** * The table DB.peer. */ @@ -136,9 +146,4 @@ public class Tables { * The table DB.unconfirmed_transaction. */ public static final UnconfirmedTransaction UNCONFIRMED_TRANSACTION = brs.schema.tables.UnconfirmedTransaction.UNCONFIRMED_TRANSACTION; - - /** - * The table DB.version. - */ - public static final Version VERSION = brs.schema.tables.Version.VERSION; } diff --git a/src/brs/schema/tables/Account.java b/src/brs/schema/tables/Account.java index 0d20c94e2..e78e7b0e7 100644 --- a/src/brs/schema/tables/Account.java +++ b/src/brs/schema/tables/Account.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Account extends TableImpl { - private static final long serialVersionUID = 2042071978; + private static final long serialVersionUID = 1869420880; /** * The reference instance of DB.account @@ -63,12 +63,12 @@ public Class getRecordType() { /** * The column DB.account.public_key. */ - public final TableField PUBLIC_KEY = createField("public_key", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField PUBLIC_KEY = createField("public_key", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.account.key_height. */ - public final TableField KEY_HEIGHT = createField("key_height", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField KEY_HEIGHT = createField("key_height", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.INTEGER)), this, ""); /** * The column DB.account.balance. @@ -88,12 +88,12 @@ public Class getRecordType() { /** * The column DB.account.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR(100), this, ""); + public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR(100).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARCHAR)), this, ""); /** * The column DB.account.description. */ - public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.CLOB)), this, ""); /** * The column DB.account.height. @@ -147,7 +147,7 @@ public Schema getSchema() { */ @Override public List getIndexes() { - return Arrays.asList(Indexes.ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX, Indexes.ACCOUNT_ACCOUNT_ID_HEIGHT_IDX, Indexes.ACCOUNT_ACCOUNT_NAME_IDX, Indexes.ACCOUNT_PRIMARY); + return Arrays.asList(Indexes.ACCOUNT_ACCOUNT_ID_BALANCE_HEIGHT_IDX, Indexes.ACCOUNT_ACCOUNT_ID_HEIGHT_IDX, Indexes.ACCOUNT_ACCOUNT_ID_LATEST_IDX, Indexes.ACCOUNT_PRIMARY); } /** diff --git a/src/brs/schema/tables/AccountAsset.java b/src/brs/schema/tables/AccountAsset.java index a270d8945..e440cf5cd 100644 --- a/src/brs/schema/tables/AccountAsset.java +++ b/src/brs/schema/tables/AccountAsset.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AccountAsset extends TableImpl { - private static final long serialVersionUID = -1289663187; + private static final long serialVersionUID = -676161848; /** * The reference instance of DB.account_asset diff --git a/src/brs/schema/tables/Alias.java b/src/brs/schema/tables/Alias.java index 9b619c61e..57af748d7 100644 --- a/src/brs/schema/tables/Alias.java +++ b/src/brs/schema/tables/Alias.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Alias extends TableImpl { - private static final long serialVersionUID = 1395883121; + private static final long serialVersionUID = -1414222348; /** * The reference instance of DB.alias @@ -68,7 +68,7 @@ public Class getRecordType() { /** * The column DB.alias.alias_name_lower. */ - public final TableField ALIAS_NAME_LOWER = createField("alias_name_lower", org.jooq.impl.SQLDataType.VARCHAR(100).nullable(false).defaultValue(org.jooq.impl.DSL.field("", org.jooq.impl.SQLDataType.VARCHAR)), this, ""); + public final TableField ALIAS_NAME_LOWER = createField("alias_name_lower", org.jooq.impl.SQLDataType.VARCHAR(100).nullable(false), this, ""); /** * The column DB.alias.alias_uri. diff --git a/src/brs/schema/tables/AliasOffer.java b/src/brs/schema/tables/AliasOffer.java index 66dd53d5b..88dda96e9 100644 --- a/src/brs/schema/tables/AliasOffer.java +++ b/src/brs/schema/tables/AliasOffer.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AliasOffer extends TableImpl { - private static final long serialVersionUID = 1808550683; + private static final long serialVersionUID = 1175239737; /** * The reference instance of DB.alias_offer @@ -63,7 +63,7 @@ public Class getRecordType() { /** * The column DB.alias_offer.buyer_id. */ - public final TableField BUYER_ID = createField("buyer_id", org.jooq.impl.SQLDataType.BIGINT, this, ""); + public final TableField BUYER_ID = createField("buyer_id", org.jooq.impl.SQLDataType.BIGINT.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINT)), this, ""); /** * The column DB.alias_offer.height. diff --git a/src/brs/schema/tables/AskOrder.java b/src/brs/schema/tables/AskOrder.java index 4932c1cf1..9c6b48f73 100644 --- a/src/brs/schema/tables/AskOrder.java +++ b/src/brs/schema/tables/AskOrder.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AskOrder extends TableImpl { - private static final long serialVersionUID = 253139364; + private static final long serialVersionUID = 1831484863; /** * The reference instance of DB.ask_order diff --git a/src/brs/schema/tables/Asset.java b/src/brs/schema/tables/Asset.java index 4d5cc6384..1e1116f5b 100644 --- a/src/brs/schema/tables/Asset.java +++ b/src/brs/schema/tables/Asset.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Asset extends TableImpl { - private static final long serialVersionUID = 208937342; + private static final long serialVersionUID = -827757933; /** * The reference instance of DB.asset @@ -68,7 +68,7 @@ public Class getRecordType() { /** * The column DB.asset.description. */ - public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.CLOB)), this, ""); /** * The column DB.asset.quantity. diff --git a/src/brs/schema/tables/AssetTransfer.java b/src/brs/schema/tables/AssetTransfer.java index 08d3587d6..8496a5080 100644 --- a/src/brs/schema/tables/AssetTransfer.java +++ b/src/brs/schema/tables/AssetTransfer.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AssetTransfer extends TableImpl { - private static final long serialVersionUID = -115950732; + private static final long serialVersionUID = 2008838201; /** * The reference instance of DB.asset_transfer diff --git a/src/brs/schema/tables/At.java b/src/brs/schema/tables/At.java index 80ead4577..20318ea59 100644 --- a/src/brs/schema/tables/At.java +++ b/src/brs/schema/tables/At.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class At extends TableImpl { - private static final long serialVersionUID = 885877192; + private static final long serialVersionUID = -863824574; /** * The reference instance of DB.at @@ -63,12 +63,12 @@ public Class getRecordType() { /** * The column DB.at.name. */ - public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR(30), this, ""); + public final TableField NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR(30).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARCHAR)), this, ""); /** * The column DB.at.description. */ - public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.CLOB)), this, ""); /** * The column DB.at.version. diff --git a/src/brs/schema/tables/AtState.java b/src/brs/schema/tables/AtState.java index e15334f1b..93fa6b3cf 100644 --- a/src/brs/schema/tables/AtState.java +++ b/src/brs/schema/tables/AtState.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AtState extends TableImpl { - private static final long serialVersionUID = 1616494602; + private static final long serialVersionUID = 1854416933; /** * The reference instance of DB.at_state diff --git a/src/brs/schema/tables/BidOrder.java b/src/brs/schema/tables/BidOrder.java index 268a17aa7..3b4d3fced 100644 --- a/src/brs/schema/tables/BidOrder.java +++ b/src/brs/schema/tables/BidOrder.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BidOrder extends TableImpl { - private static final long serialVersionUID = -376319964; + private static final long serialVersionUID = 1202025535; /** * The reference instance of DB.bid_order diff --git a/src/brs/schema/tables/Block.java b/src/brs/schema/tables/Block.java index 469617e6f..3cdfee8f2 100644 --- a/src/brs/schema/tables/Block.java +++ b/src/brs/schema/tables/Block.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Block extends TableImpl { - private static final long serialVersionUID = -688279780; + private static final long serialVersionUID = 1642355288; /** * The reference instance of DB.block @@ -68,7 +68,7 @@ public Class getRecordType() { /** * The column DB.block.previous_block_id. */ - public final TableField PREVIOUS_BLOCK_ID = createField("previous_block_id", org.jooq.impl.SQLDataType.BIGINT, this, ""); + public final TableField PREVIOUS_BLOCK_ID = createField("previous_block_id", org.jooq.impl.SQLDataType.BIGINT.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINT)), this, ""); /** * The column DB.block.total_amount. @@ -93,7 +93,7 @@ public Class getRecordType() { /** * The column DB.block.previous_block_hash. */ - public final TableField PREVIOUS_BLOCK_HASH = createField("previous_block_hash", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField PREVIOUS_BLOCK_HASH = createField("previous_block_hash", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.block.cumulative_difficulty. @@ -108,7 +108,7 @@ public Class getRecordType() { /** * The column DB.block.next_block_id. */ - public final TableField NEXT_BLOCK_ID = createField("next_block_id", org.jooq.impl.SQLDataType.BIGINT, this, ""); + public final TableField NEXT_BLOCK_ID = createField("next_block_id", org.jooq.impl.SQLDataType.BIGINT.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINT)), this, ""); /** * The column DB.block.height. @@ -143,7 +143,7 @@ public Class getRecordType() { /** * The column DB.block.ats. */ - public final TableField ATS = createField("ats", org.jooq.impl.SQLDataType.BLOB, this, ""); + public final TableField ATS = createField("ats", org.jooq.impl.SQLDataType.BLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BLOB)), this, ""); /** * Create a DB.block table reference diff --git a/src/brs/schema/tables/Escrow.java b/src/brs/schema/tables/Escrow.java index 3c9eff529..c89c6ad95 100644 --- a/src/brs/schema/tables/Escrow.java +++ b/src/brs/schema/tables/Escrow.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Escrow extends TableImpl { - private static final long serialVersionUID = -567114920; + private static final long serialVersionUID = -1712849931; /** * The reference instance of DB.escrow @@ -73,7 +73,7 @@ public Class getRecordType() { /** * The column DB.escrow.required_signers. */ - public final TableField REQUIRED_SIGNERS = createField("required_signers", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField REQUIRED_SIGNERS = createField("required_signers", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.INTEGER)), this, ""); /** * The column DB.escrow.deadline. diff --git a/src/brs/schema/tables/EscrowDecision.java b/src/brs/schema/tables/EscrowDecision.java index 4e047c4d9..0041983b3 100644 --- a/src/brs/schema/tables/EscrowDecision.java +++ b/src/brs/schema/tables/EscrowDecision.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class EscrowDecision extends TableImpl { - private static final long serialVersionUID = 1880648732; + private static final long serialVersionUID = 306160033; /** * The reference instance of DB.escrow_decision diff --git a/src/brs/schema/tables/FlywaySchemaHistory.java b/src/brs/schema/tables/FlywaySchemaHistory.java new file mode 100644 index 000000000..7a605dedb --- /dev/null +++ b/src/brs/schema/tables/FlywaySchemaHistory.java @@ -0,0 +1,191 @@ +/* + * This file is generated by jOOQ. +*/ +package brs.schema.tables; + + +import brs.schema.Db; +import brs.schema.Indexes; +import brs.schema.Keys; +import brs.schema.tables.records.FlywaySchemaHistoryRecord; +import org.jooq.*; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + +import javax.annotation.Generated; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.List; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.10.5" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class FlywaySchemaHistory extends TableImpl { + + private static final long serialVersionUID = 2054164609; + + /** + * The reference instance of DB.flyway_schema_history + */ + public static final FlywaySchemaHistory FLYWAY_SCHEMA_HISTORY = new FlywaySchemaHistory(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return FlywaySchemaHistoryRecord.class; + } + + /** + * The column DB.flyway_schema_history.installed_rank. + */ + public final TableField INSTALLED_RANK = createField("installed_rank", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.version. + */ + public final TableField VERSION = createField("version", org.jooq.impl.SQLDataType.VARCHAR(50).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARCHAR)), this, ""); + + /** + * The column DB.flyway_schema_history.description. + */ + public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.VARCHAR(200).nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.type. + */ + public final TableField TYPE = createField("type", org.jooq.impl.SQLDataType.VARCHAR(20).nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.script. + */ + public final TableField SCRIPT = createField("script", org.jooq.impl.SQLDataType.VARCHAR(1000).nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.checksum. + */ + public final TableField CHECKSUM = createField("checksum", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.INTEGER)), this, ""); + + /** + * The column DB.flyway_schema_history.installed_by. + */ + public final TableField INSTALLED_BY = createField("installed_by", org.jooq.impl.SQLDataType.VARCHAR(100).nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.installed_on. + */ + public final TableField INSTALLED_ON = createField("installed_on", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("current_timestamp()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); + + /** + * The column DB.flyway_schema_history.execution_time. + */ + public final TableField EXECUTION_TIME = createField("execution_time", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column DB.flyway_schema_history.success. + */ + public final TableField SUCCESS = createField("success", org.jooq.impl.SQLDataType.TINYINT.nullable(false), this, ""); + + /** + * Create a DB.flyway_schema_history table reference + */ + public FlywaySchemaHistory() { + this(DSL.name("flyway_schema_history"), null); + } + + /** + * Create an aliased DB.flyway_schema_history table reference + */ + public FlywaySchemaHistory(String alias) { + this(DSL.name(alias), FLYWAY_SCHEMA_HISTORY); + } + + /** + * Create an aliased DB.flyway_schema_history table reference + */ + public FlywaySchemaHistory(Name alias) { + this(alias, FLYWAY_SCHEMA_HISTORY); + } + + private FlywaySchemaHistory(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private FlywaySchemaHistory(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Db.DB; + } + + /** + * {@inheritDoc} + */ + @Override + public List getIndexes() { + return Arrays.asList(Indexes.FLYWAY_SCHEMA_HISTORY_FLYWAY_SCHEMA_HISTORY_S_IDX, Indexes.FLYWAY_SCHEMA_HISTORY_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.KEY_FLYWAY_SCHEMA_HISTORY_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.KEY_FLYWAY_SCHEMA_HISTORY_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistory as(String alias) { + return new FlywaySchemaHistory(DSL.name(alias), this); + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistory as(Name alias) { + return new FlywaySchemaHistory(alias, this); + } + + /** + * Rename this table + */ + @Override + public FlywaySchemaHistory rename(String name) { + return new FlywaySchemaHistory(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public FlywaySchemaHistory rename(Name name) { + return new FlywaySchemaHistory(name, null); + } +} diff --git a/src/brs/schema/tables/Goods.java b/src/brs/schema/tables/Goods.java index a96549cd1..7653e3d70 100644 --- a/src/brs/schema/tables/Goods.java +++ b/src/brs/schema/tables/Goods.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Goods extends TableImpl { - private static final long serialVersionUID = 476639959; + private static final long serialVersionUID = -1979010835; /** * The reference instance of DB.goods @@ -68,12 +68,12 @@ public Class getRecordType() { /** * The column DB.goods.description. */ - public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB, this, ""); + public final TableField DESCRIPTION = createField("description", org.jooq.impl.SQLDataType.CLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.CLOB)), this, ""); /** * The column DB.goods.tags. */ - public final TableField TAGS = createField("tags", org.jooq.impl.SQLDataType.VARCHAR(100), this, ""); + public final TableField TAGS = createField("tags", org.jooq.impl.SQLDataType.VARCHAR(100).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARCHAR)), this, ""); /** * The column DB.goods.timestamp. diff --git a/src/brs/schema/tables/IndirectIncoming.java b/src/brs/schema/tables/IndirectIncoming.java new file mode 100644 index 000000000..1807fc663 --- /dev/null +++ b/src/brs/schema/tables/IndirectIncoming.java @@ -0,0 +1,168 @@ +/* + * This file is generated by jOOQ. +*/ +package brs.schema.tables; + + +import brs.schema.Db; +import brs.schema.Indexes; +import brs.schema.Keys; +import brs.schema.tables.records.IndirectIncomingRecord; +import org.jooq.*; +import org.jooq.impl.DSL; +import org.jooq.impl.TableImpl; + +import javax.annotation.Generated; +import java.util.Arrays; +import java.util.List; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.10.5" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class IndirectIncoming extends TableImpl { + + private static final long serialVersionUID = -732282913; + + /** + * The reference instance of DB.indirect_incoming + */ + public static final IndirectIncoming INDIRECT_INCOMING = new IndirectIncoming(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return IndirectIncomingRecord.class; + } + + /** + * The column DB.indirect_incoming.db_id. + */ + public final TableField DB_ID = createField("db_id", org.jooq.impl.SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column DB.indirect_incoming.account_id. + */ + public final TableField ACCOUNT_ID = createField("account_id", org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); + + /** + * The column DB.indirect_incoming.transaction_id. + */ + public final TableField TRANSACTION_ID = createField("transaction_id", org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); + + /** + * The column DB.indirect_incoming.height. + */ + public final TableField HEIGHT = createField("height", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * Create a DB.indirect_incoming table reference + */ + public IndirectIncoming() { + this(DSL.name("indirect_incoming"), null); + } + + /** + * Create an aliased DB.indirect_incoming table reference + */ + public IndirectIncoming(String alias) { + this(DSL.name(alias), INDIRECT_INCOMING); + } + + /** + * Create an aliased DB.indirect_incoming table reference + */ + public IndirectIncoming(Name alias) { + this(alias, INDIRECT_INCOMING); + } + + private IndirectIncoming(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private IndirectIncoming(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Db.DB; + } + + /** + * {@inheritDoc} + */ + @Override + public List getIndexes() { + return Arrays.asList(Indexes.INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX, Indexes.INDIRECT_INCOMING_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public Identity getIdentity() { + return Keys.IDENTITY_INDIRECT_INCOMING; + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.KEY_INDIRECT_INCOMING_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.KEY_INDIRECT_INCOMING_PRIMARY, Keys.KEY_INDIRECT_INCOMING_INDIRECT_INCOMING_DB_ID_UINDEX); + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncoming as(String alias) { + return new IndirectIncoming(DSL.name(alias), this); + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncoming as(Name alias) { + return new IndirectIncoming(alias, this); + } + + /** + * Rename this table + */ + @Override + public IndirectIncoming rename(String name) { + return new IndirectIncoming(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public IndirectIncoming rename(Name name) { + return new IndirectIncoming(name, null); + } +} diff --git a/src/brs/schema/tables/Peer.java b/src/brs/schema/tables/Peer.java index c95aca68f..3a4f07ddb 100644 --- a/src/brs/schema/tables/Peer.java +++ b/src/brs/schema/tables/Peer.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Peer extends TableImpl { - private static final long serialVersionUID = -1229535114; + private static final long serialVersionUID = -248541551; /** * The reference instance of DB.peer diff --git a/src/brs/schema/tables/Purchase.java b/src/brs/schema/tables/Purchase.java index 404bb92d8..44dccdd26 100644 --- a/src/brs/schema/tables/Purchase.java +++ b/src/brs/schema/tables/Purchase.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Purchase extends TableImpl { - private static final long serialVersionUID = 1469054028; + private static final long serialVersionUID = 1612941970; /** * The reference instance of DB.purchase @@ -88,12 +88,12 @@ public Class getRecordType() { /** * The column DB.purchase.note. */ - public final TableField NOTE = createField("note", org.jooq.impl.SQLDataType.BLOB, this, ""); + public final TableField NOTE = createField("note", org.jooq.impl.SQLDataType.BLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BLOB)), this, ""); /** * The column DB.purchase.nonce. */ - public final TableField NONCE = createField("nonce", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField NONCE = createField("nonce", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.purchase.timestamp. @@ -108,22 +108,22 @@ public Class getRecordType() { /** * The column DB.purchase.goods. */ - public final TableField GOODS = createField("goods", org.jooq.impl.SQLDataType.BLOB, this, ""); + public final TableField GOODS = createField("goods", org.jooq.impl.SQLDataType.BLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BLOB)), this, ""); /** * The column DB.purchase.goods_nonce. */ - public final TableField GOODS_NONCE = createField("goods_nonce", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField GOODS_NONCE = createField("goods_nonce", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.purchase.refund_note. */ - public final TableField REFUND_NOTE = createField("refund_note", org.jooq.impl.SQLDataType.BLOB, this, ""); + public final TableField REFUND_NOTE = createField("refund_note", org.jooq.impl.SQLDataType.BLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BLOB)), this, ""); /** * The column DB.purchase.refund_nonce. */ - public final TableField REFUND_NONCE = createField("refund_nonce", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField REFUND_NONCE = createField("refund_nonce", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.purchase.has_feedback_notes. diff --git a/src/brs/schema/tables/PurchaseFeedback.java b/src/brs/schema/tables/PurchaseFeedback.java index 62baf97c6..ca5e7548f 100644 --- a/src/brs/schema/tables/PurchaseFeedback.java +++ b/src/brs/schema/tables/PurchaseFeedback.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PurchaseFeedback extends TableImpl { - private static final long serialVersionUID = 806785913; + private static final long serialVersionUID = -965469698; /** * The reference instance of DB.purchase_feedback diff --git a/src/brs/schema/tables/PurchasePublicFeedback.java b/src/brs/schema/tables/PurchasePublicFeedback.java index aaa980dfe..1d1a77d6b 100644 --- a/src/brs/schema/tables/PurchasePublicFeedback.java +++ b/src/brs/schema/tables/PurchasePublicFeedback.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PurchasePublicFeedback extends TableImpl { - private static final long serialVersionUID = 1577162114; + private static final long serialVersionUID = 99678173; /** * The reference instance of DB.purchase_public_feedback diff --git a/src/brs/schema/tables/RewardRecipAssign.java b/src/brs/schema/tables/RewardRecipAssign.java index 838f6d524..75a243af5 100644 --- a/src/brs/schema/tables/RewardRecipAssign.java +++ b/src/brs/schema/tables/RewardRecipAssign.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class RewardRecipAssign extends TableImpl { - private static final long serialVersionUID = 1252529510; + private static final long serialVersionUID = 1831619755; /** * The reference instance of DB.reward_recip_assign diff --git a/src/brs/schema/tables/Subscription.java b/src/brs/schema/tables/Subscription.java index 5d48c5bbd..0c9acbfcd 100644 --- a/src/brs/schema/tables/Subscription.java +++ b/src/brs/schema/tables/Subscription.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Subscription extends TableImpl { - private static final long serialVersionUID = -2026261659; + private static final long serialVersionUID = -775644502; /** * The reference instance of DB.subscription diff --git a/src/brs/schema/tables/Trade.java b/src/brs/schema/tables/Trade.java index 670b7a609..19e0d75da 100644 --- a/src/brs/schema/tables/Trade.java +++ b/src/brs/schema/tables/Trade.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Trade extends TableImpl { - private static final long serialVersionUID = -1217254851; + private static final long serialVersionUID = -1165504552; /** * The reference instance of DB.trade diff --git a/src/brs/schema/tables/Transaction.java b/src/brs/schema/tables/Transaction.java index cf76fc2ef..21d6cd091 100644 --- a/src/brs/schema/tables/Transaction.java +++ b/src/brs/schema/tables/Transaction.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Transaction extends TableImpl { - private static final long serialVersionUID = 1088310003; + private static final long serialVersionUID = 1594550950; /** * The reference instance of DB.transaction @@ -68,7 +68,7 @@ public Class getRecordType() { /** * The column DB.transaction.recipient_id. */ - public final TableField RECIPIENT_ID = createField("recipient_id", org.jooq.impl.SQLDataType.BIGINT, this, ""); + public final TableField RECIPIENT_ID = createField("recipient_id", org.jooq.impl.SQLDataType.BIGINT.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINT)), this, ""); /** * The column DB.transaction.amount. @@ -93,7 +93,7 @@ public Class getRecordType() { /** * The column DB.transaction.signature. */ - public final TableField SIGNATURE = createField("signature", org.jooq.impl.SQLDataType.VARBINARY(64), this, ""); + public final TableField SIGNATURE = createField("signature", org.jooq.impl.SQLDataType.VARBINARY(64).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.transaction.timestamp. @@ -128,12 +128,12 @@ public Class getRecordType() { /** * The column DB.transaction.referenced_transaction_fullhash. */ - public final TableField REFERENCED_TRANSACTION_FULLHASH = createField("referenced_transaction_fullhash", org.jooq.impl.SQLDataType.VARBINARY(32), this, ""); + public final TableField REFERENCED_TRANSACTION_FULLHASH = createField("referenced_transaction_fullhash", org.jooq.impl.SQLDataType.VARBINARY(32).defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.VARBINARY)), this, ""); /** * The column DB.transaction.attachment_bytes. */ - public final TableField ATTACHMENT_BYTES = createField("attachment_bytes", org.jooq.impl.SQLDataType.BLOB, this, ""); + public final TableField ATTACHMENT_BYTES = createField("attachment_bytes", org.jooq.impl.SQLDataType.BLOB.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BLOB)), this, ""); /** * The column DB.transaction.version. @@ -158,12 +158,12 @@ public Class getRecordType() { /** * The column DB.transaction.ec_block_height. */ - public final TableField EC_BLOCK_HEIGHT = createField("ec_block_height", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final TableField EC_BLOCK_HEIGHT = createField("ec_block_height", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.INTEGER)), this, ""); /** * The column DB.transaction.ec_block_id. */ - public final TableField EC_BLOCK_ID = createField("ec_block_id", org.jooq.impl.SQLDataType.BIGINT, this, ""); + public final TableField EC_BLOCK_ID = createField("ec_block_id", org.jooq.impl.SQLDataType.BIGINT.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINT)), this, ""); /** * The column DB.transaction.has_encrypttoself_message. @@ -212,7 +212,7 @@ public Schema getSchema() { */ @Override public List getIndexes() { - return Arrays.asList(Indexes.TRANSACTION_CONSTRAINT_FF, Indexes.TRANSACTION_PRIMARY, Indexes.TRANSACTION_TRANSACTION_BLOCK_ID_IDX, Indexes.TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX, Indexes.TRANSACTION_TRANSACTION_FULL_HASH_IDX, Indexes.TRANSACTION_TRANSACTION_ID_IDX, Indexes.TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX, Indexes.TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX, Indexes.TRANSACTION_TRANSACTION_SENDER_ID_IDX, Indexes.TRANSACTION_TRANSACTION_TIMESTAMP_IDX); + return Arrays.asList(Indexes.TRANSACTION_CONSTRAINT_FF, Indexes.TRANSACTION_PRIMARY, Indexes.TRANSACTION_TRANSACTION_BLOCK_TIMESTAMP_IDX, Indexes.TRANSACTION_TRANSACTION_FULL_HASH_IDX, Indexes.TRANSACTION_TRANSACTION_ID_IDX, Indexes.TRANSACTION_TRANSACTION_RECIPIENT_ID_AMOUNT_HEIGHT_IDX, Indexes.TRANSACTION_TRANSACTION_RECIPIENT_ID_IDX, Indexes.TRANSACTION_TRANSACTION_SENDER_ID_IDX); } /** diff --git a/src/brs/schema/tables/UnconfirmedTransaction.java b/src/brs/schema/tables/UnconfirmedTransaction.java index 21de861cf..aed8d3b47 100644 --- a/src/brs/schema/tables/UnconfirmedTransaction.java +++ b/src/brs/schema/tables/UnconfirmedTransaction.java @@ -23,14 +23,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class UnconfirmedTransaction extends TableImpl { - private static final long serialVersionUID = 1205910340; + private static final long serialVersionUID = -800951735; /** * The reference instance of DB.unconfirmed_transaction diff --git a/src/brs/schema/tables/Version.java b/src/brs/schema/tables/Version.java deleted file mode 100644 index 41110b2f3..000000000 --- a/src/brs/schema/tables/Version.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * This file is generated by jOOQ. -*/ -package brs.schema.tables; - - -import brs.schema.Db; -import brs.schema.tables.records.VersionRecord; -import org.jooq.*; -import org.jooq.impl.DSL; -import org.jooq.impl.TableImpl; - -import javax.annotation.Generated; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.10.0" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Version extends TableImpl { - - private static final long serialVersionUID = -2037520474; - - /** - * The reference instance of DB.version - */ - public static final Version VERSION = new Version(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return VersionRecord.class; - } - - /** - * The column DB.version.next_update. - */ - public final TableField NEXT_UPDATE = createField("next_update", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * Create a DB.version table reference - */ - public Version() { - this(DSL.name("version"), null); - } - - /** - * Create an aliased DB.version table reference - */ - public Version(String alias) { - this(DSL.name(alias), VERSION); - } - - /** - * Create an aliased DB.version table reference - */ - public Version(Name alias) { - this(alias, VERSION); - } - - private Version(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private Version(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Db.DB; - } - - /** - * {@inheritDoc} - */ - @Override - public Version as(String alias) { - return new Version(DSL.name(alias), this); - } - - /** - * {@inheritDoc} - */ - @Override - public Version as(Name alias) { - return new Version(alias, this); - } - - /** - * Rename this table - */ - @Override - public Version rename(String name) { - return new Version(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public Version rename(Name name) { - return new Version(name, null); - } -} diff --git a/src/brs/schema/tables/records/AccountAssetRecord.java b/src/brs/schema/tables/records/AccountAssetRecord.java index 37f12cae4..c3fb8b004 100644 --- a/src/brs/schema/tables/records/AccountAssetRecord.java +++ b/src/brs/schema/tables/records/AccountAssetRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AccountAssetRecord extends UpdatableRecordImpl implements Record7 { - private static final long serialVersionUID = -653651112; + private static final long serialVersionUID = 1941628829; /** * Setter for DB.account_asset.db_id. diff --git a/src/brs/schema/tables/records/AccountRecord.java b/src/brs/schema/tables/records/AccountRecord.java index af9b22c54..33066cae1 100644 --- a/src/brs/schema/tables/records/AccountRecord.java +++ b/src/brs/schema/tables/records/AccountRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AccountRecord extends UpdatableRecordImpl implements Record12 { - private static final long serialVersionUID = 1389159740; + private static final long serialVersionUID = -1067964905; /** * Setter for DB.account.db_id. diff --git a/src/brs/schema/tables/records/AliasOfferRecord.java b/src/brs/schema/tables/records/AliasOfferRecord.java index 1fcf1dd6d..05eb8e67e 100644 --- a/src/brs/schema/tables/records/AliasOfferRecord.java +++ b/src/brs/schema/tables/records/AliasOfferRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AliasOfferRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = 1955732479; + private static final long serialVersionUID = 1163705818; /** * Setter for DB.alias_offer.db_id. diff --git a/src/brs/schema/tables/records/AliasRecord.java b/src/brs/schema/tables/records/AliasRecord.java index 926a9f21a..bb8a50425 100644 --- a/src/brs/schema/tables/records/AliasRecord.java +++ b/src/brs/schema/tables/records/AliasRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AliasRecord extends UpdatableRecordImpl implements Record9 { - private static final long serialVersionUID = 1648040314; + private static final long serialVersionUID = -2083281323; /** * Setter for DB.alias.db_id. diff --git a/src/brs/schema/tables/records/AskOrderRecord.java b/src/brs/schema/tables/records/AskOrderRecord.java index 072d6e715..ee8349c51 100644 --- a/src/brs/schema/tables/records/AskOrderRecord.java +++ b/src/brs/schema/tables/records/AskOrderRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AskOrderRecord extends UpdatableRecordImpl implements Record9 { - private static final long serialVersionUID = 1946431678; + private static final long serialVersionUID = 541181635; /** * Setter for DB.ask_order.db_id. diff --git a/src/brs/schema/tables/records/AssetRecord.java b/src/brs/schema/tables/records/AssetRecord.java index 173a0dd5c..fd62e1bb8 100644 --- a/src/brs/schema/tables/records/AssetRecord.java +++ b/src/brs/schema/tables/records/AssetRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AssetRecord extends UpdatableRecordImpl implements Record8 { - private static final long serialVersionUID = -612144615; + private static final long serialVersionUID = -525370338; /** * Setter for DB.asset.db_id. diff --git a/src/brs/schema/tables/records/AssetTransferRecord.java b/src/brs/schema/tables/records/AssetTransferRecord.java index ad95501cf..ba7476a8e 100644 --- a/src/brs/schema/tables/records/AssetTransferRecord.java +++ b/src/brs/schema/tables/records/AssetTransferRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AssetTransferRecord extends UpdatableRecordImpl implements Record8 { - private static final long serialVersionUID = -606160613; + private static final long serialVersionUID = -403754784; /** * Setter for DB.asset_transfer.db_id. diff --git a/src/brs/schema/tables/records/AtRecord.java b/src/brs/schema/tables/records/AtRecord.java index 1ab49ca13..dd6f1be88 100644 --- a/src/brs/schema/tables/records/AtRecord.java +++ b/src/brs/schema/tables/records/AtRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AtRecord extends UpdatableRecordImpl implements Record14 { - private static final long serialVersionUID = 85672402; + private static final long serialVersionUID = 1598008663; /** * Setter for DB.at.db_id. diff --git a/src/brs/schema/tables/records/AtStateRecord.java b/src/brs/schema/tables/records/AtStateRecord.java index b064f0bf4..5e8a4203c 100644 --- a/src/brs/schema/tables/records/AtStateRecord.java +++ b/src/brs/schema/tables/records/AtStateRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AtStateRecord extends UpdatableRecordImpl implements Record11 { - private static final long serialVersionUID = -1737667443; + private static final long serialVersionUID = -1707407086; /** * Setter for DB.at_state.db_id. diff --git a/src/brs/schema/tables/records/BidOrderRecord.java b/src/brs/schema/tables/records/BidOrderRecord.java index 81291211c..f8e0176d4 100644 --- a/src/brs/schema/tables/records/BidOrderRecord.java +++ b/src/brs/schema/tables/records/BidOrderRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BidOrderRecord extends UpdatableRecordImpl implements Record9 { - private static final long serialVersionUID = -257247046; + private static final long serialVersionUID = -1662497089; /** * Setter for DB.bid_order.db_id. diff --git a/src/brs/schema/tables/records/BlockRecord.java b/src/brs/schema/tables/records/BlockRecord.java index 979f48683..caa1ff06d 100644 --- a/src/brs/schema/tables/records/BlockRecord.java +++ b/src/brs/schema/tables/records/BlockRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BlockRecord extends UpdatableRecordImpl implements Record20 { - private static final long serialVersionUID = 553861345; + private static final long serialVersionUID = 1828297148; /** * Setter for DB.block.db_id. diff --git a/src/brs/schema/tables/records/EscrowDecisionRecord.java b/src/brs/schema/tables/records/EscrowDecisionRecord.java index adba36d38..5cc5bd3fe 100644 --- a/src/brs/schema/tables/records/EscrowDecisionRecord.java +++ b/src/brs/schema/tables/records/EscrowDecisionRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class EscrowDecisionRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = 996082564; + private static final long serialVersionUID = 685222409; /** * Setter for DB.escrow_decision.db_id. diff --git a/src/brs/schema/tables/records/EscrowRecord.java b/src/brs/schema/tables/records/EscrowRecord.java index ef67fbd42..6609d866c 100644 --- a/src/brs/schema/tables/records/EscrowRecord.java +++ b/src/brs/schema/tables/records/EscrowRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class EscrowRecord extends UpdatableRecordImpl implements Record10 { - private static final long serialVersionUID = -1568167203; + private static final long serialVersionUID = 223363960; /** * Setter for DB.escrow.db_id. diff --git a/src/brs/schema/tables/records/FlywaySchemaHistoryRecord.java b/src/brs/schema/tables/records/FlywaySchemaHistoryRecord.java new file mode 100644 index 000000000..fbd56ddde --- /dev/null +++ b/src/brs/schema/tables/records/FlywaySchemaHistoryRecord.java @@ -0,0 +1,581 @@ +/* + * This file is generated by jOOQ. +*/ +package brs.schema.tables.records; + + +import brs.schema.tables.FlywaySchemaHistory; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Record10; +import org.jooq.Row10; +import org.jooq.impl.UpdatableRecordImpl; + +import javax.annotation.Generated; +import java.sql.Timestamp; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.10.5" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class FlywaySchemaHistoryRecord extends UpdatableRecordImpl implements Record10 { + + private static final long serialVersionUID = 1676156755; + + /** + * Setter for DB.flyway_schema_history.installed_rank. + */ + public void setInstalledRank(Integer value) { + set(0, value); + } + + /** + * Getter for DB.flyway_schema_history.installed_rank. + */ + public Integer getInstalledRank() { + return (Integer) get(0); + } + + /** + * Setter for DB.flyway_schema_history.version. + */ + public void setVersion(String value) { + set(1, value); + } + + /** + * Getter for DB.flyway_schema_history.version. + */ + public String getVersion() { + return (String) get(1); + } + + /** + * Setter for DB.flyway_schema_history.description. + */ + public void setDescription(String value) { + set(2, value); + } + + /** + * Getter for DB.flyway_schema_history.description. + */ + public String getDescription() { + return (String) get(2); + } + + /** + * Setter for DB.flyway_schema_history.type. + */ + public void setType(String value) { + set(3, value); + } + + /** + * Getter for DB.flyway_schema_history.type. + */ + public String getType() { + return (String) get(3); + } + + /** + * Setter for DB.flyway_schema_history.script. + */ + public void setScript(String value) { + set(4, value); + } + + /** + * Getter for DB.flyway_schema_history.script. + */ + public String getScript() { + return (String) get(4); + } + + /** + * Setter for DB.flyway_schema_history.checksum. + */ + public void setChecksum(Integer value) { + set(5, value); + } + + /** + * Getter for DB.flyway_schema_history.checksum. + */ + public Integer getChecksum() { + return (Integer) get(5); + } + + /** + * Setter for DB.flyway_schema_history.installed_by. + */ + public void setInstalledBy(String value) { + set(6, value); + } + + /** + * Getter for DB.flyway_schema_history.installed_by. + */ + public String getInstalledBy() { + return (String) get(6); + } + + /** + * Setter for DB.flyway_schema_history.installed_on. + */ + public void setInstalledOn(Timestamp value) { + set(7, value); + } + + /** + * Getter for DB.flyway_schema_history.installed_on. + */ + public Timestamp getInstalledOn() { + return (Timestamp) get(7); + } + + /** + * Setter for DB.flyway_schema_history.execution_time. + */ + public void setExecutionTime(Integer value) { + set(8, value); + } + + /** + * Getter for DB.flyway_schema_history.execution_time. + */ + public Integer getExecutionTime() { + return (Integer) get(8); + } + + /** + * Setter for DB.flyway_schema_history.success. + */ + public void setSuccess(Byte value) { + set(9, value); + } + + /** + * Getter for DB.flyway_schema_history.success. + */ + public Byte getSuccess() { + return (Byte) get(9); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record10 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public Row10 fieldsRow() { + return (Row10) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public Row10 valuesRow() { + return (Row10) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public Field field1() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.INSTALLED_RANK; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field2() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.VERSION; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field3() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.DESCRIPTION; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field4() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.TYPE; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field5() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.SCRIPT; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field6() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.CHECKSUM; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field7() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.INSTALLED_BY; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field8() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.INSTALLED_ON; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field9() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.EXECUTION_TIME; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field10() { + return FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY.SUCCESS; + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component1() { + return getInstalledRank(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component2() { + return getVersion(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component3() { + return getDescription(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component4() { + return getType(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component5() { + return getScript(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component6() { + return getChecksum(); + } + + /** + * {@inheritDoc} + */ + @Override + public String component7() { + return getInstalledBy(); + } + + /** + * {@inheritDoc} + */ + @Override + public Timestamp component8() { + return getInstalledOn(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component9() { + return getExecutionTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public Byte component10() { + return getSuccess(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer value1() { + return getInstalledRank(); + } + + /** + * {@inheritDoc} + */ + @Override + public String value2() { + return getVersion(); + } + + /** + * {@inheritDoc} + */ + @Override + public String value3() { + return getDescription(); + } + + /** + * {@inheritDoc} + */ + @Override + public String value4() { + return getType(); + } + + /** + * {@inheritDoc} + */ + @Override + public String value5() { + return getScript(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer value6() { + return getChecksum(); + } + + /** + * {@inheritDoc} + */ + @Override + public String value7() { + return getInstalledBy(); + } + + /** + * {@inheritDoc} + */ + @Override + public Timestamp value8() { + return getInstalledOn(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer value9() { + return getExecutionTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public Byte value10() { + return getSuccess(); + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value1(Integer value) { + setInstalledRank(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value2(String value) { + setVersion(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value3(String value) { + setDescription(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value4(String value) { + setType(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value5(String value) { + setScript(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value6(Integer value) { + setChecksum(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value7(String value) { + setInstalledBy(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value8(Timestamp value) { + setInstalledOn(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value9(Integer value) { + setExecutionTime(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord value10(Byte value) { + setSuccess(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public FlywaySchemaHistoryRecord values(Integer value1, String value2, String value3, String value4, String value5, Integer value6, String value7, Timestamp value8, Integer value9, Byte value10) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + value5(value5); + value6(value6); + value7(value7); + value8(value8); + value9(value9); + value10(value10); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached FlywaySchemaHistoryRecord + */ + public FlywaySchemaHistoryRecord() { + super(FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY); + } + + /** + * Create a detached, initialised FlywaySchemaHistoryRecord + */ + public FlywaySchemaHistoryRecord(Integer installedRank, String version, String description, String type, String script, Integer checksum, String installedBy, Timestamp installedOn, Integer executionTime, Byte success) { + super(FlywaySchemaHistory.FLYWAY_SCHEMA_HISTORY); + + set(0, installedRank); + set(1, version); + set(2, description); + set(3, type); + set(4, script); + set(5, checksum); + set(6, installedBy); + set(7, installedOn); + set(8, executionTime); + set(9, success); + } +} diff --git a/src/brs/schema/tables/records/GoodsRecord.java b/src/brs/schema/tables/records/GoodsRecord.java index 9cf1da6bb..3139b0b17 100644 --- a/src/brs/schema/tables/records/GoodsRecord.java +++ b/src/brs/schema/tables/records/GoodsRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class GoodsRecord extends UpdatableRecordImpl implements Record12 { - private static final long serialVersionUID = -281912380; + private static final long serialVersionUID = -302857569; /** * Setter for DB.goods.db_id. diff --git a/src/brs/schema/tables/records/IndirectIncomingRecord.java b/src/brs/schema/tables/records/IndirectIncomingRecord.java new file mode 100644 index 000000000..d58bc29f6 --- /dev/null +++ b/src/brs/schema/tables/records/IndirectIncomingRecord.java @@ -0,0 +1,286 @@ +/* + * This file is generated by jOOQ. +*/ +package brs.schema.tables.records; + + +import brs.schema.tables.IndirectIncoming; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Record4; +import org.jooq.Row4; +import org.jooq.impl.UpdatableRecordImpl; + +import javax.annotation.Generated; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.10.5" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class IndirectIncomingRecord extends UpdatableRecordImpl implements Record4 { + + private static final long serialVersionUID = -261409397; + + /** + * Setter for DB.indirect_incoming.db_id. + */ + public void setDbId(Long value) { + set(0, value); + } + + /** + * Getter for DB.indirect_incoming.db_id. + */ + public Long getDbId() { + return (Long) get(0); + } + + /** + * Setter for DB.indirect_incoming.account_id. + */ + public void setAccountId(Long value) { + set(1, value); + } + + /** + * Getter for DB.indirect_incoming.account_id. + */ + public Long getAccountId() { + return (Long) get(1); + } + + /** + * Setter for DB.indirect_incoming.transaction_id. + */ + public void setTransactionId(Long value) { + set(2, value); + } + + /** + * Getter for DB.indirect_incoming.transaction_id. + */ + public Long getTransactionId() { + return (Long) get(2); + } + + /** + * Setter for DB.indirect_incoming.height. + */ + public void setHeight(Integer value) { + set(3, value); + } + + /** + * Getter for DB.indirect_incoming.height. + */ + public Integer getHeight() { + return (Integer) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public Row4 fieldsRow() { + return (Row4) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public Row4 valuesRow() { + return (Row4) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public Field field1() { + return IndirectIncoming.INDIRECT_INCOMING.DB_ID; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field2() { + return IndirectIncoming.INDIRECT_INCOMING.ACCOUNT_ID; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field3() { + return IndirectIncoming.INDIRECT_INCOMING.TRANSACTION_ID; + } + + /** + * {@inheritDoc} + */ + @Override + public Field field4() { + return IndirectIncoming.INDIRECT_INCOMING.HEIGHT; + } + + /** + * {@inheritDoc} + */ + @Override + public Long component1() { + return getDbId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Long component2() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Long component3() { + return getTransactionId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer component4() { + return getHeight(); + } + + /** + * {@inheritDoc} + */ + @Override + public Long value1() { + return getDbId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Long value2() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Long value3() { + return getTransactionId(); + } + + /** + * {@inheritDoc} + */ + @Override + public Integer value4() { + return getHeight(); + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncomingRecord value1(Long value) { + setDbId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncomingRecord value2(Long value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncomingRecord value3(Long value) { + setTransactionId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncomingRecord value4(Integer value) { + setHeight(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public IndirectIncomingRecord values(Long value1, Long value2, Long value3, Integer value4) { + value1(value1); + value2(value2); + value3(value3); + value4(value4); + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached IndirectIncomingRecord + */ + public IndirectIncomingRecord() { + super(IndirectIncoming.INDIRECT_INCOMING); + } + + /** + * Create a detached, initialised IndirectIncomingRecord + */ + public IndirectIncomingRecord(Long dbId, Long accountId, Long transactionId, Integer height) { + super(IndirectIncoming.INDIRECT_INCOMING); + + set(0, dbId); + set(1, accountId); + set(2, transactionId); + set(3, height); + } +} diff --git a/src/brs/schema/tables/records/PeerRecord.java b/src/brs/schema/tables/records/PeerRecord.java index b0728861d..9c3627533 100644 --- a/src/brs/schema/tables/records/PeerRecord.java +++ b/src/brs/schema/tables/records/PeerRecord.java @@ -19,14 +19,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PeerRecord extends UpdatableRecordImpl implements Record1 { - private static final long serialVersionUID = 407179200; + private static final long serialVersionUID = -2011821733; /** * Setter for DB.peer.address. diff --git a/src/brs/schema/tables/records/PurchaseFeedbackRecord.java b/src/brs/schema/tables/records/PurchaseFeedbackRecord.java index 9de07a435..550f97de2 100644 --- a/src/brs/schema/tables/records/PurchaseFeedbackRecord.java +++ b/src/brs/schema/tables/records/PurchaseFeedbackRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PurchaseFeedbackRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = -439571790; + private static final long serialVersionUID = 1244951415; /** * Setter for DB.purchase_feedback.db_id. diff --git a/src/brs/schema/tables/records/PurchasePublicFeedbackRecord.java b/src/brs/schema/tables/records/PurchasePublicFeedbackRecord.java index 8bc555b59..e7f253b90 100644 --- a/src/brs/schema/tables/records/PurchasePublicFeedbackRecord.java +++ b/src/brs/schema/tables/records/PurchasePublicFeedbackRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PurchasePublicFeedbackRecord extends UpdatableRecordImpl implements Record5 { - private static final long serialVersionUID = -328374939; + private static final long serialVersionUID = 743641088; /** * Setter for DB.purchase_public_feedback.db_id. diff --git a/src/brs/schema/tables/records/PurchaseRecord.java b/src/brs/schema/tables/records/PurchaseRecord.java index dcdb80811..43e5174f1 100644 --- a/src/brs/schema/tables/records/PurchaseRecord.java +++ b/src/brs/schema/tables/records/PurchaseRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PurchaseRecord extends UpdatableRecordImpl implements Record22 { - private static final long serialVersionUID = -942129552; + private static final long serialVersionUID = -1168066549; /** * Setter for DB.purchase.db_id. diff --git a/src/brs/schema/tables/records/RewardRecipAssignRecord.java b/src/brs/schema/tables/records/RewardRecipAssignRecord.java index f2c482722..175dd943c 100644 --- a/src/brs/schema/tables/records/RewardRecipAssignRecord.java +++ b/src/brs/schema/tables/records/RewardRecipAssignRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class RewardRecipAssignRecord extends UpdatableRecordImpl implements Record7 { - private static final long serialVersionUID = 1276370487; + private static final long serialVersionUID = 79161554; /** * Setter for DB.reward_recip_assign.db_id. diff --git a/src/brs/schema/tables/records/SubscriptionRecord.java b/src/brs/schema/tables/records/SubscriptionRecord.java index 658539cf0..5eb6eb3e0 100644 --- a/src/brs/schema/tables/records/SubscriptionRecord.java +++ b/src/brs/schema/tables/records/SubscriptionRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class SubscriptionRecord extends UpdatableRecordImpl implements Record9 { - private static final long serialVersionUID = -1228105293; + private static final long serialVersionUID = 722671054; /** * Setter for DB.subscription.db_id. diff --git a/src/brs/schema/tables/records/TradeRecord.java b/src/brs/schema/tables/records/TradeRecord.java index 886550239..143f1e367 100644 --- a/src/brs/schema/tables/records/TradeRecord.java +++ b/src/brs/schema/tables/records/TradeRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TradeRecord extends UpdatableRecordImpl implements Record13 { - private static final long serialVersionUID = 75495158; + private static final long serialVersionUID = -147371119; /** * Setter for DB.trade.db_id. diff --git a/src/brs/schema/tables/records/TransactionRecord.java b/src/brs/schema/tables/records/TransactionRecord.java index d8d4c3350..d100cce06 100644 --- a/src/brs/schema/tables/records/TransactionRecord.java +++ b/src/brs/schema/tables/records/TransactionRecord.java @@ -17,14 +17,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class TransactionRecord extends UpdatableRecordImpl { - private static final long serialVersionUID = -2022269463; + private static final long serialVersionUID = 704815406; /** * Setter for DB.transaction.db_id. diff --git a/src/brs/schema/tables/records/UnconfirmedTransactionRecord.java b/src/brs/schema/tables/records/UnconfirmedTransactionRecord.java index 5caaafd9f..1ad0f9c85 100644 --- a/src/brs/schema/tables/records/UnconfirmedTransactionRecord.java +++ b/src/brs/schema/tables/records/UnconfirmedTransactionRecord.java @@ -20,14 +20,14 @@ @Generated( value = { "http://www.jooq.org", - "jOOQ version:3.10.0" + "jOOQ version:3.10.5" }, comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class UnconfirmedTransactionRecord extends UpdatableRecordImpl implements Record8 { - private static final long serialVersionUID = 146973840; + private static final long serialVersionUID = -1063971947; /** * Setter for DB.unconfirmed_transaction.db_id. diff --git a/src/brs/schema/tables/records/VersionRecord.java b/src/brs/schema/tables/records/VersionRecord.java deleted file mode 100644 index 6933cf02c..000000000 --- a/src/brs/schema/tables/records/VersionRecord.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * This file is generated by jOOQ. -*/ -package brs.schema.tables.records; - - -import brs.schema.tables.Version; -import org.jooq.Field; -import org.jooq.Record1; -import org.jooq.Row1; -import org.jooq.impl.TableRecordImpl; - -import javax.annotation.Generated; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.10.0" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class VersionRecord extends TableRecordImpl implements Record1 { - - private static final long serialVersionUID = -460151050; - - /** - * Setter for DB.version.next_update. - */ - public void setNextUpdate(Integer value) { - set(0, value); - } - - /** - * Getter for DB.version.next_update. - */ - public Integer getNextUpdate() { - return (Integer) get(0); - } - - // ------------------------------------------------------------------------- - // Record1 type implementation - // ------------------------------------------------------------------------- - - /** - * {@inheritDoc} - */ - @Override - public Row1 fieldsRow() { - return (Row1) super.fieldsRow(); - } - - /** - * {@inheritDoc} - */ - @Override - public Row1 valuesRow() { - return (Row1) super.valuesRow(); - } - - /** - * {@inheritDoc} - */ - @Override - public Field field1() { - return Version.VERSION.NEXT_UPDATE; - } - - /** - * {@inheritDoc} - */ - @Override - public Integer component1() { - return getNextUpdate(); - } - - /** - * {@inheritDoc} - */ - @Override - public Integer value1() { - return getNextUpdate(); - } - - /** - * {@inheritDoc} - */ - @Override - public VersionRecord value1(Integer value) { - setNextUpdate(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public VersionRecord values(Integer value1) { - value1(value1); - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached VersionRecord - */ - public VersionRecord() { - super(Version.VERSION); - } - - /** - * Create a detached, initialised VersionRecord - */ - public VersionRecord(Integer nextUpdate) { - super(Version.VERSION); - - set(0, nextUpdate); - } -} diff --git a/src/brs/services/IndirectIncomingService.java b/src/brs/services/IndirectIncomingService.java new file mode 100644 index 000000000..6389491c8 --- /dev/null +++ b/src/brs/services/IndirectIncomingService.java @@ -0,0 +1,7 @@ +package brs.services; + +import brs.Transaction; + +public interface IndirectIncomingService { + void processTransaction(Transaction transaction); +} diff --git a/src/brs/services/ParameterService.java b/src/brs/services/ParameterService.java index d566fc99b..e26fde20e 100644 --- a/src/brs/services/ParameterService.java +++ b/src/brs/services/ParameterService.java @@ -36,4 +36,6 @@ public interface ParameterService { Transaction parseTransaction(String transactionBytes, String transactionJSON) throws ParameterException; AT getAT(HttpServletRequest req) throws ParameterException; + + boolean getIncludeIndirect(HttpServletRequest req); } diff --git a/src/brs/services/impl/IndirectIncomingServiceImpl.java b/src/brs/services/impl/IndirectIncomingServiceImpl.java new file mode 100644 index 000000000..b105583a4 --- /dev/null +++ b/src/brs/services/impl/IndirectIncomingServiceImpl.java @@ -0,0 +1,68 @@ +package brs.services.impl; + +import brs.Attachment; +import brs.Transaction; +import brs.TransactionType; +import brs.db.store.IndirectIncomingStore; +import brs.props.PropertyService; +import brs.props.Props; +import brs.services.IndirectIncomingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class IndirectIncomingServiceImpl implements IndirectIncomingService { + private static final Logger LOGGER = LoggerFactory.getLogger(IndirectIncomingServiceImpl.class); + + private final IndirectIncomingStore indirectIncomingStore; + private final boolean disabled; + + public IndirectIncomingServiceImpl(IndirectIncomingStore indirectIncomingStore, PropertyService propertyService) { + this.indirectIncomingStore = indirectIncomingStore; + this.disabled = !propertyService.getBoolean(Props.INDIRECT_INCOMING_SERVICE_ENABLE); + if (disabled) { + LOGGER.warn("Indirect Incoming Service Disabled!"); + } + } + + @Override + public void processTransaction(Transaction transaction) { + if (disabled) return; + indirectIncomingStore.addIndirectIncomings(getIndirectIncomings(transaction)); + } + + private List getIndirectIncomings(Transaction transaction) { + List indirectIncomings = new ArrayList<>(); + if (Objects.equals(transaction.getType(), TransactionType.Payment.MULTI_OUT)) { + indirectIncomings.addAll(getMultiOutRecipients(transaction)); + } else if (Objects.equals(transaction.getType(), TransactionType.Payment.MULTI_SAME_OUT)) { + indirectIncomings.addAll(getMultiOutSameRecipients(transaction)); + } + return indirectIncomings; + } + + private List getMultiOutRecipients(Transaction transaction) { + if (!Objects.equals(transaction.getType(), TransactionType.Payment.MULTI_OUT) + || !(transaction.getAttachment() instanceof Attachment.PaymentMultiOutCreation)) + throw new IllegalArgumentException("Wrong transaction type"); + + List indirectIncomings = new ArrayList<>(); + Attachment.PaymentMultiOutCreation attachment = (Attachment.PaymentMultiOutCreation) transaction.getAttachment(); + attachment.getRecipients().forEach(recipient -> indirectIncomings.add(new IndirectIncomingStore.IndirectIncoming(recipient.get(0), transaction.getId(), transaction.getHeight()))); + return indirectIncomings; + } + + private List getMultiOutSameRecipients(Transaction transaction) { + if (!Objects.equals(transaction.getType(), TransactionType.Payment.MULTI_SAME_OUT) + || !(transaction.getAttachment() instanceof Attachment.PaymentMultiSameOutCreation)) + throw new IllegalArgumentException("Wrong transaction type"); + + List indirectIncomings = new ArrayList<>(); + Attachment.PaymentMultiSameOutCreation attachment = (Attachment.PaymentMultiSameOutCreation) transaction.getAttachment(); + attachment.getRecipients().forEach(recipient -> indirectIncomings.add(new IndirectIncomingStore.IndirectIncoming(recipient, transaction.getId(), transaction.getHeight()))); + return indirectIncomings; + } +} diff --git a/src/brs/services/impl/ParameterServiceImpl.java b/src/brs/services/impl/ParameterServiceImpl.java index 0d942627d..165e2d5d1 100644 --- a/src/brs/services/impl/ParameterServiceImpl.java +++ b/src/brs/services/impl/ParameterServiceImpl.java @@ -341,4 +341,9 @@ public AT getAT(HttpServletRequest req) throws ParameterException { } return at; } + + @Override + public boolean getIncludeIndirect(HttpServletRequest req) { + return Boolean.parseBoolean(req.getParameter(INCLUDE_INDIRECT_PARAMETER)); + } } diff --git a/test/java/brs/peer/GetAccountRecentTransactionsTest.java b/test/java/brs/peer/GetAccountRecentTransactionsTest.java index 12e3eb30e..e005a5ff1 100644 --- a/test/java/brs/peer/GetAccountRecentTransactionsTest.java +++ b/test/java/brs/peer/GetAccountRecentTransactionsTest.java @@ -54,7 +54,7 @@ public void processRequest() { final BurstIterator transactionsIterator = mockBurstIterator(mockTransaction); when(mockAccountService.getAccount(eq(TestConstants.TEST_ACCOUNT_NUMERIC_ID_PARSED))).thenReturn(mockAccount); - when(mockBlockchain.getTransactions(eq(mockAccount), eq(0), eq((byte) -1), eq((byte) 0), eq(0), eq(0), eq(9))).thenReturn(transactionsIterator); + when(mockBlockchain.getTransactions(eq(mockAccount), eq(0), eq((byte) -1), eq((byte) 0), eq(0), eq(0), eq(9), eq(false))).thenReturn(transactionsIterator); final JsonObject result = (JsonObject) t.processRequest(request, peerMock); assertNotNull(result); diff --git a/test/java/brs/services/impl/IndirectIncomingServiceImplTest.java b/test/java/brs/services/impl/IndirectIncomingServiceImplTest.java new file mode 100644 index 000000000..320ab587f --- /dev/null +++ b/test/java/brs/services/impl/IndirectIncomingServiceImplTest.java @@ -0,0 +1,77 @@ +package brs.services.impl; + +import brs.*; +import brs.db.store.IndirectIncomingStore; +import brs.props.PropertyService; +import brs.props.Props; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@RunWith(JUnit4.class) +public class IndirectIncomingServiceImplTest { + private final AtomicReference>> addIndirectIncomingsRunnable = new AtomicReference<>(); + private IndirectIncomingServiceImpl indirectIncomingService; + + @Before + public void setUpIndirectIncomingServiceImplTest() { + PropertyService propertyService = mock(PropertyService.class); + IndirectIncomingStore indirectIncomingStore = mock(IndirectIncomingStore.class); + when(propertyService.getBoolean(Props.INDIRECT_INCOMING_SERVICE_ENABLE)).thenReturn(true); + doAnswer(invocation -> { + addIndirectIncomingsRunnable.get().accept(invocation.getArgument(0)); + return null; + }).when(indirectIncomingStore).addIndirectIncomings(any()); + indirectIncomingService = new IndirectIncomingServiceImpl(indirectIncomingStore, propertyService); + } + + @Test + public void testIndirectIncomingServiceImplTestMultiOutTransaction() throws BurstException.NotValidException { + addIndirectIncomingsRunnable.set(indirectIncomings -> { + assertEquals(4, indirectIncomings.size()); + assertEquals(new HashSet<>(indirectIncomings).size(), indirectIncomings.size()); // Assert that there are no duplicates + }); + List> recipients = new ArrayList<>(); + recipients.add(Arrays.asList(1L, Constants.ONE_BURST)); + recipients.add(Arrays.asList(2L, Constants.ONE_BURST)); + recipients.add(Arrays.asList(3L, Constants.ONE_BURST)); + recipients.add(Arrays.asList(4L, Constants.ONE_BURST)); + Attachment.PaymentMultiOutCreation attachment = mock(Attachment.PaymentMultiOutCreation.class); + when(attachment.getRecipients()).thenReturn(recipients); + Transaction multiOut = mock(Transaction.class); + when(multiOut.getType()).thenReturn(TransactionType.Payment.MULTI_OUT); + when(multiOut.getAttachment()).thenReturn(attachment); + indirectIncomingService.processTransaction(multiOut); + } + + @Test + public void testIndirectIncomingServiceImplTestMultiOutSameTransaction() throws BurstException.NotValidException { + addIndirectIncomingsRunnable.set(indirectIncomings -> { + assertEquals(4, indirectIncomings.size()); + assertEquals(new HashSet<>(indirectIncomings).size(), indirectIncomings.size()); // Assert that there are no duplicates + }); + List recipients = new ArrayList<>(); + recipients.add(1L); + recipients.add(2L); + recipients.add(3L); + recipients.add(4L); + Attachment.PaymentMultiSameOutCreation attachment = mock(Attachment.PaymentMultiSameOutCreation.class); + when(attachment.getRecipients()).thenReturn(recipients); + Transaction multiOutSame = mock(Transaction.class); + when(multiOutSame.getType()).thenReturn(TransactionType.Payment.MULTI_SAME_OUT); + when(multiOutSame.getAttachment()).thenReturn(attachment); + indirectIncomingService.processTransaction(multiOutSame); + } +} diff --git a/test/java/it/common/AbstractIT.java b/test/java/it/common/AbstractIT.java index 720edbf06..bae817cbd 100644 --- a/test/java/it/common/AbstractIT.java +++ b/test/java/it/common/AbstractIT.java @@ -60,4 +60,8 @@ private Properties testProperties() { public void processBlock(JsonObject jsonFirstBlock) { processBlock.processRequest(jsonFirstBlock, null); } + + public void rollback(int height) { + Burst.getBlockchainProcessor().popOffTo(0); + } } diff --git a/test/java/it/java/brs/ProcessASingleBlockTest.java b/test/java/it/java/brs/ProcessASingleBlockTest.java index a5a605133..ca4f0a2ec 100644 --- a/test/java/it/java/brs/ProcessASingleBlockTest.java +++ b/test/java/it/java/brs/ProcessASingleBlockTest.java @@ -14,6 +14,13 @@ public void canProcessASingleBlock() throws InterruptedException { Thread.sleep(200); } + @Test + public void canRollback() throws InterruptedException { + super.processBlock(getJSONFirstBlock()); + Thread.sleep(200); + super.rollback(0); + } + public JsonObject getJSONFirstBlock() { return new BlockMessageBuilder() .payloadLength(0)