From e80f008314da634c236f46352f34976af63d836a Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Thu, 1 Aug 2024 16:42:55 +0300 Subject: [PATCH] Deprecate encrypted transfers Encrypted transfers are deprecated and partially removed since protocol version 7 --- CHANGELOG.md | 1 + .../transactions/EncryptedTransferTransaction.java | 6 ++++++ .../EncryptedTransferWithMemoTransaction.java | 6 ++++++ .../sdk/transactions/TransactionFactory.java | 13 +++++++++++-- .../TransferToEncryptedTransaction.java | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a161eaed..d7803281c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Added `MessageSigningDigest` class to generate digests for message signing - Added support for company identity attributes +- Deprecated encrypted transfers. They are partially removed since protocol version 7 ## 7.1.0 - Removed unnecessary `amount` parameter from `InvokeInstanceRequest`. diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferTransaction.java index afc8d405c..f8a78dc16 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferTransaction.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferTransaction.java @@ -6,6 +6,10 @@ import com.concordium.sdk.types.Nonce; import lombok.*; +/** + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 + */ +@Deprecated @Getter @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -34,7 +38,9 @@ private EncryptedTransferTransaction( * @return Initialized {@link EncryptedTransferTransaction}. * @throws TransactionCreationException On failure to create the Transaction from input params. * Ex when any of the input param is NULL. + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated @Builder public static EncryptedTransferTransaction from(final EncryptedAmountTransferData data, final AccountAddress receiver, diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemoTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemoTransaction.java index fce0178da..480ee7acb 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemoTransaction.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemoTransaction.java @@ -6,6 +6,10 @@ import com.concordium.sdk.types.Nonce; import lombok.*; +/** + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 + */ +@Deprecated @Getter @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -38,7 +42,9 @@ private EncryptedTransferWithMemoTransaction( * @return Initialized {@link EncryptedTransferWithMemoTransaction}. * @throws TransactionCreationException On failure to create the Transaction from input params. * Ex when any of the input param is NULL. + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated @Builder public static EncryptedTransferWithMemoTransaction from( final EncryptedAmountTransferData data, diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransactionFactory.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransactionFactory.java index 9edd61a27..a6e1a88d3 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransactionFactory.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransactionFactory.java @@ -13,6 +13,7 @@ * TransactionFactory provides convenient functions for building a * {@link Transaction} */ +@SuppressWarnings("DeprecatedIsStillUsed") public class TransactionFactory { /** @@ -149,7 +150,9 @@ public static TransferToPublicTransaction.TransferToPublicTransactionBuilder new * creating a {@link TransferToEncryptedTransaction} * * @return the builder for a {@link TransferToEncryptedTransaction} + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated public static TransferToEncryptedTransaction.TransferToEncryptedTransactionBuilder newTransferToEncrypted() { return TransferToEncryptedTransaction.builder(); } @@ -160,8 +163,9 @@ public static TransferToEncryptedTransaction.TransferToEncryptedTransactionBuild * creating a {@link EncryptedTransferTransaction} * * @return the builder for a {@link EncryptedTransferTransaction} + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ - + @Deprecated public static EncryptedTransferTransaction.EncryptedTransferTransactionBuilder newEncryptedTransfer() { return EncryptedTransferTransaction.builder(); } @@ -172,7 +176,9 @@ public static EncryptedTransferTransaction.EncryptedTransferTransactionBuilder n * creating a {@link EncryptedTransferTransaction} * * @return the builder for a {@link EncryptedTransferTransaction} + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated public static EncryptedTransferTransaction.EncryptedTransferTransactionBuilder newEncryptedTransfer( CryptographicParameters cryptographicParameters, AccountEncryptedAmount accountEncryptedAmount, @@ -204,8 +210,9 @@ public static EncryptedTransferTransaction.EncryptedTransferTransactionBuilder n * creating a {@link EncryptedTransferWithMemoTransaction} * * @return the builder for a {@link EncryptedTransferWithMemoTransaction} + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ - + @Deprecated public static EncryptedTransferWithMemoTransaction.EncryptedTransferWithMemoTransactionBuilder newEncryptedTransferWithMemo() { return EncryptedTransferWithMemoTransaction.builder(); } @@ -215,7 +222,9 @@ public static EncryptedTransferWithMemoTransaction.EncryptedTransferWithMemoTran * creating a {@link EncryptedTransferWithMemoTransaction} * * @return the builder for a {@link EncryptedTransferWithMemoTransaction} + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated public static EncryptedTransferWithMemoTransaction.EncryptedTransferWithMemoTransactionBuilder newEncryptedTransferWithMemo( CryptographicParameters cryptographicParameters, AccountEncryptedAmount accountEncryptedAmount, diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncryptedTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncryptedTransaction.java index bb33ef16a..b76e94d48 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncryptedTransaction.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncryptedTransaction.java @@ -8,7 +8,10 @@ /** * Construct a transaction to transfer from public to encrypted balance of the sender account. + * + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ +@Deprecated @Getter @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -33,7 +36,9 @@ private TransferToEncryptedTransaction( * @return Initialized {@link TransferToEncryptedTransaction}. * @throws TransactionCreationException On failure to create the Transaction from input params. * Ex when any of the input param is NULL. + * @deprecated Encrypted transfers are deprecated and partially removed since protocol version 7 */ + @Deprecated @Builder public static TransferToEncryptedTransaction from( final CCDAmount amount,