Privacy rpcs through tx handler #243

jframe · 2019-12-09T03:12:43Z

PR description

Change privacy RPCs so they go through the privateTransactionHandler instead of directly to the enclave. This is necessary so that multi-tenancy validation rules can be added and done before the request is made to the enclave.

Fixed Issue(s)

…ad directly through the enclave Signed-off-by: Jason Frame <jasonwframe@gmail.com>

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on

More to come.

...yperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java

...er/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java

...yperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java

...edger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java

...rledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java

...dger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/SendTransactionResponse.java

...yperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on · 2019-12-17T23:03:20Z

enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java

        "/send",
        (statusCode, body) -> handleJsonResponse(statusCode, body, SendResponse.class));
  }

-  public ReceiveResponse receive(final ReceiveRequest content) {
+  public SendResponse sendBesu(


nit: sendBesu? you're sending Besu somewhere?

enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java

rain-on · 2019-12-17T23:06:14Z

enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java

-  public PrivacyGroup createPrivacyGroup(final CreatePrivacyGroupRequest content) {
+  public PrivacyGroup createPrivacyGroup(
+      final String[] addresses, final String from, final String name, final String description) {
+    final CreatePrivacyGroupRequest createPrivacyGroupRequest =


nit: does this need a "from"?

The Orion createPrivacyGroup request requires a from

rain-on · 2019-12-17T23:07:01Z

enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java

        "/createPrivacyGroup",
        (statusCode, body) -> handleJsonResponse(statusCode, body, PrivacyGroup.class));
  }

-  public String deletePrivacyGroup(final DeletePrivacyGroupRequest content) {
+  public String deletePrivacyGroup(final String privacyGroupId, final String from) {
+    DeletePrivacyGroupRequest deletePrivacyGroupRequest =


rain-on · 2019-12-17T23:08:04Z

enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java

        "/deletePrivacyGroup",
        (statusCode, body) -> handleJsonResponse(statusCode, body, String.class));
  }

-  public PrivacyGroup[] findPrivacyGroup(final FindPrivacyGroupRequest content) {
+  public PrivacyGroup[] findPrivacyGroup(final String[] addresses) {
+    final FindPrivacyGroupRequest findPrivacyGroupRequest = new FindPrivacyGroupRequest(addresses);


nit: here and elsewhere you can probably name the variable just request or content the extra naming isn't adding value in this context

rain-on · 2019-12-17T23:09:02Z

...rg/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/DisabledPrivacyMethod.java


-public abstract class PrivacyApiMethod implements JsonRpcMethod {
+public class DisabledPrivacyMethod implements JsonRpcMethod {


rename "DisabledPrivacyRpcMethod"?

...g/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacySendTransaction.java

rain-on · 2019-12-17T23:11:18Z

...g/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacySendTransaction.java

@@ -113,7 +108,7 @@ public JsonRpcResponse getResponse() {
    }
  }

-  protected interface AfterTransactionValid {
+  public interface AfterTransactionValid {


nit: could have a @FunctionalInterface
nit: Probably badly named, the class is just ResponseSupplier - which get USED if a Transaction is valid....

done. got rid of this and just used a supplier

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on · 2019-12-17T23:17:41Z

...erledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java

-    this.enclave = privacyParameters.getEnclave();
+  public PrivDeletePrivacyGroup(
+      final PrivacyParameters privacyParameters, final PrivacyController privacyController) {
+    this.privacyParameters = privacyParameters;


It looks like the privacy Params are ONLY required for the logging ... can it be removed?

rain-on · 2019-12-17T23:18:33Z

...er/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java

@@ -42,39 +46,30 @@ public String getName() {
  }

  @Override
-  public JsonRpcResponse doResponse(final JsonRpcRequestContext requestContext) {
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
    PrivateTransaction privateTransaction;


rain-on · 2019-12-17T23:19:05Z

...er/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java

-    super(privacyParameters, privateTransactionHandler, transactionPool);
+      final TransactionPool transactionPool, final PrivacyController privacyController) {
+    this.privacyController = privacyController;
+    this.privacySendTransaction = new PrivacySendTransaction(privacyController, transactionPool);


nit: this is a bit weak - i.e. surely this should not need a TransactionPool (given its only distributing)

...yperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java

rain-on · 2019-12-17T23:21:52Z

...besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java

 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.PrivacyParameters;

-public class PrivGetPrivacyPrecompileAddress extends PrivacyApiMethod {
+public class PrivGetPrivacyPrecompileAddress implements JsonRpcMethod {


nit: not your problem - but I wonder if this should have been a "ConstantResponseRpc" - which takes a name and a value .... maybe a more reusable concept.

Don't think there are any other APIs like this that I can see. Hopefully if one is added a ConstantResponseRpc can be added a reused for this and whatever we add.

rain-on · 2019-12-18T00:20:32Z

...in/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java

            privacyParameters, protocolSchedule.getChainId(), markerTransactionFactory);

-    return create(privateTransactionHandler);
+    return create(privacyController).entrySet().stream()


this seems to imply that all APIs are created, then on a one-by-one basis, they are replaced with "Disabled" ...
spose the nice thing is this class doesn't need to know which APIs exist, so new ones can be added "for free"...

Yes, it's not quite as efficient but it's much simpler in code and it ensures that all privacy APIs are handled in a uniform way. With the benefit that you just add a new privacy API and the disabling will just work.

rain-on · 2019-12-18T02:29:34Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java

-      return sendResponse.getKey();
+      final SendResponse sendResponse = sendRequest(privateTransaction);
+      final String enclaveKey = sendResponse.getKey();
+      if (privateTransaction.getPrivacyGroupId().isPresent()) {


nit: can we raise a ticket to determine the group directly from the txn - rather than uploading to enclave first?

I think would form part of https://jira.hyperledger.org/browse/BESU-156 which will do the validation before sending to the enclave. Perhaps it might need to a seperate ticket though.

rain-on · 2019-12-18T02:31:07Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java

@@ -173,4 +178,38 @@ public long getSenderNonce(final Address sender, final String privacyGroupId) {
            // private state does not exist
            Account.DEFAULT_NONCE);
  }
+
+  private SendResponse sendRequest(final PrivateTransaction privateTransaction) {
+    final BytesValueRLPOutput bvrlp = new BytesValueRLPOutput();


should just be an RlpOutput object (newed as a BytesValueRlpOutput) - and probalby needs a nicer name - even its its just rlpOutput

rain-on · 2019-12-18T02:41:49Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java

+      if (privateFor.isEmpty()) {
+        privateFor.add(BytesValues.asBase64String(privateTransaction.getPrivateFrom()));
+      }
+      return enclave.sendLegacy(


can sendLegacy just be "send" - the params should identify what's happening (then we can hide legacy/pantheon style from the API)

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/SendTransactionResponse.java

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on · 2019-12-18T22:57:26Z

enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java

  private final String from;
  private final String name;
  private final String description;

  @JsonCreator
  public CreatePrivacyGroupRequest(
-      @JsonProperty("addresses") final String[] addresses,
+      @JsonProperty("addresses") final List<String> addresses,


does this work? I'm assuming we used an array originally because of some reason ..? (I prefer the list ... just want to make sure)

Jackson will automatically serialise/deserialise lists for us. And some of the privacy requests were using lists as well.

rain-on · 2019-12-18T23:02:04Z

...ledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java

-  public void invalidTransactionIsSentToTransactionPool() {
-    when(privateTxHandler.sendTransaction(any(PrivateTransaction.class)))
+  public void invalidTransactionIsNotSentToTransactionPool() {
+    when(privateController.sendTransaction(any(PrivateTransaction.class)))


nit/YMMV: private or privacyController?

that should be privacyController. done

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

…h Enclave (hyperledger#243) Signed-off-by: Jason Frame <jasonwframe@gmail.com>

…h Enclave (hyperledger#243) Signed-off-by: Jason Frame <jasonwframe@gmail.com> Signed-off-by: edwardmack <ed@edwardmack.com>

`oneOf` fails to match when block txs is empty

jframe added 5 commits December 6, 2019 11:37

Change privacy RPCs to go through the privateTransactionHandler inste…

ccaa624

…ad directly through the enclave Signed-off-by: Jason Frame <jasonwframe@gmail.com>

remove enclave usage

da0e980

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

privacy group unit tests

7e66c79

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

nonce unit tests

5565b25

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fix PrivGetPrivateTransaction IT

39bb81b

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

jframe marked this pull request as ready for review December 9, 2019 04:53

jframe requested review from mark-terry and rain-on December 9, 2019 04:54

rain-on reviewed Dec 9, 2019

View reviewed changes

...dger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java Outdated Show resolved Hide resolved

...dger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java Outdated Show resolved Hide resolved

jframe added 6 commits December 11, 2019 10:25

rename privateTransactionHandler to privacyController

a400c0b

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

return the privacy group id as part of the transaction response

5037aa5

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fix privacyController unit test

f2d1f6e

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fix unit tests

d6a0337

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rename PrivacyTransactionResponse to PrivacySendResponse

8a14fb4

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rename PrivacySendResponse to SendTransactionResponse

1e02641

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

CjHare reviewed Dec 12, 2019

View reviewed changes

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java Outdated Show resolved Hide resolved

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java Outdated Show resolved Hide resolved

Merge branch 'master' into privacy_rpcs_through_tx_handler

bf44591

rain-on reviewed Dec 12, 2019

View reviewed changes

jframe added 11 commits December 12, 2019 14:37

remove PrivacyApiMethod base class

60457ac

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

clean up logs

ad0fc8c

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

PR changes

b26e653

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

PR changes - push enclave request types into Enclave

e80d116

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing build

7101f15

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing build

190111b

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing integration test

e45618d

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing build

7053b38

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing integration test

29f3db0

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

fixing integration test

d435c8f

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

move privacy disabling handler to abstract class

1441b2e

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

jframe added 3 commits December 13, 2019 09:02

include header

f6de80f

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

remove raw type

558654e

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

Merge branch 'master' into privacy_rpcs_through_tx_handler

538616e

rain-on reviewed Dec 17, 2019

View reviewed changes

fix ut after merge

f521f02

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on reviewed Dec 18, 2019

View reviewed changes

jframe added 6 commits December 18, 2019 14:50

PR changes

3b6e5d7

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

PR changes

28ce2a8

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

spotless

8d90d4e

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

PR changes

f6da4b7

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

Merge branch 'master' into privacy_rpcs_through_tx_handler

d9d6b36

fix integration test

1d8f40d

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on reviewed Dec 18, 2019

View reviewed changes

pr changes

e03180a

Signed-off-by: Jason Frame <jasonwframe@gmail.com>

rain-on approved these changes Dec 18, 2019

View reviewed changes

jframe added 2 commits December 19, 2019 09:23

Merge branch 'master' into privacy_rpcs_through_tx_handler

1b09dcd

Merge branch 'master' into privacy_rpcs_through_tx_handler

bb17494

jframe merged commit a0e8714 into hyperledger:master Dec 19, 2019

jframe deleted the privacy_rpcs_through_tx_handler branch December 19, 2019 00:47

edwardmack pushed a commit to ChainSafe/besu that referenced this pull request Feb 4, 2020

Privacy rpcs to go through privacy controller instead directly throug…

bba46db

…h Enclave (hyperledger#243) Signed-off-by: Jason Frame <jasonwframe@gmail.com>

siladu pushed a commit to siladu/besu that referenced this pull request Oct 28, 2024

Merge pull request hyperledger#243 from lightclient/fix-empty-txs

797b2ab

`oneOf` fails to match when block txs is empty

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Privacy rpcs through tx handler #243

Privacy rpcs through tx handler #243

jframe commented Dec 9, 2019 •

edited

Loading

rain-on left a comment

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 17, 2019

jframe Dec 18, 2019

rain-on Dec 18, 2019

jframe Dec 18, 2019

rain-on Dec 18, 2019

jframe Dec 18, 2019

rain-on Dec 18, 2019

jframe Dec 18, 2019

rain-on Dec 18, 2019

rain-on Dec 18, 2019

jframe Dec 18, 2019

rain-on Dec 18, 2019

jframe Dec 18, 2019


		public abstract class PrivacyApiMethod implements JsonRpcMethod {
		public class DisabledPrivacyMethod implements JsonRpcMethod {

Privacy rpcs through tx handler #243

Privacy rpcs through tx handler #243

Conversation

jframe commented Dec 9, 2019 • edited Loading

PR description

Fixed Issue(s)

rain-on left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jframe commented Dec 9, 2019 •

edited

Loading