Use secp signing from signers library (#272)

Consensys · Jun 3, 2020 · 712b6be · 712b6be
1 parent bb48573
commit 712b6be
Show file tree

Hide file tree

Showing 79 changed files with 77 additions and 3,023 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -19,8 +19,8 @@ dependencies {
   testRuntimeOnly 'org.bouncycastle:bcpkix-jdk15on'
 
   testImplementation project(':ethsigner:core')
-  testImplementation project(path: ':ethsigner:signer:multikey', configuration: 'testSupportArtifacts')
-  testImplementation(group: 'tech.pegasys.signers.internal', name: 'hashicorp', classifier: 'test-fixtures')
+  testImplementation (group: 'tech.pegasys.signers.internal', name: 'signing-secp256k1-common', classifier: 'test-fixtures')
+  testImplementation (group: 'tech.pegasys.signers.internal', name: 'keystorage-hashicorp', classifier: 'test-fixtures')
 
   testImplementation 'com.github.docker-java:docker-java'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'

diff --git a/...src/test/java/tech/pegasys/ethsigner/tests/multikeysigner/MultiKeyAcceptanceTestBase.java b/...src/test/java/tech/pegasys/ethsigner/tests/multikeysigner/MultiKeyAcceptanceTestBase.java
@@ -22,9 +22,9 @@
 import tech.pegasys.ethsigner.tests.dsl.signer.Signer;
 import tech.pegasys.ethsigner.tests.dsl.signer.SignerConfiguration;
 import tech.pegasys.ethsigner.tests.dsl.signer.SignerConfigurationBuilder;
-import tech.pegasys.ethsigner.toml.util.TomlStringBuilder;
 import tech.pegasys.signers.hashicorp.dsl.certificates.SelfSignedCertificate;
 import tech.pegasys.signers.hashicorp.util.HashicorpConfigUtil;
+import tech.pegasys.signers.secp256k1.common.TomlStringBuilder;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/ethsigner/app/build.gradle b/ethsigner/app/build.gradle
@@ -28,10 +28,10 @@ jar {
 dependencies {
 
   implementation project(':ethsigner:core')
-  implementation project(':ethsigner:signing-api')
   implementation project(':ethsigner:subcommands')
   implementation project(':ethsigner:commandline')
 
+  implementation 'tech.pegasys.signers.internal:signing-secp256k1-api'
   implementation 'com.google.guava:guava'
   implementation 'org.apache.logging.log4j:log4j-api'
 

diff --git a/ethsigner/commandline/build.gradle b/ethsigner/commandline/build.gradle
@@ -13,9 +13,9 @@ jar {
 
 dependencies {
 
-  implementation project(':ethsigner:signing-api')
-  implementation project(':ethsigner:signer:common')
   implementation project(':ethsigner:core')
+  implementation 'tech.pegasys.signers.internal:signing-secp256k1-api'
+  implementation 'tech.pegasys.signers.internal:signing-secp256k1-common'
   implementation 'info.picocli:picocli'
   implementation 'com.google.guava:guava'
   implementation 'org.apache.logging.log4j:log4j-api'

diff --git a/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/CommandlineParser.java b/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/CommandlineParser.java
@@ -14,6 +14,7 @@
 
 import tech.pegasys.ethsigner.config.InvalidCommandLineOptionsException;
 import tech.pegasys.ethsigner.core.InitializationException;
+import tech.pegasys.signers.secp256k1.common.TransactionSignerInitializationException;
 
 import java.io.PrintWriter;
 import java.util.List;

diff --git a/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/SignerSubCommand.java b/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/SignerSubCommand.java
@@ -14,7 +14,8 @@
 
 import tech.pegasys.ethsigner.core.EthSigner;
 import tech.pegasys.ethsigner.core.InitializationException;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.common.TransactionSignerInitializationException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/util/PasswordFileUtil.java b/ethsigner/commandline/src/main/java/tech/pegasys/ethsigner/util/PasswordFileUtil.java
diff --git a/ethsigner/commandline/src/test/java/tech/pegasys/ethsigner/NullSignerSubCommand.java b/ethsigner/commandline/src/test/java/tech/pegasys/ethsigner/NullSignerSubCommand.java
@@ -12,8 +12,9 @@
  */
 package tech.pegasys.ethsigner;
 
-import tech.pegasys.ethsigner.core.signing.TransactionSigner;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.common.TransactionSignerInitializationException;
 
 import java.util.Collections;
 import java.util.Optional;

diff --git a/ethsigner/commandline/src/test/java/tech/pegasys/ethsigner/util/PasswordFileUtilTest.java b/ethsigner/commandline/src/test/java/tech/pegasys/ethsigner/util/PasswordFileUtilTest.java
diff --git a/ethsigner/core/build.gradle b/ethsigner/core/build.gradle
@@ -27,8 +27,7 @@ jar {
 
 
 dependencies {
-
-  implementation project(':ethsigner:signing-api')
+  implementation 'tech.pegasys.signers.internal:signing-secp256k1-api'
   implementation 'com.google.guava:guava'
   implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'org.web3j:crypto'
@@ -53,7 +52,7 @@ dependencies {
 
 
 
-  integrationTestImplementation project(':ethsigner:signer:file-based')
+  integrationTestImplementation 'tech.pegasys.signers.internal:signing-secp256k1-file-based'
   integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.junit.jupiter:junit-jupiter-params'
   integrationTestImplementation 'io.rest-assured:rest-assured'

diff --git a/...tegration-test/java/tech/pegasys/ethsigner/jsonrpcproxy/IllegalSignatureCreationTest.java b/...tegration-test/java/tech/pegasys/ethsigner/jsonrpcproxy/IllegalSignatureCreationTest.java
@@ -16,8 +16,8 @@
 
 import tech.pegasys.ethsigner.core.jsonrpc.EthSendTransactionJsonParameters;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.EthTransaction;
-import tech.pegasys.ethsigner.core.signing.Signature;
-import tech.pegasys.ethsigner.signer.filebased.CredentialTransactionSigner;
+import tech.pegasys.signers.secp256k1.api.Signature;
+import tech.pegasys.signers.secp256k1.filebased.CredentialTransactionSigner;
 
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.Credentials;

diff --git a/...re/src/integration-test/java/tech/pegasys/ethsigner/jsonrpcproxy/IntegrationTestBase.java b/...re/src/integration-test/java/tech/pegasys/ethsigner/jsonrpcproxy/IntegrationTestBase.java
@@ -27,16 +27,16 @@
 import tech.pegasys.ethsigner.core.Runner;
 import tech.pegasys.ethsigner.core.jsonrpc.JsonDecoder;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.DownstreamPathCalculator;
-import tech.pegasys.ethsigner.core.signing.SingleTransactionSignerProvider;
-import tech.pegasys.ethsigner.core.signing.TransactionSigner;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.request.EthNodeRequest;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.request.EthRequestFactory;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.request.EthSignerRequest;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.response.EthNodeResponse;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.response.EthResponseFactory;
 import tech.pegasys.ethsigner.jsonrpcproxy.model.response.EthSignerResponse;
-import tech.pegasys.ethsigner.signer.filebased.FileBasedSignerFactory;
+import tech.pegasys.signers.secp256k1.api.SingleTransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.filebased.FileBasedSignerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/EthSigner.java b/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/EthSigner.java
@@ -17,8 +17,8 @@
 import tech.pegasys.ethsigner.core.config.TlsOptions;
 import tech.pegasys.ethsigner.core.jsonrpc.JsonDecoder;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.DownstreamPathCalculator;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
 import tech.pegasys.ethsigner.core.util.FileUtil;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
 
 import java.io.IOException;
 import java.nio.file.AccessDeniedException;

diff --git a/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/Runner.java b/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/Runner.java
@@ -30,7 +30,7 @@
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.SendTransactionHandler;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.TransactionFactory;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.VertxNonceRequestTransmitterFactory;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
 
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/...java/tech/pegasys/ethsigner/core/requesthandler/internalresponse/EthSignBodyProvider.java b/...java/tech/pegasys/ethsigner/core/requesthandler/internalresponse/EthSignBodyProvider.java
@@ -20,10 +20,10 @@
 import tech.pegasys.ethsigner.core.jsonrpc.response.JsonRpcSuccessResponse;
 import tech.pegasys.ethsigner.core.requesthandler.BodyProvider;
 import tech.pegasys.ethsigner.core.requesthandler.JsonRpcBody;
-import tech.pegasys.ethsigner.core.signing.Signature;
-import tech.pegasys.ethsigner.core.signing.TransactionSigner;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
 import tech.pegasys.ethsigner.core.util.ByteUtils;
+import tech.pegasys.signers.secp256k1.api.Signature;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;

diff --git a/...va/tech/pegasys/ethsigner/core/requesthandler/sendtransaction/SendTransactionHandler.java b/...va/tech/pegasys/ethsigner/core/requesthandler/sendtransaction/SendTransactionHandler.java
@@ -23,8 +23,8 @@
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.Transaction;
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.TransactionFactory;
 import tech.pegasys.ethsigner.core.signing.TransactionSerializer;
-import tech.pegasys.ethsigner.core.signing.TransactionSigner;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
 
 import java.util.Optional;
 

diff --git a/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/signing/TransactionSerializer.java b/ethsigner/core/src/main/java/tech/pegasys/ethsigner/core/signing/TransactionSerializer.java
@@ -13,6 +13,8 @@
 package tech.pegasys.ethsigner.core.signing;
 
 import tech.pegasys.ethsigner.core.requesthandler.sendtransaction.transaction.Transaction;
+import tech.pegasys.signers.secp256k1.api.Signature;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
 
 import org.web3j.crypto.Sign.SignatureData;
 import org.web3j.crypto.TransactionEncoder;

diff --git a/.../core/src/test/java/tech/pegasys/ethsigner/core/jsonrpcproxy/EthSignBodyProviderTest.java b/.../core/src/test/java/tech/pegasys/ethsigner/core/jsonrpcproxy/EthSignBodyProviderTest.java
@@ -24,9 +24,9 @@
 import tech.pegasys.ethsigner.core.jsonrpc.response.JsonRpcError;
 import tech.pegasys.ethsigner.core.requesthandler.JsonRpcBody;
 import tech.pegasys.ethsigner.core.requesthandler.internalresponse.EthSignBodyProvider;
-import tech.pegasys.ethsigner.core.signing.Signature;
-import tech.pegasys.ethsigner.core.signing.TransactionSigner;
-import tech.pegasys.ethsigner.core.signing.TransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.Signature;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+import tech.pegasys.signers.secp256k1.api.TransactionSignerProvider;
 
 import java.math.BigInteger;
 import java.util.Collections;

diff --git a/...rc/test/java/tech/pegasys/ethsigner/core/signing/SingleTransactionSignerProviderTest.java b/...rc/test/java/tech/pegasys/ethsigner/core/signing/SingleTransactionSignerProviderTest.java
@@ -16,6 +16,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import tech.pegasys.signers.secp256k1.api.SingleTransactionSignerProvider;
+import tech.pegasys.signers.secp256k1.api.TransactionSigner;
+
 import java.util.Collection;
 import java.util.Optional;
 

diff --git a/ethsigner/signer/azure/build.gradle b/ethsigner/signer/azure/build.gradle