UPNP Support - Merge Master and Resolve Conflicts #5
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
…d ConcurrentSet from netty. (PegaSysEng#1512)
* added node local metrics
…1515) * added local transaction permissioning metrics
Release plugin 2.8.0 fails on JDK-12 and Zulu in docker containers.
…#1521) Previously was only set after callbacks were invoked, allowing additional messages to be sent while parts of the supporting infrastructure for the peer was being torn down.
PegaSysEng#1519) * [PAN-2547] Modified JSON-RPC subscription processing to avoid blocking important threads. * [PAN-2547] Changed executor to Vertx managed. * [PAN-2547] Refactored vertx thread handling to super + refactored tests. * Update ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManager.java Error logging improvement. Co-Authored-By: Adrian Sutton <[email protected]>
- update node scripts to be able to include them from real source that we will be able to test (next step to do). - new scripts are more user friendly. - add package.json for npm management of dependencies - update doc page - update mkdocs guide for potential issue on pip version with Python3 - update mkdocs-material theme (only bug fixes)
…ck has been selected. (PegaSysEng#1537)
The following PIE-1598 subtasks are fixed: fixes PIE-1600 remove entrypoint script fixes PIE-1601 investigate Dockerfile best practices including : - naming - multi step build - comments - labels - build args - entrypoint - minimalism fixes PIE-1604 rewrite Dockerfile according to best practices provide a sample build command that can be used as-is or as an example. Added contents to .dockerignore to make the intermediate build image smaller. Remove .env file that was supposed to be used long ago for a docker quickstart and that we forgot to remove ans is useless today. add jenkins pipeline to test the docker image build
* Prevents intermittent `eth_getFilterLogs` failure when the `filterId` began with a hex 0. Previously leading 0's were not trimmed so depending on the randomly generated value, a filter could appear to not exist in the `FilterRegistry` * standardize Quantity.format to Quantity.create
…er count as metrics. (PegaSysEng#1551)
…nce test (PegaSysEng#1552) The acceptance test for "verifying that events get published when transactions are removed because of chain reorganisation" is being deleted because the way test case is simulating chain reorganisation is resulting in an inconsistent number of events fired. There are already unit test cases and other acceptance cases around validating pending transactions events hence this test case can be safely removed.
…gaSysEng#1553) * liveness and readiness probe stub endpoints - implement stub readiness endpoint - implement stub liveness endpoint - prepare unit tests * Update ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/health/ReadinessService.java Co-Authored-By: Nicolas MASSART <[email protected]> * refactor HealthService - readiness use peer network if p2p enabled - factorize code * Update ReadinessService.java final methode parameter * fix PR comments - add meaningful text in response body - use composition instead of inheritance - remove useless methods * error prone fix
* streamline `JsonRpcParameter.required` method * add test cases for PAN-2721 * clarify TopicParameter parsing comments * consume end of array in TopicParameter custom deserializer
- Previously you had to sign the private transaction with the same key as the privacy marker transaction.
* Renaming local config ATˆ * Base work for account permissioning * Updating simple account permissioning smart contract and genesis file runtime bytecode * Updating account ATs to use account object * Fix isAllowed account permissioning transaction * Fix allow/forbid account tx * Updated node builder for account permissioningˆ * Updated threaded and process AT node runners for account permissioning * Created condition for checking balance not changing after some time * Smart contract based account permissioning ATs * Spotless * Moved AccPermController build into RunnerBuilder * Fix ProcessPantheonNodeRunner account permissioning setup * Spotless
…PegaSysEng#1569) * PIE-1689: Fix behaviour for absent account permissiong smart contract * Update warning
…sor (PegaSysEng#1571) * Inclusing flag for onchain permissioning check on tx processor
…#1568) Query params can be used to adjust the number of peers required and number of blocks tolerance to be considered in sync.
* Make MetricCategory an interface so it isn't locked into the pantheon specific categories. * Split categories into StandardMetricCategory and PanteonMetricCategory to separate the common and Pantheon specific categories.
* Add eea_getPrivacyPrecompileAddress API in pantheon * Return error is privacy is not enabled
…alid block data (PegaSysEng#1578) * [PAN-2630] Synchronizer should disconnect the sync target peer on invalid block data - check if headers are sequential - if sequential, check if they form a chain, if not, disconnect the peer * update behaviour and add tests - change checks order - add log message - write tests * disconnect sync target when InvalidBlockException * remove power mockito - remove powermockito - write tests in subclasses of the `AbstractGetHeadersFromPeerTaskTest` * fix Exception check bug * fix PR discussion first pass - add assertion to check when the peer is disconnected - add assertion to check the peer has not been disonnected - undo remove final on class - remove sync target field * remove spy invocation * spotlessApply * shouldDisconnectPeerIfInvalidBlockException
* [PAN-2803] Update generate-blockchain-config CLI help - provide more accurate description of the command - update help ( FILE ==> DIRECTORY ) * fix unit tests on help command
# Conflicts: # ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AbstractEthJsonRpcHttpServiceTest.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceCorsTest.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceLoginTest.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java # ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceTest.java
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
@notlesh - went ahead and resolved the merge conflicts here. Feel free to merge if this is easier, or close and handle on your own if you prefer.