use pb-grpc-client-kotlin (#22)

provenance-io · Oct 24, 2023 · 06fcc84 · 06fcc84
1 parent a3d1a51
commit 06fcc84
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 254 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,11 +42,13 @@ dependencies {
         libs.bundles.kotlinLibs,
         libs.bundles.provenance,
         libs.bundles.grpc,
+        libs.bundles.bouncycastle,
+
+        libs.figure.hdwallet,
 
         libs.reflections,
         libs.commons,
         libs.protobuf,
-        libs.bouncycastle,
 
         // third party plugins that this plugin will apply
         libs.shadow,

diff --git a/example-kotlin/build.gradle b/example-kotlin/build.gradle
@@ -22,6 +22,7 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
+        maven { url "https://s01.oss.sonatype.org/content/groups/staging/" }
         maven { url 'https://javadoc.jitpack.io' }
     }
 }

diff --git a/example-kotlin/contracts/build.gradle b/example-kotlin/contracts/build.gradle
@@ -12,7 +12,7 @@ plugins {
 dependencies {
     api project(':protos')
 
-    implementation("io.provenance.scope:contract-base:0.7.0-rc1")
+    implementation("io.provenance.scope:contract-base:0.7.0-rc2")
 }
 
 publishing {

diff --git a/example-kotlin/protos/build.gradle b/example-kotlin/protos/build.gradle
@@ -22,7 +22,7 @@ sourceSets.main.java.srcDirs += 'build/generated/source/proto/main/java'
 sourceSets.main.java.srcDirs += 'src/main/kotlin'
 
 dependencies {
-    implementation("io.provenance.scope:contract-base:0.7.0-rc1")
+    implementation("io.provenance.scope:contract-base:0.7.0-rc2")
 
     api "com.google.protobuf:protobuf-java:$protobuf_version"
     api "com.google.protobuf:protobuf-java-util:$protobuf_version"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,16 @@
 [versions]
 kotlin = "1.9.10"
 reflections = "0.9.10"
-provenance-scope-sdk = "0.7.0-rc1"
+provenance-scope-sdk = "0.7.0-rc2"
 provenance-client = "2.4.0-rc1"
 provenance-protobuf = "1.5.0"
+figure-hdwallet = "0.4.3"
 grpc = "1.58.0"
 commons = "2.14.0"
 protobuf = "3.24.4"
 bouncycastle = "1.70"
 shadow = "8.1.1"
-kethereum = "0.83.4"
+kethereum = "0.86.0"
 jackson = "2.15.3"
 kotest = "5.7.2"
 kotest-4 = "4.4.+"
@@ -25,13 +26,16 @@ provenance-scope = { module = "io.provenance.scope:util", version.ref = "provena
 provenance-client = { module = "io.provenance.client:pb-grpc-client-kotlin", version.ref = "provenance-client" }
 provenance-protobuf = { module = "io.provenance.protobuf:pb-proto-java", version.ref = "provenance-protobuf" }
 
+figure-hdwallet = { module = "tech.figure.hdwallet:hdwallet", version.ref = "figure-hdwallet" }
+
 grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" }
 
 commons = { module = "commons-io:commons-io", version.ref = "commons" }
 protobuf = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
-bouncycastle = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }
+bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }
+bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" }
 
 shadow = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" }
 
@@ -51,10 +55,9 @@ kotest-runner4 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kot
 
 [bundles]
 kotlinLibs = ["kotlinLibs-std", "kotlinLibs-reflect"]
-provenance = ["provenance-sdk", "provenance-scope",
-#    "provenance-client", # todo: add back on once this is used
-    "provenance-protobuf"]
+provenance = ["provenance-sdk", "provenance-scope", "provenance-client", "provenance-protobuf"]
 grpc = ["grpc-protobuf", "grpc-stub", "grpc-netty-shaded"]
 kethereum = ["kethereum-crypto", "kethereum-crypto-api", "kethereum-crypto-bouncycastle"]
 jackson = ["jackson-core", "jackson-databind", "jackson-datatype-jsr310", "jackson-kotlin", "jackson-annotations"]
-kotest = ["kotest-runner", "kotest-assertions", "kotest-property"]
+kotest = ["kotest-runner", "kotest-assertions", "kotest-property"]
+bouncycastle = ["bouncycastle-bcprov", "bouncycastle-bcpkix"]
diff --git a/src/main/kotlin/io/provenance/p8e/plugin/Bootstrapper.kt b/src/main/kotlin/io/provenance/p8e/plugin/Bootstrapper.kt
@@ -3,6 +3,7 @@ package io.provenance.p8e.plugin
 import com.google.protobuf.ByteString
 import com.google.protobuf.Message
 import io.grpc.ManagedChannelBuilder
+import io.provenance.client.grpc.BaseReqSigner
 import io.provenance.metadata.v1.ContractSpecification
 import io.provenance.metadata.v1.ContractSpecificationRequest
 import io.provenance.metadata.v1.DefinitionType
@@ -15,7 +16,6 @@ import io.provenance.metadata.v1.MsgWriteScopeSpecificationRequest
 import io.provenance.metadata.v1.RecordSpecification
 import io.provenance.metadata.v1.ScopeSpecification
 import io.provenance.metadata.v1.ScopeSpecificationRequest
-import io.provenance.scope.contract.annotations.ScopeSpecification as ScopeSpecificationReference
 import io.provenance.scope.contract.annotations.ScopeSpecificationDefinition
 import io.provenance.scope.contract.proto.Commons.ProvenanceReference
 import io.provenance.scope.contract.proto.Specifications.ContractSpec
@@ -55,6 +55,7 @@ import java.security.PublicKey
 import java.security.Security
 import java.util.UUID
 import java.util.concurrent.TimeUnit
+import io.provenance.scope.contract.annotations.ScopeSpecification as ScopeSpecificationReference
 
 fun ContractSpec.uuid(): UUID = toByteArray().sha256LoBytes().toUuid()
 fun ContractSpec.hashString(): String = toByteArray().sha256LoBytes().base64EncodeString()
@@ -139,7 +140,7 @@ internal class Bootstrapper(
 
             val encryptionKeyPair = getKeyPair(location.encryptionPrivateKey!!)
             val signingKeyPair = getKeyPair(location.signingPrivateKey!!)
-            val pbSigner = signingKeyPair.toSignerMeta()
+            val pbSigner = BaseReqSigner(JavaKeyPairSigner(signingKeyPair, config.mainNet))
             val pbAddress = getAddress(signingKeyPair.public, config.mainNet)
             val affiliate = Affiliate(
                 signingKeyRef = DirectKeyRef(signingKeyPair.public, signingKeyPair.private),
@@ -221,7 +222,7 @@ internal class Bootstrapper(
                                 .build()
                         }.chunked(location.txBatchSize.toInt()).forEach { batch ->
                             try {
-                                client.writeTx(pbAddress, pbSigner, batch.toTxBody())
+                                client.writeTx(pbSigner, batch.toTxBody())
                             } catch (e: Exception) {
                                 project.logger.info("sent messages = $batch")
                                 throw e
@@ -347,7 +348,7 @@ internal class Bootstrapper(
 
                     messages.chunked(location.txBatchSize.toInt()).forEach { batch ->
                         try {
-                            client.writeTx(pbAddress, pbSigner, batch.toTxBody())
+                            client.writeTx(pbSigner, batch.toTxBody())
                         } catch (e: Exception) {
                             project.logger.info("sent messages = $batch")
                             throw e
@@ -384,7 +385,7 @@ internal class Bootstrapper(
 
                     contractSpecToScopeSpecMessages.chunked(location.txBatchSize.toInt()).forEach { batch ->
                         try {
-                            client.writeTx(pbAddress, pbSigner, batch.toTxBody())
+                            client.writeTx(pbSigner, batch.toTxBody())
                         } catch (e: Exception) {
                             project.logger.info("sent messages = $batch")
                             throw e

diff --git a/src/main/kotlin/io/provenance/p8e/plugin/JavaKeyPairSigner.kt b/src/main/kotlin/io/provenance/p8e/plugin/JavaKeyPairSigner.kt
@@ -0,0 +1,26 @@
+package io.provenance.p8e.plugin
+
+import com.google.protobuf.ByteString
+import cosmos.crypto.secp256k1.Keys
+import io.provenance.client.grpc.Signer
+import io.provenance.scope.encryption.util.getAddress
+import tech.figure.hdwallet.common.hashing.sha256
+import tech.figure.hdwallet.ec.extensions.toECPrivateKey
+import tech.figure.hdwallet.ec.extensions.toECPublicKey
+import tech.figure.hdwallet.signer.BCECSigner
+import java.security.KeyPair
+
+class JavaKeyPairSigner(private val keyPair: KeyPair, private val mainNet: Boolean) : Signer {
+    override fun address(): String = keyPair.public.getAddress(mainNet)
+
+    override fun pubKey(): Keys.PubKey = Keys.PubKey
+        .newBuilder()
+        .setKey(ByteString.copyFrom(keyPair.public.toECPublicKey().compressed()))
+        .build()
+
+    override fun sign(data: ByteArray): ByteArray =
+        BCECSigner()
+            .sign(keyPair.private.toECPrivateKey(), data.sha256())
+            .encodeAsBTC()
+            .toByteArray()
+}