Commit 703208ad authored by Konstantin Munichev's avatar Konstantin Munichev Committed by Lluis Gifre Renom
Browse files

Rewrite DLT service to gRPC

parent bd1af971

proto/dlt_gateway.proto

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ service DltGatewayService { 
  rpc RecordToDlt   (DltRecord                 ) returns (       DltRecordStatus  ) {}

  rpc GetFromDlt    (DltRecordId               ) returns (       DltRecord        ) {}

  rpc SubscribeToDlt(DltRecordSubscription     ) returns (stream DltRecordEvent   ) {}

  rpc GetDltStatus  (context.TeraFlowController) returns (       DltPeerStatus    ) {}  // NEC is checkig if it is possible

  rpc GetDltPeers   (context.Empty             ) returns (       DltPeerStatusList) {}  // NEC is checkig if it is possible

  rpc GetDltStatus  (context.TeraFlowController) returns (       DltPeerStatus    ) {}  // NEC is checking if it is possible

  rpc GetDltPeers   (context.Empty             ) returns (       DltPeerStatusList) {}  // NEC is checking if it is possible

}



enum DltRecordTypeEnum {

src/dlt/gateway/build.gradle.kts

+24 −17
Original line number Diff line number Diff line
@@ -43,15 +43,15 @@ import com.google.protobuf.gradle.plugins 
import com.google.protobuf.gradle.protobuf

import com.google.protobuf.gradle.protoc



ext["grpcVersion"] = "1.46.0"

ext["grpcVersion"] = "1.47.0"

ext["grpcKotlinVersion"] = "1.3.0" // CURRENT_GRPC_KOTLIN_VERSION

ext["protobufVersion"] = "3.20.1"

ext["ktorVersion"] = "1.6.5"



plugins {

    kotlin("jvm") version "1.5.31"

    kotlin("jvm") version "1.6.21"

    kotlin("plugin.serialization") version "1.4.21"

    id("com.google.protobuf") version "0.8.17"

    id("com.google.protobuf") version "0.8.18"

    application

}
@@ -59,24 +59,24 @@ group = "eu.neclab" 
version = "1.0-SNAPSHOT"



repositories {

    mavenLocal()

    google()

    mavenCentral()

}



dependencies {

    testImplementation("org.jetbrains.kotlin:kotlin-test:1.5.31")

    implementation("org.hyperledger.fabric:fabric-gateway-java:2.2.2")

    api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")

    api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")

    api("com.google.protobuf:protobuf-kotlin:${rootProject.ext["protobufVersion"]}")

    implementation("io.ktor:ktor-server-core:${rootProject.ext["ktorVersion"]}")

    implementation("io.ktor:ktor-server-netty:${rootProject.ext["ktorVersion"]}")

    implementation("io.ktor:ktor-serialization:${rootProject.ext["ktorVersion"]}")

    implementation("io.ktor:ktor-client-serialization:${rootProject.ext["ktorVersion"]}")

    implementation("io.ktor:ktor-client-core:${rootProject.ext["ktorVersion"]}")

    implementation("io.ktor:ktor-client-cio:${rootProject.ext["ktorVersion"]}")

    implementation("ch.qos.logback:logback-classic:1.2.5")

    implementation(kotlin("stdlib-jdk8"))

    testImplementation("org.jetbrains.kotlin:kotlin-test:1.6.21")

    implementation("javax.annotation:javax.annotation-api:1.3.2")

    implementation("io.grpc:grpc-kotlin-stub:1.3.0")

    implementation("io.grpc:grpc-protobuf:1.47.0")

    implementation("com.google.protobuf:protobuf-kotlin:3.21.1")

    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3")

    implementation("org.hyperledger.fabric:fabric-gateway-java:2.2.5")

    implementation("ch.qos.logback:logback-classic:1.2.11")

    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")

    implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.3.1")

    runtimeOnly("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")

}



tasks.test {
@@ -102,11 +102,18 @@ sourceSets { 
    main {

        proto {

            srcDir("src/main/kotlin/proto")

            srcDir("../../../proto")

        }

    }

}



sourceSets {

    val main by getting { }

    main.java.srcDirs("build/generated/source/proto/main/grpc")

    main.java.srcDirs("build/generated/source/proto/main/grpckt")

    main.java.srcDirs("build/generated/source/proto/main/java")

    main.java.srcDirs("build/generated/source/proto/main/kotlin")

}



protobuf {

    protoc {

        artifact = "com.google.protobuf:protoc:${rootProject.ext["protobufVersion"]}"

src/dlt/gateway/config/ca.org1.example.com-cert.pem

+8 −8
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIICJjCCAc2gAwIBAgIUWZ4l32loO9+FM0FYw61y3dUF5a0wCgYIKoZIzj0EAwIw

MIICJzCCAc2gAwIBAgIUGgC/inWY+75+oERoZUbGo0YGtV4wCgYIKoZIzj0EAwIw

cDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMQ8wDQYDVQQH

EwZEdXJoYW0xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh

Lm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzA1MDk0NDAwWhcNMzcwNzAxMDk0NDAw

Lm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzEyMDg0MTAwWhcNMzcwNzA4MDg0MTAw

WjBwMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzANBgNV

BAcTBkR1cmhhbTEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMT

Y2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNPg

yfDxHr4ZmFp3HB19f27vfc1YTKBnznLqIFwVad2Y+eXfni8DnTRNGgwdkG9uIK2L

4Y9mwlKG/mTNx629G4GjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG

AQH/AgEBMB0GA1UdDgQWBBSZlT6qe+DAGpEBXyMxzidqCkQ4PjAKBggqhkjOPQQD

AgNHADBEAiAIG5jwBGddB9CwocmjAzFv8+e7+0bvNSwjrG229QogTgIgbTNoC33P

mbR5ChlkUAW2t41hTOCSMIwLAlvEwpeCnAk=

Y2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL9u

lEZaQqSTzwsf5zhWmPPytwiBrhma5wshEEDMeN2D49RgVJjtmSpImrZoucpgAzSU

4ZvZkGQ4CznTp5kLUfSjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG

AQH/AgEBMB0GA1UdDgQWBBSRPP23/S9Hs3Fgddh4NIEhbQ9ExzAKBggqhkjOPQQD

AgNIADBFAiEAv97c3x7fy5gfA+lmSb0XlWD+x1o7i09kGFHYDyFx8UkCIGVugTW6

H4GmqRZJsVM1TbtbS3YUrZ4eVghstBqrhmBz

-----END CERTIFICATE-----

src/dlt/gateway/config/connection-org1.json

+8 −8
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
    },

    "peers": {

        "peer0.org1.example.com": {

            "url": "grpcs://s2:7051",

            "url": "grpcs://teraflow.nlehd.de:7051",

            "tlsCACerts": {

                "pem": "-----BEGIN CERTIFICATE-----\nMIICJjCCAc2gAwIBAgIUWZ4l32loO9+FM0FYw61y3dUF5a0wCgYIKoZIzj0EAwIw\ncDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMQ8wDQYDVQQH\nEwZEdXJoYW0xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh\nLm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzA1MDk0NDAwWhcNMzcwNzAxMDk0NDAw\nWjBwMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzANBgNV\nBAcTBkR1cmhhbTEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMT\nY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNPg\nyfDxHr4ZmFp3HB19f27vfc1YTKBnznLqIFwVad2Y+eXfni8DnTRNGgwdkG9uIK2L\n4Y9mwlKG/mTNx629G4GjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG\nAQH/AgEBMB0GA1UdDgQWBBSZlT6qe+DAGpEBXyMxzidqCkQ4PjAKBggqhkjOPQQD\nAgNHADBEAiAIG5jwBGddB9CwocmjAzFv8+e7+0bvNSwjrG229QogTgIgbTNoC33P\nmbR5ChlkUAW2t41hTOCSMIwLAlvEwpeCnAk=\n-----END CERTIFICATE-----\n"

                "pem": "-----BEGIN CERTIFICATE-----\nMIICJzCCAc2gAwIBAgIUGgC/inWY+75+oERoZUbGo0YGtV4wCgYIKoZIzj0EAwIw\ncDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMQ8wDQYDVQQH\nEwZEdXJoYW0xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh\nLm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzEyMDg0MTAwWhcNMzcwNzA4MDg0MTAw\nWjBwMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzANBgNV\nBAcTBkR1cmhhbTEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMT\nY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL9u\nlEZaQqSTzwsf5zhWmPPytwiBrhma5wshEEDMeN2D49RgVJjtmSpImrZoucpgAzSU\n4ZvZkGQ4CznTp5kLUfSjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG\nAQH/AgEBMB0GA1UdDgQWBBSRPP23/S9Hs3Fgddh4NIEhbQ9ExzAKBggqhkjOPQQD\nAgNIADBFAiEAv97c3x7fy5gfA+lmSb0XlWD+x1o7i09kGFHYDyFx8UkCIGVugTW6\nH4GmqRZJsVM1TbtbS3YUrZ4eVghstBqrhmBz\n-----END CERTIFICATE-----\n"

            },

            "grpcOptions": {

                "ssl-target-name-override": "peer0.org1.example.com",
@@ -34,9 +34,9 @@ 
            }

        },

        "peer0.org2.example.com": {

            "url": "grpcs://s2:9051",

            "url": "grpcs://teraflow.nlehd.de:9051",

            "tlsCACerts": {

                "pem": "-----BEGIN CERTIFICATE-----\nMIICHzCCAcWgAwIBAgIUejv57h6dJkVIM2R1YnlqykkvG7gwCgYIKoZIzj0EAwIw\nbDELMAkGA1UEBhMCVUsxEjAQBgNVBAgTCUhhbXBzaGlyZTEQMA4GA1UEBxMHSHVy\nc2xleTEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eub3Jn\nMi5leGFtcGxlLmNvbTAeFw0yMjA3MDUwOTQ0MDBaFw0zNzA3MDEwOTQ0MDBaMGwx\nCzAJBgNVBAYTAlVLMRIwEAYDVQQIEwlIYW1wc2hpcmUxEDAOBgNVBAcTB0h1cnNs\nZXkxGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2NhLm9yZzIu\nZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASFZqoisCIgZyMM\n8e0YBA+jxH/+Fc4Y4OkEl5uGRXGl9s0OemCdvhlX9K+esX2DVk1st1PMfTEj/six\n9XPpVqzNo0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAd\nBgNVHQ4EFgQUPEyzGBlZEjguoJB16wAmoH2bAh8wCgYIKoZIzj0EAwIDSAAwRQIh\nAL6DAWgrqRtbYoQ0oYAr/2vze0JtQcXoqiQKlyvYkUBbAiB/uSHBk3NwjzI8t8iW\nzQzr5eNy5JwOO0SWwPEv4Ev9iQ==\n-----END CERTIFICATE-----\n"

                "pem": "-----BEGIN CERTIFICATE-----\nMIICHjCCAcWgAwIBAgIUMyzCixoqXQBzqrCTv301KO5Ub3wwCgYIKoZIzj0EAwIw\nbDELMAkGA1UEBhMCVUsxEjAQBgNVBAgTCUhhbXBzaGlyZTEQMA4GA1UEBxMHSHVy\nc2xleTEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eub3Jn\nMi5leGFtcGxlLmNvbTAeFw0yMjA3MTIwODQxMDBaFw0zNzA3MDgwODQxMDBaMGwx\nCzAJBgNVBAYTAlVLMRIwEAYDVQQIEwlIYW1wc2hpcmUxEDAOBgNVBAcTB0h1cnNs\nZXkxGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2NhLm9yZzIu\nZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATpsE9qr9oDDxEZ\nLNDGZduPAslCFl3AY8wC2dURdTJQmn3V/AMeFGiC+a9xEXF5+C/UR/GHE8Cca8/j\nK8GtiM06o0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAd\nBgNVHQ4EFgQUE4+hU1/yQ/NCcqrhtAOcSj3O/3EwCgYIKoZIzj0EAwIDRwAwRAIg\nVDsbCz7hPyZ2tULxWiTUnG0aPg7TBh6lD5mRMObX1vUCIA1kcgFnfMPWA1lJJMRQ\nqGw7ydxYTyZ4X4M1b1PPAa3f\n-----END CERTIFICATE-----\n"

            },

            "grpcOptions": {

                "ssl-target-name-override": "peer0.org2.example.com",
@@ -46,11 +46,11 @@ 
    },

    "certificateAuthorities": {

        "ca.org1.example.com": {

            "url": "https://s2:7054",

            "url": "https://teraflow.nlehd.de:7054",

            "caName": "ca-org1",

            "tlsCACerts": {

                "pem": [

                    "-----BEGIN CERTIFICATE-----\nMIICJjCCAc2gAwIBAgIUWZ4l32loO9+FM0FYw61y3dUF5a0wCgYIKoZIzj0EAwIw\ncDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMQ8wDQYDVQQH\nEwZEdXJoYW0xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh\nLm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzA1MDk0NDAwWhcNMzcwNzAxMDk0NDAw\nWjBwMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzANBgNV\nBAcTBkR1cmhhbTEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMT\nY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNPg\nyfDxHr4ZmFp3HB19f27vfc1YTKBnznLqIFwVad2Y+eXfni8DnTRNGgwdkG9uIK2L\n4Y9mwlKG/mTNx629G4GjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG\nAQH/AgEBMB0GA1UdDgQWBBSZlT6qe+DAGpEBXyMxzidqCkQ4PjAKBggqhkjOPQQD\nAgNHADBEAiAIG5jwBGddB9CwocmjAzFv8+e7+0bvNSwjrG229QogTgIgbTNoC33P\nmbR5ChlkUAW2t41hTOCSMIwLAlvEwpeCnAk=\n-----END CERTIFICATE-----\n"

                    "-----BEGIN CERTIFICATE-----\nMIICJzCCAc2gAwIBAgIUGgC/inWY+75+oERoZUbGo0YGtV4wCgYIKoZIzj0EAwIw\ncDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMQ8wDQYDVQQH\nEwZEdXJoYW0xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh\nLm9yZzEuZXhhbXBsZS5jb20wHhcNMjIwNzEyMDg0MTAwWhcNMzcwNzA4MDg0MTAw\nWjBwMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzANBgNV\nBAcTBkR1cmhhbTEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMT\nY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL9u\nlEZaQqSTzwsf5zhWmPPytwiBrhma5wshEEDMeN2D49RgVJjtmSpImrZoucpgAzSU\n4ZvZkGQ4CznTp5kLUfSjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAG\nAQH/AgEBMB0GA1UdDgQWBBSRPP23/S9Hs3Fgddh4NIEhbQ9ExzAKBggqhkjOPQQD\nAgNIADBFAiEAv97c3x7fy5gfA+lmSb0XlWD+x1o7i09kGFHYDyFx8UkCIGVugTW6\nH4GmqRZJsVM1TbtbS3YUrZ4eVghstBqrhmBz\n-----END CERTIFICATE-----\n"

                ]

            },

            "httpOptions": {
@@ -60,9 +60,9 @@ 
    },

    "orderers": {

        "orderer0.example.com": {

            "url": "grpcs://s2:7050",

            "url": "grpcs://teraflow.nlehd.de:7050",

            "tlsCACerts": {

                "pem": "-----BEGIN CERTIFICATE-----\nMIICCjCCAbGgAwIBAgIURV0KgZTOagIAIU7wRcSg/mKl5RUwCgYIKoZIzj0EAwIw\nYjELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcg\nWW9yazEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1wbGUu\nY29tMB4XDTIyMDcwNTA5NDQwMFoXDTM3MDcwMTA5NDQwMFowYjELMAkGA1UEBhMC\nVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEUMBIGA1UE\nChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1wbGUuY29tMFkwEwYHKoZI\nzj0CAQYIKoZIzj0DAQcDQgAEWrOugtJgVLAKZRw9jaC15RUbVuTm0ZmsqNyiQrKQ\nYawLE6fs+QIU7WQ25fxlYtmGB2S8nofGCDuwaoTevW0GoaNFMEMwDgYDVR0PAQH/\nBAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFLKBzGXaQg2Irr57\npjoFYZ9F1NoNMAoGCCqGSM49BAMCA0cAMEQCIB1YdgOEsATw2GeaFmq6nqWg0JDT\np456JB/reFmnPWdJAiBPo5H9sMh+MpP4R5ue7nuwYK7SEJ1DOJqWMlPuNhVgtA==\n-----END CERTIFICATE-----\n"

                "pem": "-----BEGIN CERTIFICATE-----\nMIICCjCCAbGgAwIBAgIULAsUlO5yAbjj/6xnDbyiWeoj6rkwCgYIKoZIzj0EAwIw\nYjELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcg\nWW9yazEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1wbGUu\nY29tMB4XDTIyMDcxMjA4NDAwMFoXDTM3MDcwODA4NDAwMFowYjELMAkGA1UEBhMC\nVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEUMBIGA1UE\nChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1wbGUuY29tMFkwEwYHKoZI\nzj0CAQYIKoZIzj0DAQcDQgAEjwa9/lOenYmcYL+Kqns6lV+UFt8+3tKZHlcwogZf\ngYnBEbsdL9oTZXSFgIvpCpQee65KKFUl7SqMDXrO3Mg0hqNFMEMwDgYDVR0PAQH/\nBAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFPuDBFVg+lhySQO0\nICEnNQ/TzRXeMAoGCCqGSM49BAMCA0cAMEQCIEadLxytDs79F5qTrTuI6SdaFoLB\n6AoQ5VGUNm2mF8tGAiAlWrLs8g3Ni2c7cjFeHZfiFy/2pqJLtor1ieGlFslq1w==\n-----END CERTIFICATE-----\n"

            },

            "grpcOptions": {

                "ssl-target-name-override": "orderer0.example.com",

src/dlt/gateway/settings.gradle.kts

+1 −1
Original line number Diff line number Diff line 


rootProject.name = "dlt"

rootProject.name = "gateway"