Merge branch 'hotfix/1.3.1'

.gitlab-ci.yml

@@ -11,7 +11,7 @@ include:
     file: 'common/sonarqube.gitlab-ci.yml'
   - project: 'integrator1/devops/gitlab-ci-jobs'
     ref: master
-    file: 'common/build-gradle.gitlab-ci.yml'    
+    file: 'common/build-gradle.gitlab-ci.yml'
 
 stages:
   - tests
@@ -22,15 +22,15 @@ stages:
     expire_in: 1 week
     name: "${CI_COMMIT_SHORT_SHA}_${CI_JOB_ID}"
     reports:
-      junit: "**/test-results/test/*.xml"  
+      junit: "**/test-results/test/*.xml"
     paths:
       - "**/build/reports/detekt/detekt.xml"
       - "**/test-results/test/*.xml"
       - "**/build/jacocoReports/test/jacocoTestReport.xml"
-      - images.json  
+      - images.json
       - "**/build/libs"
 
-# check code quality 
+# check code quality
 code_quality:
   extends:
     - .check_code_quality
@@ -39,15 +39,13 @@ code_quality:
     - dev
     - merge_requests
     - /^.*rc.*$/
-    - /^.*release.*$/    
+    - /^.*release.*$/
     - /^.*hotfix.*$/
-    
+
 tests&build:
   extends:
     - .test-gradle
   script:
-    - chmod +x ./we-tx-signer/we-tx-signer-code/lib/start.sh
-    - ./we-tx-signer/we-tx-signer-code/lib/start.sh
     - ./gradlew -PweMavenUser=$MAVEN_USER -PweMavenPassword=$MAVEN_PASSWORD version check build publish
   only:
     - dev
@@ -61,8 +59,6 @@ tests&build_for_maven_central:
     - .test-gradle
   script:
     - cat $we_maven_central_gpg | base64 --decode > "$(pwd)/we_maven_central.gpg"
-    - chmod +x ./we-tx-signer/we-tx-signer-code/lib/start.sh
-    - ./we-tx-signer/we-tx-signer-code/lib/start.sh
     - ./gradlew --no-parallel -PsonaTypeMavenUser=$SONATYPE_USER -PsonaTypeMavenPassword=$SONATYPE_PASSWORD -Psigning.keyId=$SIGN_KEY_ID -Psigning.password=$SIGN_PASSWORD -Psigning.secretKeyRingFile="$(pwd)/we_maven_central.gpg" version check build publish
     - ./gradlew -PsonaTypeMavenUser=$SONATYPE_USER -PsonaTypeMavenPassword=$SONATYPE_PASSWORD closeAndReleaseRepository
   only:
@@ -80,8 +76,6 @@ tests-mr:
     - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     - git pull
     - git merge origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    - chmod +x ./we-tx-signer/we-tx-signer-code/lib/start.sh
-    - ./we-tx-signer/we-tx-signer-code/lib/start.sh
     - ./gradlew -PweMavenUser=$MAVEN_USER -PweMavenPassword=$MAVEN_PASSWORD check build
     - docker images --format "{{json . }}" --no-trunc > images.json
-  <<: *artifacts 
+  <<: *artifacts

build.gradle.kts

@@ -12,7 +12,7 @@ val logbackVersion: String by project
 val javaxAnnotationApiVersion: String by project
 val caffeineCacheVersion: String by project
 val slf4jVersion: String by project
-val cryptoProVersion: String by project
+val bouncycastleVersion: String by project
 
 val ioGrpcVersion: String by project
 val ioGrpcKotlinVersion: String by project
@@ -292,11 +292,8 @@ configure(
             dependency("org.slf4j:slf4j-api:$slf4jVersion")
             dependency("com.github.ben-manes.caffeine:caffeine:$caffeineCacheVersion")
 
-            dependency("ru.CryptoPro:ades-core:$cryptoProVersion")
-            dependency("ru.CryptoPro:cades:$cryptoProVersion")
-            dependency("ru.CryptoPro:jcp:$cryptoProVersion")
-            dependency("ru.CryptoPro:jcp-rev-check:$cryptoProVersion")
-            dependency("ru.CryptoPro:jcsp:$cryptoProVersion")
+            dependency("org.bouncycastle:bcprov-jdk15on:$bouncycastleVersion")
+            dependency("org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion")
 
             dependency("io.mockk:mockk:$mockkVersion")
             dependency("com.ninja-squad:springmockk:$springMockkVersion")

gradle.properties

@@ -26,7 +26,6 @@ javaxAnnotationApiVersion=1.3.2
 caffeineCacheVersion=2.9.3
 slf4jVersion=1.7.36
 bouncycastleVersion=1.60
-cryptoProVersion=5.0.41975
 
 # http
 feignVersion=11.10

settings.gradle.kts

@@ -58,6 +58,7 @@ include(
     "we-tx-signer:we-tx-signer-api",
     "we-tx-signer:we-tx-signer-node",
     "we-tx-signer:we-tx-signer-code",
+    "we-tx-signer:we-tx-signer-bouncy-castle",
     "we-node-client-error",
     "we-atomic",
 )

we-tx-signer/we-tx-signer-code/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/signer/gost/util/Dictionary.kt → we-tx-signer/we-tx-signer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/Dictionary.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.sdk.tx.signer.signer.gost.util
+package com.wavesenterprise.sdk.tx.signer
 
 val DICTIONARY = listOf(
     "abandon", "ability", "able", "about", "above", "absent", "absorb", "abstract", "absurd", "abuse", "access",

we-tx-signer/we-tx-signer-code/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/signer/Signer.kt → we-tx-signer/we-tx-signer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/Signer.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.sdk.tx.signer.signer
+package com.wavesenterprise.sdk.tx.signer
 
 import com.wavesenterprise.sdk.node.domain.PublicKey
 import com.wavesenterprise.sdk.node.domain.Signature

we-tx-signer/we-tx-signer-bouncy-castle/build.gradle.kts

@@ -0,0 +1,16 @@
+dependencies {
+    implementation(kotlin("stdlib"))
+
+    api(project(":we-node-client-domain"))
+    api(project(":we-node-client-blocking-client"))
+    api(project(":we-tx-signer:we-tx-signer-api"))
+    api(project(":we-tx-signer:we-tx-signer-code"))
+
+    implementation("org.bouncycastle:bcprov-jdk15on")
+    implementation("org.bouncycastle:bcpkix-jdk15on")
+
+    testImplementation("io.mockk:mockk")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine")
+}

we-tx-signer/we-tx-signer-code/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/signer/gost/BouncyCastleSigner.kt → we-tx-signer/we-tx-signer-bouncy-castle/src/main/kotlin/com/wavesenterprise/tx/signer/bouncycastle/gost/BouncyCastleSigner.kt

@@ -1,11 +1,12 @@
-package com.wavesenterprise.sdk.tx.signer.signer.gost
+package com.wavesenterprise.tx.signer.bouncycastle.gost
 
 import com.wavesenterprise.sdk.node.domain.PublicKey.Companion.publicKey
 import com.wavesenterprise.sdk.node.domain.Signature
 import com.wavesenterprise.sdk.node.domain.Signature.Companion.signature
 import com.wavesenterprise.sdk.node.domain.TxId
 import com.wavesenterprise.sdk.node.domain.TxId.Companion.txId
 import com.wavesenterprise.sdk.node.domain.util.ADDRESS_VERSION
+import com.wavesenterprise.sdk.tx.signer.Signer
 import org.bouncycastle.jcajce.provider.asymmetric.ecgost.BCECGOST3410PublicKey
 import org.bouncycastle.jcajce.provider.digest.GOST3411
 import org.bouncycastle.jce.ECGOST3410NamedCurveTable
@@ -19,7 +20,7 @@ import java.security.Security
 class BouncyCastleSigner(
     private val privateKey: PrivateKey,
     private val networkByte: Byte,
-) : GOSTSigner {
+) : Signer {
 
     init {
         Security.addProvider(BouncyCastleProvider())

we-tx-signer/we-tx-signer-code/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/signer/gost/util/BouncyCastleUtil.kt → we-tx-signer/we-tx-signer-bouncy-castle/src/main/kotlin/com/wavesenterprise/tx/signer/bouncycastle/gost/BouncyCastleUtil.kt

@@ -1,7 +1,8 @@
-package com.wavesenterprise.sdk.tx.signer.signer.gost.util
+package com.wavesenterprise.tx.signer.bouncycastle.gost
 
 import com.wavesenterprise.sdk.node.domain.util.NONCE
 import com.wavesenterprise.sdk.node.domain.util.processor.numberToBytes
+import com.wavesenterprise.sdk.tx.signer.DICTIONARY
 import org.bouncycastle.crypto.digests.SHA256Digest
 import org.bouncycastle.crypto.engines.AESEngine
 import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator

we-tx-signer/we-tx-signer-code/src/test/kotlin/com/wavesenterprise/sdk/tx/signer/signer/gost/BackwardCompatibilityGOSTTest.kt → we-tx-signer/we-tx-signer-bouncy-castle/src/test/kotlin/com/wavesenterprise/tx/signer/bouncycastle/BackwardCompatibilityGOSTTest.kt

@@ -1,7 +1,8 @@
-package com.wavesenterprise.sdk.tx.signer.signer.gost
+package com.wavesenterprise.tx.signer.bouncycastle
 
 import com.wavesenterprise.sdk.node.domain.Address.Companion.address
-import com.wavesenterprise.sdk.tx.signer.signer.gost.util.BouncyCastleUtil
+import com.wavesenterprise.tx.signer.bouncycastle.gost.BouncyCastleSigner
+import com.wavesenterprise.tx.signer.bouncycastle.gost.BouncyCastleUtil
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments

we-tx-signer/we-tx-signer-code/src/test/kotlin/com/wavesenterprise/sdk/tx/signer/BouncyCastleSelfTxSignerTest.kt → we-tx-signer/we-tx-signer-bouncy-castle/src/test/kotlin/com/wavesenterprise/tx/signer/bouncycastle/BouncyCastleSelfTxSignerTest.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.sdk.tx.signer
+package com.wavesenterprise.tx.signer.bouncycastle
 
 import com.wavesenterprise.sdk.node.domain.Address
 import com.wavesenterprise.sdk.node.domain.Alias
@@ -49,7 +49,8 @@ import com.wavesenterprise.sdk.node.domain.sign.SetAssetScriptSignRequest
 import com.wavesenterprise.sdk.node.domain.sign.SponsorFeeSignRequest
 import com.wavesenterprise.sdk.node.domain.sign.UpdateContractSignRequest
 import com.wavesenterprise.sdk.node.domain.sign.UpdatePolicySignRequest
-import com.wavesenterprise.sdk.tx.signer.signer.gost.BouncyCastleSigner
+import com.wavesenterprise.sdk.tx.signer.SelfTxSigner
+import com.wavesenterprise.tx.signer.bouncycastle.gost.BouncyCastleSigner
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertNotNull

we-tx-signer/we-tx-signer-code/src/test/kotlin/com/wavesenterprise/sdk/tx/signer/signer/gost/BouncyCastleUtilTest.kt → we-tx-signer/we-tx-signer-bouncy-castle/src/test/kotlin/com/wavesenterprise/tx/signer/bouncycastle/BouncyCastleUtilTest.kt

@@ -1,6 +1,6 @@
-package com.wavesenterprise.sdk.tx.signer.signer.gost
+package com.wavesenterprise.tx.signer.bouncycastle
 
-import com.wavesenterprise.sdk.tx.signer.signer.gost.util.BouncyCastleUtil
+import com.wavesenterprise.tx.signer.bouncycastle.gost.BouncyCastleUtil
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue

we-tx-signer/we-tx-signer-code/build.gradle.kts

@@ -8,15 +8,6 @@ dependencies {
     api(project(":we-node-client-http:we-node-client-feign-client"))
     implementation(project(":we-node-client-json"))
 
-    implementation("org.bouncycastle:bcprov-jdk15on:$bouncycastleVersion")
-    implementation("org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion")
-
-    implementation("ru.CryptoPro:ades-core")
-    implementation("ru.CryptoPro:cades")
-    implementation("ru.CryptoPro:jcp")
-    implementation("ru.CryptoPro:jcp-rev-check")
-    implementation("ru.CryptoPro:jcsp")
-
     testImplementation("io.mockk:mockk")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")

we-tx-signer/we-tx-signer-code/src/main/kotlin/com/wavesenterprise/sdk/tx/signer/SelfTxSigner.kt

@@ -7,7 +7,6 @@ import com.wavesenterprise.sdk.node.domain.ChainId
 import com.wavesenterprise.sdk.node.domain.PublicKey
 import com.wavesenterprise.sdk.node.domain.sign.SignRequest
 import com.wavesenterprise.sdk.node.domain.tx.Tx
-import com.wavesenterprise.sdk.tx.signer.signer.Signer
 
 class SelfTxSigner(
     private val signer: Signer,