Validate private transaction before sending to enclave #356

jframe · 2020-02-03T01:12:11Z

PR description

This changes the privacy send transaction RPCs eea_sendRawTransaction and priv_distrubuteRawTransaction to validate transactions before they send to the enclave or added to the transaction pool. Currently some lightweight validation is done after receiving the transaction, it is then sent to the enclave, and then it is validated. This changes it processing so the validation happens before sending to the enclave.

Because the validation now happens before sending to the enclave the privacy group for EEA private transactions must be calculated up front instead using the privacy group id returned from the Enclave. This PR uses web3j to do calculate the privacy group id for these transactions.

Fixed Issue(s)

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

ethereum/api/build.gradle

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

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

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

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

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

...um/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java

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

pinges · 2020-02-07T04:55:22Z

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

+
+public class PrivacyGroupUtil {
+
+  public static String generateEeaPrivacyGroupId(


generate does not sound right for me. Maybe calculateEeaPrivacyGroupId?

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

* Plugin error stack traces (hyperledger#369) Because of how the Log4J2 api works exception stack traces were not being printed. Update to use the explicit "throwable" overloaded methods. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * VM Trace fixes (hyperledger#372) * correct refund addresses * correct returned memory from static precompiled calls. * update integration test * precompiles sometimes get plain old CALLs Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * Validate private transaction before sending to enclave (hyperledger#356) Signed-off-by: Jason Frame <jasonwframe@gmail.com> * Trace API fixes (hyperledger#377) - Correct Reporting of reverts in nested call - correct reporting and handling of value transfer in nested calls - correct handling of precompiles via DELEGATECALL & CALLCODE - Addition of precompiled contract gas costs - Re-work handling of storage writes - Initial handling of gas refunds - fix bug in DELEGATECALL tests, we don't need gas in the stack * this has a cascading effect on balances in diff tests - rework depth detection in flat trace - two new tests blocks Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * [BOUNTY-2] Add NAT Docker Support (hyperledger#368) * add docker detection Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * add port mapping detection Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * add tests and refactor ip detection Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * clean RunnerBuilder Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * clean useless modification Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * spotless Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * resolve tests issues Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * streamline auto detection Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com> Co-authored-by: Abdelhamid Bakhta <45264458+abdelhamidbakhta@users.noreply.github.com> Co-authored-by: Ratan Rai Sur <ratan.r.sur@gmail.com> * [PIE-1798] Priv RPC acceptance tests with stub enclave. (hyperledger#330) * [PIE-1798] Added some Privacy RPC ATs with a stub enclave. Signed-off-by: Mark Terry <mark.terry@consensys.net> * More specific task metrics names (hyperledger#389) A prior refactoring had accidentally removed the specific task names from the metrics labels. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * More trace fixes (hyperledger#386) * pop flat trace context when handling halts * Better detection of precompiled and non-executed contracts * correct from address when calling in init code * fix some exotic nesting cases * correct from field for init code calls at depth >1 * correct cost on a non-call * changelog and notes Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * adding the plugin-api javadoc jar at the root level (hyperledger#378) Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net> * BESU-56: remove erroneous links to errorprone checks (hyperledger#385) Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com> * Changelog entry for multi-tenancy feature (hyperledger#394) Signed-off-by: Edward Evans <edward.joshua.evans@gmail.com> Signed-off-by: Jason Frame <jasonwframe@gmail.com> * 1.5 RC Changelog (hyperledger#395) * 1.5 RC changelog additions Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> * Fixed link (hyperledger#393) Signed-off-by: Madeline <madeline.murray@consensys.net> Co-authored-by: Edward <edjojob@gmail.com> * docker changelog (hyperledger#391) * docker changelog Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com> * address comments Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com> Co-authored-by: MadelineMurray <43356962+MadelineMurray@users.noreply.github.com> * Added known bug to changelog (hyperledger#388) * Added known bug Signed-off-by: Madeline <madeline.murray@consensys.net> * Added another known bug Signed-off-by: Madeline <madeline.murray@consensys.net> * updating version to 1.4.0-rc1 (hyperledger#397) Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net> * updating verion to 1.4.1-snapshot (hyperledger#398) Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net> * [BESU-169] cache logs bloom filters automatically. (hyperledger#367) * First iteration. Draft PR. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * fix SPDX header Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Use block broadcaster to index log bloom. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Remove useless toString method Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * spotless apply Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * cacheLogsBloomForBlockHeader Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * spotless apply Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * ensurePreviousSegmentsArePresent Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Added CLI flag to enable / disable automatic logs bloom indexing. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Create cache directory and cache file if not exist. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Fix acceptance test Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Write cache for block only if block is new canonical head. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Handling of chain reorg. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * fix Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * sportless apply Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Address PR comments. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Remove unused constant. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * spotless apply Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * [BESU-25] Use Devp2p Ping packets at v5 (hyperledger#392) Broadcast that we support snappy compression Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * Rename logs bloom indexer to log bloom cache to match CLI flag. (hyperledger#401) Changes class names, variables, and CLI flags as needed. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * [PIE-1798] Fail cases for multitenancy ATs (hyperledger#400) Signed-off-by: Mark Terry <mark.terry@consensys.net> * Private state update metadata and migration (hyperledger#404) (backport from release-1.4) Private state update metadata and migration Signed-off-by: Lucas Saldanha <lucas.saldanha@consensys.net> * [PIE-2303] Automatic log bloom caching - Remove usage of pending file. (hyperledger#407) * Don't use pending file. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Don't use pending file. Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Create a custom error when plugin is not found. (hyperledger#409) Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net> * Rename method (hyperledger#412) * rename the method isPersistingState to isPersistingPrivateState because that is what it is used for Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net> * rename the method isPersistingState to isPersistingPrivateState because that is what it is used for Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net> * rename the method isPersistingState to isPersistingPrivateState because that is what it is used for Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net> * [BOUNTY-4] Add NAT Kubernetes Support (hyperledger#410) * add kubernetes support Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * fix review issues Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * LogBloomCache - make sure the current segment is filled (hyperledger#411) Make sure we cache the current cache segment with all of the data from the beginning of the segment. Use a flip file approach since it will be a partial file until done. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> Co-authored-by: Abdelhamid Bakhta <45264458+abdelhamidbakhta@users.noreply.github.com> * Reduce recaching in Transaction Log Bloom Filter Cache (hyperledger#415) Do a cursory cache check at start up (file is present and correct size) instead of re-generating the cache at startup. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * fix order of nat detector (hyperledger#414) Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator (#23) (hyperledger#382) * Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator Change SLOAD_GAS cost in Aztlan Gas Calculator from 800 to 200 and update functions that use SLOAD_GAS. Signed-off-by: edwardmack <ed@edwardmack.com> * Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator Change SLOAD_GAS cost in Aztlan Gas Calculator from 800 to 200 and update functions that use SLOAD_GAS. Signed-off-by: edwardmack <ed@edwardmack.com> Signed-off-by: Edward Mack <ed@edwardmack.com> * remove overrides removed overrides of calculateStorageCost and calculateStorageRefundAmount in AztlanGasCalculator because these were causing aztlan fork not to sync with kotti testnet. Signed-off-by: Edward Mack <ed@edwardmack.com> * merge Signed-off-by: Edward Mack <ed@edwardmack.com> * Remove unused ExecutorService init/termination (hyperledger#419) Signed-off-by: Horacio Mijail Anton Quiles <hmijail@gmail.com> Co-authored-by: CJ Hare <CjHare@users.noreply.github.com> * Implement Eth/64 (hyperledger#425) Wire in the fork identifier into the status messages as Eth64. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com> * Adds priv_getcode (hyperledger#428) * Adds priv_getcode Signed-off-by: Joshua Richardson <joshua@richardson.tech> * BESU-146 - check if success and return errorResponse otherwise (hyperledger#424) Signed-off-by: Anthony Buckle <anthonybuckle@gmail.com> Co-authored-by: CJ Hare <CjHare@users.noreply.github.com> * fixed typos (hyperledger#429) Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> Co-authored-by: CJ Hare <CjHare@users.noreply.github.com> * roll back on ALL-CAPS.md files for TSC proposal (hyperledger#376) Signed-off-by: Felipe Faraggi <felipefaraggi@gmail.com> * updating the changelog with 1.4.0 details (hyperledger#431) Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net> * [BESU-194] Remove max pivot block resets during fast sync (hyperledger#427) * remove max pivot block resets during fast sync * increase max retry number and fix test * change logs in the handleFailure method * change logs related to suspicious number of retries Signed-off-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: Danno Ferrin <danno.ferrin@shemnon.com> Co-authored-by: Jason Frame <jasonwframe@gmail.com> Co-authored-by: Karim T. <karim.t2am@gmail.com> Co-authored-by: Abdelhamid Bakhta <45264458+abdelhamidbakhta@users.noreply.github.com> Co-authored-by: Ratan Rai Sur <ratan.r.sur@gmail.com> Co-authored-by: mark-terry <36909937+mark-terry@users.noreply.github.com> Co-authored-by: Joshua Fernandes <joshua.fernandes@consensys.net> Co-authored-by: Antoine Toulme <atoulme@users.noreply.github.com> Co-authored-by: Sally MacFarlane <sally.macfarlane@consensys.net> Co-authored-by: MadelineMurray <43356962+MadelineMurray@users.noreply.github.com> Co-authored-by: Edward <edjojob@gmail.com> Co-authored-by: Lucas Saldanha <lucascrsaldanha@gmail.com> Co-authored-by: pinges <16143240+pinges@users.noreply.github.com> Co-authored-by: Horacio Mijail Antón Quiles <4139546+hmijail@users.noreply.github.com> Co-authored-by: CJ Hare <CjHare@users.noreply.github.com> Co-authored-by: anthonybuckle <anthonybuckle@gmail.com> Co-authored-by: Felipe Faraggi <felipefaraggi@gmail.com>

jframe added 16 commits January 24, 2020 14:19

validate private transactions before sending to enclave

70c6100

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

spotless

0269a17

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

fix PrivDistributeRawTransaction UT

c7eeecc

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

wip

06f02f5

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

unit tests

08f8fb3

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

Merge branch 'master' into validate_private_tx_before_enclave

2f3ee18

small refactoring changes

d6b7217

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

privateTransactionValidator tests

e8129df

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

renaming some methods

f9e321f

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

private send tx ut

8aa4f99

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

cleanup ut

c0f0b58

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

rename uts

e2c4c8b

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

Merge branch 'master' into validate_private_tx_before_enclave

ffb9131

add license header

15d0c9b

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

fix ut: wip

2137620

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

fix ut

265b38a

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

rain-on reviewed Feb 3, 2020

View reviewed changes

jframe added 7 commits February 4, 2020 12:31

remove privacy send transaction helper class

7e18b95

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

spotless

237b109

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

fix unit test

3c481bd

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

besu implementation of eea privacy group generation

c137981

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

license header & finals

9fe45d5

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

fix bug in privacy group duplicate handling

9d3fec5

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

rename method

c886a63

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

rain-on reviewed Feb 6, 2020

View reviewed changes

jframe added 4 commits February 6, 2020 14:11

rename test variables

3dc38aa

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

reuse request id in rpcs

7714111

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

include transaction hash on debug logs

e8a978d

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

move privacyGroup calculation onto PrivateTransaction

cbd1c21

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

rain-on approved these changes Feb 7, 2020

View reviewed changes

Merge branch 'master' into validate_private_tx_before_enclave

adfdc6c

pinges reviewed Feb 7, 2020

View reviewed changes

jframe added 2 commits February 7, 2020 16:32

rename generateEeaPrivacyGroupId -> calculateEeaPrivacyGroupId

3ede57d

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

Merge branch 'master' into validate_private_tx_before_enclave

10534ee

jframe merged commit 9b35c3b into hyperledger:master Feb 10, 2020

jframe deleted the validate_private_tx_before_enclave branch February 10, 2020 01:02

jframe mentioned this pull request Feb 12, 2020

1.5 RC Changelog #395

Merged

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

Changed storage proof array title to be plural (hyperledger#356)

f28aa40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Validate private transaction before sending to enclave #356

Validate private transaction before sending to enclave #356

jframe commented Feb 3, 2020 •

edited

Loading

pinges Feb 7, 2020

jframe Feb 7, 2020


		public class PrivacyGroupUtil {

		public static String generateEeaPrivacyGroupId(

Validate private transaction before sending to enclave #356

Validate private transaction before sending to enclave #356

Conversation

jframe commented Feb 3, 2020 • edited Loading

PR description

Fixed Issue(s)

pinges Feb 7, 2020

Choose a reason for hiding this comment

jframe Feb 7, 2020

Choose a reason for hiding this comment

jframe commented Feb 3, 2020 •

edited

Loading