Priv call

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java

@@ -72,7 +72,7 @@ public String execute(final NodeRequests node) {
               encodedFunction,
               null)
           .getTransactionHash();
-    } catch (IOException e) {
+    } catch (final IOException e) {
       throw new RuntimeException(e);
     }
   }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivCallAcceptanceTest.java

@@ -0,0 +1,244 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.web3j.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.Before;
+import org.junit.Test;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
+import org.web3j.abi.datatypes.generated.Uint256;
+import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.EthCall;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.protocol.exceptions.ClientConnectionException;
+import org.web3j.protocol.http.HttpService;
+import org.web3j.tx.Contract;
+
+public class PrivCallAcceptanceTest extends PrivacyAcceptanceTestBase {
+
+  private static final long POW_CHAIN_ID = 2018;
+  private static final int VALUE = 1024;
+
+  private PrivacyNode minerNode;
+
+  @Before
+  public void setUp() throws Exception {
+    minerNode =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            "miner-node", privacyAccountResolver.resolve(0));
+    privacyCluster.start(minerNode);
+  }
+
+  @Test
+  public void mustReturnCorrectValue() throws Exception {
+
+    final String privacyGroupId =
+        minerNode.execute(
+            privacyTransactions.createPrivacyGroup(
+                "myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                POW_CHAIN_ID,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, false, false);
+
+    EthCall resp = priv_call.send();
+
+    String value = resp.getValue();
+    assertThat(new BigInteger(value.substring(2), 16)).isEqualByComparingTo(BigInteger.ZERO);
+
+    final TransactionReceipt receipt = eventEmitter.store(BigInteger.valueOf(VALUE)).send();
+    assertThat(receipt).isNotNull();
+
+    resp = priv_call.send();
+    value = resp.getValue();
+    assertThat(new BigInteger(value.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(VALUE));
+  }
+
+  @Test
+  public void mustNotSucceedWithNonExistingPrivacyGroup() {
+
+    final String privacyGroupId =
+        minerNode.execute(
+            privacyTransactions.createPrivacyGroup(
+                "myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                POW_CHAIN_ID,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    System.out.println("Address: " + eventEmitter.getContractAddress());
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final String invalidPrivacyGroup = constructInvalidString(privacyGroupId);
+    final Request<Object, EthCall> priv_call =
+        privCall(invalidPrivacyGroup, eventEmitter, false, false);
+
+    assertThatExceptionOfType(ClientConnectionException.class)
+        .isThrownBy(() -> priv_call.send())
+        .withMessageContaining("Privacy group does not exist.");
+  }
+
+  @Test
+  public void mustNotSucceedWithWronglyEncodedFunction() {
+
+    final String privacyGroupId =
+        minerNode.execute(
+            privacyTransactions.createPrivacyGroup(
+                "myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                POW_CHAIN_ID,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, true, false);
+
+    assertThatExceptionOfType(ClientConnectionException.class)
+        .isThrownBy(() -> priv_call.send())
+        .withMessageContaining("Invalid params");
+  }
+
+  @Test
+  public void mustReturn0xUsingInvalidContractAddress() throws IOException {
+
+    final String privacyGroupId =
+        minerNode.execute(
+            privacyTransactions.createPrivacyGroup(
+                "myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                POW_CHAIN_ID,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, false, true);
+
+    final EthCall result = priv_call.send();
+
+    assertThat(result).isNotNull();
+    assertThat(result.getResult()).isEqualTo("0x");
+  }
+
+  @NotNull
+  private String constructInvalidString(final String privacyGroupId) {
+    final char[] chars = privacyGroupId.toCharArray();
+    if (chars[3] == '0') {
+      chars[3] = '1';
+    } else {
+      chars[3] = '0';
+    }
+    return String.valueOf(chars);
+  }
+
+  @NotNull
+  private Request<Object, EthCall> privCall(
+      final String privacyGroupId,
+      final Contract eventEmitter,
+      final boolean useInvalidParameters,
+      final boolean useInvalidContractAddress) {
+
+    final Uint256 invalid = new Uint256(BigInteger.TEN);
+
+    @SuppressWarnings("rawtypes")
+    final List<Type> inputParameters =
+        useInvalidParameters ? Arrays.asList(invalid) : Collections.emptyList();
+
+    final Function function =
+        new Function(
+            "value",
+            inputParameters,
+            Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
+
+    final String encoded = FunctionEncoder.encode(function);
+
+    final HttpService httpService =
+        new HttpService(
+            "http://"
+                + minerNode.getBesu().getHostName()
+                + ":"
+                + minerNode.getBesu().getJsonRpcSocketPort().get());
+
+    final String validContractAddress = eventEmitter.getContractAddress();
+    final String invalidContractAddress = constructInvalidString(validContractAddress);
+    final String contractAddress =
+        useInvalidContractAddress ? invalidContractAddress : validContractAddress;
+
+    final Transaction transaction =
+        Transaction.createEthCallTransaction(null, contractAddress, encoded);
+
+    return new Request<>(
+        "priv_call",
+        Arrays.asList(privacyGroupId, transaction, "latest"),
+        httpService,
+        EthCall.class);
+  }
+}

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java

@@ -47,7 +47,9 @@
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -98,6 +100,11 @@ public Map<String, JsonRpcMethod> methods() {
     final WebSocketConfiguration webSocketConfiguration = mock(WebSocketConfiguration.class);
     final MetricsConfiguration metricsConfiguration = mock(MetricsConfiguration.class);
 
+    final List<RpcApi> apis = new ArrayList<>();
+    apis.add(RpcApis.ETH);
+    apis.add(RpcApis.NET);
+    apis.add(RpcApis.WEB3);
+    apis.add(RpcApis.PRIV);
     return new JsonRpcMethodsFactory()
         .methods(
             CLIENT_VERSION,
@@ -114,7 +121,7 @@ public Map<String, JsonRpcMethod> methods() {
             new HashSet<>(),
             accountWhitelistController,
             nodeWhitelistController,
-            RpcApis.DEFAULT_JSON_RPC_APIS,
+            apis,
             privacyParameters,
             jsonRpcConfiguration,
             webSocketConfiguration,

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java

@@ -43,6 +43,8 @@ public static JsonRpcError convertTransactionInvalidReason(
         return JsonRpcError.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE;
       case GAS_PRICE_TOO_LOW:
         return JsonRpcError.GAS_PRICE_TOO_LOW;
+      case PRIVACY_GROUP_DOES_NOT_EXIST:
+        return JsonRpcError.PRIVACY_GROUP_DOES_NOT_EXIST;
 
       default:
         return JsonRpcError.INVALID_PARAMS;

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java

@@ -36,6 +36,7 @@ public enum RpcMethod {
   DEBUG_TRACE_BLOCK_BY_HASH("debug_traceBlockByHash"),
   DEBUG_TRACE_BLOCK_BY_NUMBER("debug_traceBlockByNumber"),
   DEBUG_TRACE_TRANSACTION("debug_traceTransaction"),
+  PRIV_CALL("priv_call"),
   PRIV_GET_PRIVATE_TRANSACTION("priv_getPrivateTransaction"),
   PRIV_GET_TRANSACTION_COUNT("priv_getTransactionCount"),
   PRIV_GET_PRIVACY_PRECOMPILE_ADDRESS("priv_getPrivacyPrecompileAddress"),

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java

@@ -27,7 +27,7 @@
 
 public abstract class AbstractBlockParameterMethod implements JsonRpcMethod {
 
-  private final Supplier<BlockchainQueries> blockchainQueries;
+  protected final Supplier<BlockchainQueries> blockchainQueries;
 
   protected AbstractBlockParameterMethod(final BlockchainQueries blockchainQueries) {
     this(Suppliers.ofInstance(blockchainQueries));