tests passing after rebase with Lucas branch

Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net>

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java

@@ -85,7 +85,8 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       final Optional<Bytes> maybePrivacyGroupId = privateTransaction.getPrivacyGroupId();
 
       final Optional<PrivacyGroup> maybePrivacyGroup =
-          findPrivacyGroup(maybePrivacyGroupId, enclavePublicKey, privateTransaction);
+          findPrivacyGroup(
+              privacyController, maybePrivacyGroupId, enclavePublicKey, privateTransaction);
 
       final ValidationResult<TransactionInvalidReason> validationResult =
           privacyController.validatePrivateTransaction(privateTransaction, enclavePublicKey);
@@ -95,14 +96,15 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
             id, convertTransactionInvalidReason(validationResult.getInvalidReason()));
       }
 
-      final Transaction privacyMarkerTransaction =
-          createPMT(privateTransaction, maybePrivacyGroup, maybePrivacyGroupId, enclavePublicKey);
-
-      return transactionPool
-          .addLocalTransaction(privacyMarkerTransaction)
-          .either(
-              () -> new JsonRpcSuccessResponse(id, privacyMarkerTransaction.getHash().toString()),
-              errorReason -> getJsonRpcErrorResponse(id, errorReason));
+      final JsonRpcResponse ret =
+          createPMTAndAddToTxPool(
+              id,
+              privateTransaction,
+              maybePrivacyGroup,
+              maybePrivacyGroupId,
+              enclavePublicKey,
+              Address.DEFAULT_PRIVACY);
+      return ret;
 
     } catch (final JsonRpcErrorResponseException e) {
       return new JsonRpcErrorResponse(id, e.getJsonRpcError());
@@ -115,6 +117,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
   }
 
   Optional<PrivacyGroup> findPrivacyGroup(
+      final PrivacyController privacyController,
       final Optional<Bytes> maybePrivacyGroupId,
       final String enclavePublicKey,
       final PrivateTransaction privateTransaction) {
@@ -123,15 +126,23 @@ Optional<PrivacyGroup> findPrivacyGroup(
     return maybePrivacyGroup;
   }
 
-  Transaction createPMT(
+  JsonRpcResponse createPMTAndAddToTxPool(
+      final Object id,
       final PrivateTransaction privateTransaction,
       final Optional<PrivacyGroup> maybePrivacyGroup,
       final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey) {
+      final String enclavePublicKey,
+      final Address privacyPrecompileAddress) {
     final String privateTransactionLookupId =
         privacyController.sendTransaction(privateTransaction, enclavePublicKey, maybePrivacyGroup);
-    return privacyController.createPrivacyMarkerTransaction(
-        privateTransactionLookupId, privateTransaction, Address.DEFAULT_PRIVACY);
+    final Transaction privacyMarkerTransaction =
+        privacyController.createPrivacyMarkerTransaction(
+            privateTransactionLookupId, privateTransaction, privacyPrecompileAddress);
+    return transactionPool
+        .addLocalTransaction(privacyMarkerTransaction)
+        .either(
+            () -> new JsonRpcSuccessResponse(id, privacyMarkerTransaction.getHash().toString()),
+            errorReason -> getJsonRpcErrorResponse(id, errorReason));
   }
 
   JsonRpcErrorResponse getJsonRpcErrorResponse(

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/JsonRpcErrorResponseException.java

@@ -20,9 +20,9 @@ public class JsonRpcErrorResponseException extends RuntimeException {
 
   private final JsonRpcError jsonRpcError;
 
-  public JsonRpcErrorResponseException(final JsonRpcError error) {
+  public JsonRpcErrorResponseException(final JsonRpcError onchainPrivacyGroupIdNotAvailable) {
     super();
-    this.jsonRpcError = error;
+    this.jsonRpcError = onchainPrivacyGroupIdNotAvailable;
   }
 
   public JsonRpcError getJsonRpcError() {

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransaction.java

@@ -17,8 +17,11 @@
 import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOnchainPrivacyGroup;
 
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
@@ -39,8 +42,14 @@ public OnChainEeaSendRawTransaction(
     super(transactionPool, privacyController, enclavePublicKeyProvider);
   }
 
+  @Override
+  public String getName() {
+    return RpcMethod.EEA_SEND_RAW_TRANSACTION.getMethodName();
+  }
+
   @Override
   Optional<PrivacyGroup> findPrivacyGroup(
+      final PrivacyController privacyController,
       final Optional<Bytes> maybePrivacyGroupId,
       final String enclavePublicKey,
       final PrivateTransaction privateTransaction) {
@@ -57,22 +66,29 @@ Optional<PrivacyGroup> findPrivacyGroup(
   }
 
   @Override
-  Transaction createPMT(
+  JsonRpcResponse createPMTAndAddToTxPool(
+      final Object id,
       final PrivateTransaction privateTransaction,
       final Optional<PrivacyGroup> maybePrivacyGroup,
       final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey) {
+      final String enclavePublicKey,
+      final Address privacyPrecompiledAddress) {
+    final Bytes privacyGroupId = maybePrivacyGroupId.get();
     final String privateTransactionLookupId =
         privacyController.sendTransaction(privateTransaction, enclavePublicKey, maybePrivacyGroup);
-    final Bytes privacyGroupId =
-        maybePrivacyGroupId.get(); // exists, as it has been checked in findPrivacyGroup
     final Optional<String> addPayloadPrivateTransactionLookupId =
         privacyController.buildAndSendAddPayload(
             privateTransaction, Bytes32.wrap(privacyGroupId), enclavePublicKey);
-    return privacyController.createPrivacyMarkerTransaction(
-        buildCompoundLookupId(privateTransactionLookupId, addPayloadPrivateTransactionLookupId),
-        privateTransaction,
-        Address.ONCHAIN_PRIVACY);
+    final Transaction privacyMarkerTransaction =
+        privacyController.createPrivacyMarkerTransaction(
+            buildCompoundLookupId(privateTransactionLookupId, addPayloadPrivateTransactionLookupId),
+            privateTransaction,
+            Address.ONCHAIN_PRIVACY);
+    return transactionPool
+        .addLocalTransaction(privacyMarkerTransaction)
+        .either(
+            () -> new JsonRpcSuccessResponse(id, privacyMarkerTransaction.getHash().toString()),
+            errorReason -> getJsonRpcErrorResponse(id, errorReason));
   }
 
   private String buildCompoundLookupId(

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java

@@ -49,6 +49,7 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -232,6 +233,24 @@ public void validTransactionPrivacyGroupIsSentToTransactionPool() {
     verify(transactionPool).addLocalTransaction(any(Transaction.class));
   }
 
+
+  @Test
+  public void eeaTransactionFailsWhenOnchainPrivacyGroupFeatureIsEnabled() {
+    method =
+        new OnChainEeaSendRawTransaction(
+            transactionPool, privacyController, enclavePublicKeyProvider);
+
+    final JsonRpcRequestContext request = getJsonRpcRequestContext();
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            request.getRequest().getId(), JsonRpcError.ONCHAIN_PRIVACY_GROUP_ID_NOT_AVAILABLE);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+  }
+
   private JsonRpcRequestContext getJsonRpcRequestContext() {
     return new JsonRpcRequestContext(
         new JsonRpcRequest(
@@ -240,7 +259,7 @@ private JsonRpcRequestContext getJsonRpcRequestContext() {
   }
 
   @Test
-  public void transactionFailsIfPrivacyGroupDoesNotExist() {
+  public void onChainPrivacyGroupTransactionFailsWhenFeatureIsNotEnabled() {
     method =
         new EeaSendRawTransaction(transactionPool, privacyController, enclavePublicKeyProvider);