version update

.circleci/config.yml

@@ -7,7 +7,10 @@ orbs:
 executors:
   executor_med:  # 2cpu, 4G ram
     docker:
-      - image: circleci/openjdk:11.0.4-jdk-stretch
+      - image: circleci/openjdk:11.0.8-jdk-buster
+        auth:
+          username: $DOCKER_USER_RO
+          password: $DOCKER_PASSWORD_RO             
     resource_class: medium
     working_directory: ~/project
     environment:
@@ -16,7 +19,10 @@ executors:
 
   executor_large: # 4cpu, 8G ram
     docker:
-      - image: circleci/openjdk:11.0.4-jdk-stretch
+      - image: circleci/openjdk:11.0.8-jdk-buster
+        auth:
+          username: $DOCKER_USER_RO
+          password: $DOCKER_PASSWORD_RO     
     resource_class: large
     working_directory: ~/project
     environment:
@@ -25,7 +31,7 @@ executors:
 
   executor_machine: # 2cpu , 8G ram
     machine:
-      image: ubuntu-1604:201903-01 #Ubuntu 16.04, docker 18.09.3, docker-compose 1.23.1
+      image: ubuntu-2004:202008-01 #Ubuntu 20.04, docker 19.03, docker-compose 1.27.4
       docker_layer_caching: true
     working_directory: ~/project
     environment:
@@ -90,7 +96,7 @@ commands:
 
 jobs:
   build:
-    executor: executor_large
+    executor: executor_med
     steps:
       - prepare
       - run:
@@ -107,7 +113,7 @@ jobs:
           no_output_timeout: 20m
           command: |
             ./gradlew --no-daemon --parallel integrationTest --info
-      - notify      
+#      - notify
       - capture_test_results
       - capture_test_reports
       - save_cache:
@@ -121,18 +127,18 @@ jobs:
           paths:
             - ./
 
-  acceptanceTests:
-    executor: executor_large
-    steps:
-      - prepare
-      - run:
-          name: Acceptance Test
-          no_output_timeout: 20m
-          command: |
-            ./gradlew --no-daemon --parallel acceptanceTest
-      - notify
-      - capture_test_results
-      - capture_test_reports
+#  acceptanceTests:
+#    executor: executor_large
+#    steps:
+#      - prepare
+#      - run:
+#          name: Acceptance Test
+#          no_output_timeout: 20m
+#          command: |
+#            ./gradlew --no-daemon --parallel acceptanceTest
+#      - notify
+#      - capture_test_results
+#      - capture_test_reports
 
   buildDocker:
     executor: executor_med
@@ -154,7 +160,11 @@ jobs:
           command: |
             mkdir -p docker/reports
             ./gradlew --no-daemon testDocker
-      - notify            
+      - run:
+          name: build image - cloudhsm
+          command: |
+            ./gradlew --no-daemon distDocker -Pdockerfile=cloudhsm
+#      - notify
 
   publish:
     executor: executor_med
@@ -166,7 +176,7 @@ jobs:
           name: Publish
           command: |
             ./gradlew --no-daemon --parallel bintrayUpload
-      - notify
+#      - notify
 
   publishDocker:
     executor: executor_med
@@ -180,41 +190,59 @@ jobs:
           command: |
             docker login --username "${DOCKER_USER}" --password "${DOCKER_PASSWORD}"
             ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" dockerUpload
-      - notify
+      - run:
+          name: Publish Docker - cloudhsm
+          command: |
+            docker login --username "${DOCKER_USER}" --password "${DOCKER_PASSWORD}"
+            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" dockerUpload -Pdockerfile=cloudhsm
+#      - notify
 
 workflows:
   version: 2
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 11 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - build
-      - acceptanceTests:
-          requires:
-            - build
+#  nightly:
+#    triggers:
+#      - schedule:
+#          cron: "0 11 * * *"
+#          filters:
+#            branches:
+#              only:
+#                - master
+#    jobs:
+#      - build:
+#          context:
+#            - dockerhub-quorumengineering-ro
+#      - acceptanceTests:
+#          requires:
+#            - build
+#          context:
+#            - dockerhub-quorumengineering-ro
   default:
     jobs:
       - build
-      - acceptanceTests:
-          requires:
-            - build
+#        context:
+#          - dockerhub-quorumengineering-ro
+#      - acceptanceTests:
+#          requires:
+#            - build
+#          context:
+#            - dockerhub-quorumengineering-ro
       - buildDocker:
           requires:
             - build
-      - publish:
-          filters:
-            branches:
-              only:
-                - master
-                - /^release-.*/
-          requires:
-            - build
-            - acceptanceTests
+#          context:
+#            - dockerhub-quorumengineering-ro
+#      - publish:
+#          filters:
+#            branches:
+#              only:
+#                - master
+#                - /^release-.*/
+#          requires:
+#            - build
+#            - acceptanceTests
+#          context:
+#            - dockerhub-quorumengineering-ro
+#            - quorum-gradle
       - publishDocker:
           filters:
             branches:
@@ -223,5 +251,7 @@ workflows:
                 - /^release-.*/
           requires:
             - build
-            - acceptanceTests
+#            - acceptanceTests
             - buildDocker
+#          context:
+#            - dockerhub-quorumengineering-rw

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 21.3.0
+
+### Features Added
+- Upgraded besu-metrics library
+- Publish ethsigner module jars to cloudsmith maven repo
+- Update Besu latest version for Acceptance Tests
+- Add gzip compression support
+
+## 21.1.0
+
+### Features Added
+- Publish artifacts to [cloudsmith](https://cloudsmith.io/~consensys/repos/ethsigner).
+- Added support for sending GoQuorum private transactions via "eth_sendTransaction" JSON-RPC
+- Improve error message if HTTP server fails to start
+
+## 20.10.0
+
+### Features Added
+- Added "eth_signTransaction" JSON-RPC
+- Docker namespace updated to reflect "consensys/quorum-ethsigner"
+- Strip ACCESS_CONTROL_ALLOW_ORIGIN header from responses received from the web3provider
+- Added a Prometheus metrics endpoint, reporting basic application metrics
+
+### Bugs Fixed
+- Transactions were not being handled in parallel, triggering poor performance under load
+
 ## 0.7.1
 
 ### Features Added
@@ -12,6 +38,13 @@
 - Prevent multiple transmission exceptions propagation upwards [#312](https://github.com/PegaSysEng/ethsigner/pull/312)
 - Resolve failures in the application of CORS headers [#286](https://github.com/PegaSysEng/ethsigner/pull/286)
 
+## 0.7.1-ADHARA
+
+### Features Added
+- Added "eth_signTransaction" JSON RPC
+- Added AWS CloudHSM signer
+- Added Generic PKCS11 signer
+
 ## 0.7.0
 
 ### Features Added

CLA.md

@@ -1,10 +1,10 @@
 Sign the CLA
 =============
 
-This page is the step-by-step guide to signing the Consensys AG
-Individual Contributor License Agreement. 
+This page is the step-by-step guide to signing the Consensys Software Inc.
+Individual Contributor License Agreement.
 
-1. First and foremost, read [the current version of the CLA]. 
+1. First and foremost, read [the current version of the CLA].
    It is written to be as close to plain English as possible.
 
 2. Make an account on [GitHub] if you don't already have one.
@@ -13,7 +13,7 @@ Individual Contributor License Agreement.
    pre-requisite requiring to you read and sign the CLA.
 
 If you have any questions, you can reach us on [Discord].
- 
+
 [GitHub]: https://github.com/
 [the current version of the CLA]: https://gist.github.com/rojotek/978b48a5e8b68836856a8961d6887992
 [Discord]: https://discord.gg/5U9Jwp7

CODE-OF-CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [private@pegasys.tech]. All
+reported by contacting the project team at [private-quorum@consensys.net]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -71,4 +71,4 @@ This Code of Conduct is adapted from the [Contributor Covenant], version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [Contributor Covenant]: https://www.contributor-covenant.org
-[private@pegasys.tech]: mailto:private@pegasys.tech
+[private-quorum@consensys.net]: mailto:private-quorum@consensys.net

CODING-CONVENTIONS.md

@@ -45,7 +45,7 @@ EthSigner embraces typical Java idioms including using an Object Oriented approa
    - Don't pass lambdas into executors because it makes it harder to identify the threading interactions. The lambda makes the code shorter but not clearer. Instead use a separate class or extract a method. 
 * For good examples, refer to the APIs the JDK itself exposes. 
 
->**Note** If you're not sure what idiomatic Java looks like, start by following the typical patterns and naming used in this or other PegaSys codebases.
+>**Note** If you're not sure what idiomatic Java looks like, start by following the typical patterns and naming used in this or other ConsenSys codebases.
 
 ## 2.3 You Ain't Gonna Need It (YAGNI)
 

CONTRIBUTING.md

@@ -27,7 +27,7 @@ and feel free to propose changes to this document in a pull request.
 ## Code of Conduct
 
 This project and everyone participating in it is governed by the [EthSigner Code of Conduct](CODE-OF-CONDUCT.md).
-By participating, you are expected to uphold this code. Please report unacceptable behavior to [private@pegasys.tech].
+By participating, you are expected to uphold this code. Please report unacceptable behavior to [private-quorum@consensys.net].
 
 ## I just have a quick question
 
@@ -242,10 +242,10 @@ These are not strictly enforced during the build, but should be adhered to and c
 | [`requires-changes`][search-label-requires-changes]                     | Pull requests which need to be updated based on review comments and then reviewed again.   |
 | [`needs engineering approval`][search-label-needs-engineering-approval] | Pull requests which need to be approved from a technical person, mainly documentation PRs. |
 
-[private@pegasys.tech]: mailto:private@pegasys.tech
+[private-quorum@consensys.net]: mailto:private-quorum@consensys.net
 [Discord]: https://discord.gg/5U9Jwp7
-[Github issues]: https://github.com/PegaSysEng/ethsigner/issues
-[EthSigner documentation]: https://docs.ethsigner.pegasys.tech/
+[GitHub issues]: https://github.com/ConsenSys/ethsigner/issues
+[EthSigner documentation]: https://docs.ethsigner.consensys.net/
 [CLA.md]: /CLA.md
 [Code Reviews]: /community/code-reviews.md
 [MkDocs]: https://www.mkdocs.org/

GOVERNANCE.md

@@ -1,5 +1,5 @@
 # Overview
-This project is led by a benevolent dictator (PegaSys) and managed by the community. That is, the
+This project is led by a benevolent dictator (ConsenSys) and managed by the community. That is, the
 community actively contributes to the day-to-day maintenance of the project, but the general
 strategic line is drawn by the benevolent dictator. In case of disagreement, they have the last word.
 It is the benevolent dictator’s job to resolve disputes within the community and to ensure that the

README.md

@@ -1,6 +1,6 @@
 # EthSigner
 
-A transaction signing application to be used with a web3 provider. All questions, queries and other discussion can be found on [Discord]. 
+A transaction signing application to be used with a web3 provider. All questions, queries and other discussion can be found on [Discord].
 
 ## Issues
 
@@ -11,6 +11,9 @@ See our [contribution guidelines](CONTRIBUTING.md) for more detail on searching
 ## Users
 * [User documentation](https://docs.ethsigner.pegasys.tech/)
 
+## Chat
+* [Discord]
+
 ## Developers
 * [Contribution Guidelines](CONTRIBUTING.md)
 * [Coding Conventions](CODING-CONVENTIONS.md)
@@ -19,4 +22,4 @@ See our [contribution guidelines](CONTRIBUTING.md) for more detail on searching
 * [Release Notes](CHANGELOG.md)
 
 [Discord]: https://discord.gg/5U9Jwp7
-[Github issues]: https://github.com/PegaSysEng/ethsigner/issues
+[GitHub issues]: https://github.com/ConsenSys/ethsigner/issues

acceptance-tests/build.gradle

@@ -1,7 +1,7 @@
 import groovy.text.SimpleTemplateEngine
 
 /*
- * Copyright 2019 ConsenSys AG.
+ * Copyright 2020 ConsenSys AG.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -29,6 +29,8 @@ dependencies {
   testImplementation project(':ethsigner:app')
   testImplementation (group: 'tech.pegasys.signers.internal', name: 'signing-secp256k1-impl', classifier: 'test-fixtures')
   testImplementation (group: 'tech.pegasys.signers.internal', name: 'keystorage-hashicorp', classifier: 'test-fixtures')
+  testImplementation (group: 'tech.pegasys.signers.internal', name: 'keystorage-hsm', classifier: 'test-fixtures')
+  testImplementation (group: 'tech.pegasys.signers.internal', name: 'keystorage-cavium', classifier: 'test-fixtures')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'io.vertx:vertx-core'

acceptance-tests/src/test/java/tech/pegasys/ethsigner/tests/MethodNotFoundAcceptanceTest.java

@@ -28,7 +28,7 @@ public void sendDisabledApiReturnsBadRequest() {
     final SignerResponse<JsonRpcErrorResponse> response =
         ethSigner().rawJsonRpcRequests().exceptionalRequest("ibft_getPendingVotes");
 
-    assertThat(response.status()).isEqualTo(HttpResponseStatus.BAD_REQUEST);
+    assertThat(response.status()).isEqualTo(HttpResponseStatus.OK);
     assertThat(response.jsonRpc().getError()).isEqualTo(JsonRpcError.METHOD_NOT_ENABLED);
   }
 
@@ -37,7 +37,7 @@ public void unknownJsonRpcMethodReturnsBadRequest() {
     final SignerResponse<JsonRpcErrorResponse> response =
         ethSigner().rawJsonRpcRequests().exceptionalRequest("invalidJsonRpcMethod");
 
-    assertThat(response.status()).isEqualTo(HttpResponseStatus.BAD_REQUEST);
+    assertThat(response.status()).isEqualTo(HttpResponseStatus.OK);
     assertThat(response.jsonRpc().getError()).isEqualTo(JsonRpcError.METHOD_NOT_FOUND);
   }
 }