[MINOR] (privacy deprecation) correct target to 24.12.0 (#7953)

pull/7964/head
Sally MacFarlane 5 days ago committed by GitHub
parent 0cbcd919eb
commit 979ea5de74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java
  2. 2
      besu/src/main/java/org/hyperledger/besu/cli/options/PrivacyPluginOptions.java
  3. 2
      besu/src/main/java/org/hyperledger/besu/services/PrivacyPluginServiceImpl.java
  4. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/DisabledPrivacyRpcMethod.java
  5. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecorator.java
  6. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtil.java
  7. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterChanges.java
  8. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterLogs.java
  9. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivUninstallFilter.java
  10. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacyIdProvider.java
  11. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java
  12. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/JsonRpcErrorResponseException.java
  13. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java
  14. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransaction.java
  15. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransaction.java
  16. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/AbstractPrivateTraceByHash.java
  17. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCall.java
  18. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java
  19. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRoot.java
  20. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java
  21. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java
  22. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java
  23. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCode.java
  24. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCount.java
  25. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java
  26. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java
  27. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java
  28. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java
  29. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
  30. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilter.java
  31. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivTraceTransaction.java
  32. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUtil.java
  33. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroup.java
  34. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java
  35. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java
  36. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java
  37. 2
      ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContract.java
  38. 2
      plugin-api/build.gradle
  39. 2
      plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PrivacyPluginService.java
  40. 2
      plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyPluginPayloadProvider.java

@ -28,7 +28,7 @@ import org.apache.tuweni.bytes.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class TestPrivacyPluginPayloadProvider implements PrivacyPluginPayloadProvider {
private static final Logger LOG = LoggerFactory.getLogger(TestPrivacyPluginPayloadProvider.class);
private String prefix;

@ -17,7 +17,7 @@ package org.hyperledger.besu.cli.options;
import static picocli.CommandLine.Option;
/** The Privacy plugin Cli options. */
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginOptions {
/** Default Constructor. */
PrivacyPluginOptions() {}

@ -24,7 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** The Privacy plugin service implementation. */
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginServiceImpl implements PrivacyPluginService {
private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginServiceImpl.class);

@ -20,7 +20,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorR
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class DisabledPrivacyRpcMethod implements JsonRpcMethod {
private final String methodName;

@ -27,7 +27,7 @@ import io.vertx.ext.auth.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class MultiTenancyRpcMethodDecorator implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(MultiTenancyRpcMethodDecorator.class);
private final JsonRpcMethod rpcMethod;

@ -18,7 +18,7 @@ import java.util.Optional;
import io.vertx.ext.auth.User;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class MultiTenancyUserUtil {
private static final String PRIVACY_USER_ID_CLAIM = "privacyUserId";
private static final String ENCLAVE_PRIVACY_PUBLIC_KEY_CLAIM = "privacyPublicKey";

@ -31,7 +31,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import java.util.List;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetFilterChanges implements JsonRpcMethod {
private final PrivacyController privacyController;

@ -31,7 +31,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import java.util.List;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetFilterLogs implements JsonRpcMethod {
private final PrivacyController privacyController;

@ -26,7 +26,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
import org.hyperledger.besu.ethereum.privacy.PrivacyController;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivUninstallFilter implements JsonRpcMethod {
private final FilterManager filterManager;

@ -23,7 +23,7 @@ import java.util.Optional;
import io.vertx.ext.auth.User;
@FunctionalInterface
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyIdProvider {
String getPrivacyUserId(Optional<User> user);

@ -48,7 +48,7 @@ import org.apache.tuweni.bytes.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class AbstractEeaSendRawTransaction implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(AbstractEeaSendRawTransaction.class);
private final TransactionPool transactionPool;

@ -16,7 +16,7 @@ package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class JsonRpcErrorResponseException extends RuntimeException {
private final RpcErrorType jsonRpcError;

@ -33,7 +33,7 @@ import java.util.Optional;
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PluginEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
private final PrivacyController privacyController;
private final PrivacyIdProvider privacyIdProvider;

@ -37,7 +37,7 @@ import java.util.Optional;
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class RestrictedFlexibleEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
private final PrivacyController privacyController;

@ -35,7 +35,7 @@ import java.util.Optional;
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class RestrictedOffchainEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
final PrivacyController privacyController;

@ -41,7 +41,7 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class AbstractPrivateTraceByHash implements JsonRpcMethod {
protected final Supplier<PrivateBlockTracer> blockTracerSupplier;

@ -33,7 +33,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivCall extends AbstractBlockParameterMethod {
private final PrivacyIdProvider privacyIdProvider;

@ -32,7 +32,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivCreatePrivacyGroup implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivCreatePrivacyGroup.class);

@ -39,7 +39,7 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDebugGetStateRoot extends AbstractBlockParameterMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivDebugGetStateRoot.class);

@ -32,7 +32,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDeletePrivacyGroup implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivDeletePrivacyGroup.class);

@ -48,7 +48,7 @@ import org.apache.tuweni.bytes.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDistributeRawTransaction implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivDistributeRawTransaction.class);

@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings("MockNotUsedInProduction")
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivFindPrivacyGroup implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivFindPrivacyGroup.class);

@ -28,7 +28,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import org.apache.tuweni.bytes.Bytes;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetCode extends AbstractBlockParameterMethod {
private final PrivacyController privacyController;

@ -42,7 +42,7 @@ import org.apache.tuweni.bytes.Bytes32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetEeaTransactionCount implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivGetEeaTransactionCount.class);

@ -38,7 +38,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetLogs implements JsonRpcMethod {
private final BlockchainQueries blockchainQueries;

@ -22,7 +22,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcRespon
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetPrivacyPrecompileAddress implements JsonRpcMethod {
private final Address privacyAddress;

@ -38,7 +38,7 @@ import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetPrivateTransaction implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivGetPrivateTransaction.class);

@ -34,7 +34,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetTransactionCount implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionCount.class);

@ -43,7 +43,7 @@ import org.apache.tuweni.bytes.Bytes32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetTransactionReceipt implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionReceipt.class);

@ -29,7 +29,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
import org.hyperledger.besu.ethereum.privacy.PrivacyController;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivNewFilter implements JsonRpcMethod {
private final FilterManager filterManager;

@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivTraceTransaction extends AbstractPrivateTraceByHash implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(TraceTransaction.class);

@ -20,7 +20,7 @@ import org.hyperledger.besu.ethereum.privacy.PrivacyController;
import java.util.Optional;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivUtil {
public static void checkMembershipForAuthenticatedUser(

@ -36,7 +36,7 @@ import graphql.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivxFindFlexiblePrivacyGroup implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(PrivxFindFlexiblePrivacyGroup.class);

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class CreatePrivacyGroupParameter {
private final List<String> addresses;

@ -46,7 +46,7 @@ import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFact
import java.util.Map;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivJsonRpcMethods extends PrivacyApiGroupJsonRpcMethods {
private final FilterManager filterManager;

@ -42,7 +42,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class PrivacyApiGroupJsonRpcMethods extends ApiGroupJsonRpcMethods {
private final BlockchainQueries blockchainQueries;

@ -34,7 +34,7 @@ import org.apache.tuweni.bytes.Bytes32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginPrecompiledContract extends PrivacyPrecompiledContract {
private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginPrecompiledContract.class);
private final PrivacyParameters privacyParameters;

@ -71,7 +71,7 @@ Calculated : ${currentHash}
tasks.register('checkAPIChanges', FileStateChecker) {
description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
files = sourceSets.main.allJava.files
knownHash = 'f6fi+lsYVZtFjmGOyiMPPCfNDie4SIPpj6HVgXRxF8Q='
knownHash = 'bULFOchupNjcCw+oZ4tykpgxzL4vsOTtDPimyiKGF98='
}
check.dependsOn('checkAPIChanges')

@ -26,7 +26,7 @@ import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFact
* optionally register a {@link PrivateMarkerTransactionFactory} and a {@link
* PrivacyGroupGenesisProvider}*
*/
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyPluginService extends BesuService {
/**

@ -25,7 +25,7 @@ import org.apache.tuweni.bytes.Bytes;
* Allows you to register a provider that will dictate how the payload of a privacy marker
* transaction is handled.
*/
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyPluginPayloadProvider {
/**

Loading…
Cancel
Save