Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Private Log Filters track enclavePublicKey and are removed when user removed from group #1298

Merged
merged 28 commits into from
Aug 21, 2020
Merged

Private Log Filters track enclavePublicKey and are removed when user removed from group #1298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1235ac9
added isRemovalTransaction
macfarla Aug 12, 2020
419bda7
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 12, 2020
4194532
draft of processing Private Tx Event
macfarla Aug 12, 2020
deebbfa
typo
macfarla Aug 12, 2020
edf2766
added enclavePublicKey to private log filter
macfarla Aug 12, 2020
671385b
draft removal event
macfarla Aug 12, 2020
da085c8
final params
macfarla Aug 12, 2020
553f7bb
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 13, 2020
dd8cf37
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 17, 2020
4a38db3
moved logic for checking group removal tx
macfarla Aug 18, 2020
cce49cc
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 18, 2020
6e7d05e
wire up event subscription
macfarla Aug 18, 2020
1750580
spdx header
macfarla Aug 18, 2020
fc1edfb
added param to javadoc
macfarla Aug 18, 2020
6454b3f
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 18, 2020
7cd819b
fixed todo's
macfarla Aug 19, 2020
ef68048
removed unnecessary blank line
macfarla Aug 19, 2020
7ef2528
merge
macfarla Aug 19, 2020
0705291
create event with removed user not tx sender
macfarla Aug 19, 2020
8bb848a
formatting
macfarla Aug 19, 2020
d2f6ce5
get removed participant from tx payload
macfarla Aug 20, 2020
5009793
final param
macfarla Aug 20, 2020
bdcc174
cleanup
macfarla Aug 20, 2020
65edf1e
Merge branch 'master' of https://github.com/hyperledger/besu into mul…
macfarla Aug 20, 2020
5c5baa0
only set up filtermanager to listen for group removals if multi-tenan…
macfarla Aug 20, 2020
b2a2dd6
simplified similar variable names
macfarla Aug 20, 2020
6e41ca4
store removal events and process with addBlockEvent
macfarla Aug 20, 2020
7b03933
simplify getting param
macfarla Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
typo 
Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
  • Loading branch information
@macfarla
macfarla committed Aug 12, 2020
commit deebbfafaa649ddbaf66e219331a83305b967834
2 changes: 1 addition & 1 deletion ...rledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
&& !privacyController.isGroupAdditionTransaction(privateTransaction)) {
return new JsonRpcErrorResponse(id, JsonRpcError.ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
}
} else { // !onchainPirvacyGroupEnabled
} else { // !onchainPrivacyGroupEnabled
if (maybePrivacyGroupId.isPresent()) {
maybePrivacyGroup =
privacyController.retrieveOffChainPrivacyGroup(
Expand Down
2 changes: 1 addition & 1 deletion ...besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
&& !privacyController.isGroupAdditionTransaction(privateTransaction)) {
return new JsonRpcErrorResponse(id, JsonRpcError.ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
}
} else { // !onchainPirvacyGroupEnabled
} else { // !onchainPrivacyGroupEnabled
if (maybePrivacyGroupId.isPresent()) {
maybePrivacyGroup =
privacyController.retrieveOffChainPrivacyGroup(
Expand Down