mirror of
https://github.com/Qortal/qortal.git
synced 2025-03-30 17:05:53 +00:00
e56d8f5e02
HSQLDB v2.4.0 had some issue with non-padded, case-insensitive string comparisons. This is fixed in svn r5836-ish of HSQLDB but yet to be pushed out to new HSQLDB release. So this commit includes hsqldb-r5836.jar and modified pom.xml/.classpath for now. No need for duplicate, hidden creatorPublicKey in CancelOrderTransactionData, CreateOrderTransactionData and CreatePollTransactionData. Various changes to use more try-with-resources, especially with JDBC objects like Connection, Statement, PreparedStatement, ResultSet. Added loads of missing @Override annotations. Fixed bug in Asset exchange order matching where the matching logic loop would incorrectly adjust temporary amount fulfilled by the "want" asset amount (in matchedAmount) instead of the "have" asset amount (in tradePrice). Disabled check for duplicate asset name in IssueAssetTransactions for old v1 transactions. In HSQLDB repository we now use ResultSet.getTimestamp(index, UTC-calendar) to make sure we only store/fetch UTC timestamps. The UTC-calendar is made using static final TimeZone called HSQLDBRepository.UTC. To keep asset IDs in line with v1, Assets.asset_id values are generated on-the-fly in HSQLDB using a "before insert" trigger on Assets table. Corresponding code calling HSQLDBRepository.callIdentity() replaced with SELECT statement instead. Moved most of the HSQLDB connection properties from the connection URL to explicit code in HSQLDBRepositoryFactory. Fixed incorrect 'amount' lengths in PaymentTransformer, as used by MultiPayment and Arbitrary transaction types. Added support for mangled arbitrary transaction bytes when generating/verifying a v1 transaction signature. In v1 Arbitrary transactions, bytes-for-signing are lost prior to final payment (but only if there are any payments). Added corresponding code for multi-payment transactions in the same vein.
55 lines
2.1 KiB
Java
55 lines
2.1 KiB
Java
package repository.hsqldb.transaction;
|
|
|
|
import java.math.BigDecimal;
|
|
import java.sql.ResultSet;
|
|
import java.sql.SQLException;
|
|
import java.util.List;
|
|
|
|
import data.PaymentData;
|
|
import data.transaction.MultiPaymentTransactionData;
|
|
import data.transaction.TransactionData;
|
|
import repository.DataException;
|
|
import repository.hsqldb.HSQLDBRepository;
|
|
import repository.hsqldb.HSQLDBSaver;
|
|
|
|
public class HSQLDBMultiPaymentTransactionRepository extends HSQLDBTransactionRepository {
|
|
|
|
public HSQLDBMultiPaymentTransactionRepository(HSQLDBRepository repository) {
|
|
this.repository = repository;
|
|
}
|
|
|
|
TransactionData fromBase(byte[] signature, byte[] reference, byte[] creatorPublicKey, long timestamp, BigDecimal fee) throws DataException {
|
|
try (ResultSet resultSet = this.repository.checkedExecute("SELECT sender from MultiPaymentTransactions WHERE signature = ?", signature)) {
|
|
if (resultSet == null)
|
|
return null;
|
|
|
|
byte[] senderPublicKey = resultSet.getBytes(1);
|
|
|
|
List<PaymentData> payments = this.getPaymentsFromSignature(signature);
|
|
|
|
return new MultiPaymentTransactionData(senderPublicKey, payments, fee, timestamp, reference, signature);
|
|
} catch (SQLException e) {
|
|
throw new DataException("Unable to fetch multi-payment transaction from repository", e);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void save(TransactionData transactionData) throws DataException {
|
|
MultiPaymentTransactionData multiPaymentTransactionData = (MultiPaymentTransactionData) transactionData;
|
|
|
|
HSQLDBSaver saveHelper = new HSQLDBSaver("MultiPaymentTransactions");
|
|
|
|
saveHelper.bind("signature", multiPaymentTransactionData.getSignature()).bind("sender", multiPaymentTransactionData.getSenderPublicKey());
|
|
|
|
try {
|
|
saveHelper.execute(this.repository);
|
|
} catch (SQLException e) {
|
|
throw new DataException("Unable to save multi-payment transaction into repository", e);
|
|
}
|
|
|
|
// Save payments. If this fails then it is the caller's responsibility to catch the DataException as the underlying transaction will have been lost.
|
|
this.savePayments(transactionData.getSignature(), multiPaymentTransactionData.getPayments());
|
|
}
|
|
|
|
}
|