Added NodeSmartContractV2PermissioningController #1435
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lucassaldanha
added
TeamRevenant
macfarla
reviewed
Oct 12, 2020
| private boolean isPermitted(final EnodeURL enode) { | ||
| final Bytes payload = createPayload(enode); | ||
| final CallParameter callParams = | ||
| new CallParameter(null, contractAddress, -1, null, null, payload); |
There was a problem hiding this comment.
the gas limit. It isn't relevant for the simulation call.
...va/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java
Show resolved
Hide resolved
lucassaldanha
force-pushed
the
node-perm-update
branch
5 times, most recently
from
fda1b7c
to
62b258a
Compare
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
lucassaldanha
force-pushed
the
node-perm-update
branch
from
62b258a
to
dd95569
Compare
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
macfarla
approved these changes
Oct 17, 2020
CHANGELOG.md
Outdated
| @@ -4,6 +4,7 @@ | |||
| * `--random-peer-priority-enabled` flag added. Allows for incoming connections to be prioritized randomly. This will prevent (typically small, stable) networks from forming impenetrable peer cliques. [#1440](https://github.com/hyperledger/besu/pull/1440) | |||
| * Hide deprecated `--host-whitelist` option. [\#1444](https://github.com/hyperledger/besu/pull/1444) | |||
| * Prioritize high gas prices during mining. Previously we ordered only by the order in which the transactions were received. This will increase expected profit when mining. [\#1449](https://github.com/hyperledger/besu/pull/1449) | |||
| * Added support for the updated smart contract-based node permissioning EEA interface. [\#1435](https://github.com/hyperledger/besu/pull/1435) | |||
There was a problem hiding this comment.
is there an EEA version to link to?
| final byte[] ip = NodeSmartContractV2PermissioningController.encodeIp(enodeUrl.getIp()); | ||
| final int port = enodeUrl.getListeningPortOrZero(); | ||
|
|
||
| final Function addNodeFunction = |
There was a problem hiding this comment.
connectionAllowedFunction?
| final byte[] ip = NodeSmartContractV2PermissioningController.encodeIp(enodeUrl.getIp()); | ||
| final int port = enodeUrl.getListeningPortOrZero(); | ||
|
|
||
| final Function addNodeFunction = |
|
|
||
| permissionedNode.verify(connectionIsAllowed(allowedNode)); | ||
| permissionedNode.verify(connectionIsAllowed(bootnode)); | ||
| permissionedNode.verify(connectionIsAllowed(permissionedNode)); |
There was a problem hiding this comment.
is it worth adding verify(connectionNotAllowed(forbiddenNode))
| extends AbstractNodeSmartContractPermissioningController { | ||
|
|
||
| public static final Bytes TRUE_RESPONSE = Bytes.fromHexString(TypeEncoder.encode(new Bool(true))); | ||
| public static Bytes FALSE_RESPONSE = Bytes.fromHexString(TypeEncoder.encode(new Bool(false))); |
| public void before() { | ||
| when(transactionSimulator.doesAddressExistAtHead(any())).thenReturn(Optional.of(true)); | ||
| } | ||
|
|
There was a problem hiding this comment.
is this needed? no other changes in this test
There was a problem hiding this comment.
It is! because now the existence of the contract is tested a bit earlier in the code. Without this, all tests fail :)
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
AbstractNodeSmartContractPermissioningControllerthat contains some of the shared functionality between all smart contract-based node permissioning providers.NodeSmartContractV2PermissioningControllerthat conforms with the updated Node Permissioning EEA interface.SmartContractPermissioningConfigurationthat is used inNodePermissioningControllerFactoryto choose the right smart contract permissioning provider (EEA v1 or v2) - currently it defaults to 1 (EEA v1 interface).SmartContractPermissioningConfiguration(nodeSmartContractInterfaceVersion).Note about EEA compatibility:
It looks like the final change on the return type from byte32 to bool hasn't been accepted yet. However, I believe it is likely to be. The discussion can be seen here: https://github.com/EntEthAlliance/client-spec/issues/902
Changelog