Merge branch 'iroha2-dev' into allure_ids

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+
+updates:
+  - package-ecosystem: "docker"
+    target-branch: "iroha2-dev"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    target-branch: "iroha2-dev"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gradle"
+    target-branch: "iroha2-dev"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/iroha2-ci.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 16
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '16'
         distribution: 'temurin'
     - name: Validate Gradle wrapper
       uses: gradle/wrapper-validation-action@v1

.github/workflows/iroha2-pr.yml

@@ -9,12 +9,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 16
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          java-version: '16'
+          distribution: 'temurin'
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

.github/workflows/iroha2.yml

@@ -9,12 +9,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 16
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          java-version: '16'
+          distribution: 'temurin'
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

MAINTAINERS.md

@@ -0,0 +1 @@
+See [MAINTAINERS.md](https://github.com/hyperledger/iroha/blob/iroha2-dev/MAINTAINERS.md) in the Iroha repository.

README.md

@@ -5,7 +5,7 @@
 
 The repository contains the client library of [Hyperledger Iroha2](https://github.com/hyperledger/iroha2) written in Kotlin. This includes:
 
-- [x] [SDK](./modules/client) to work with Iroha2 API
+- [x] [client](./modules/client) to work with Iroha2 API
 - [x] [admin-client](./modules/admin-client/) with Iroha2Client extension
 - [x] [codegen](./modules/codegen) to generate models into [model](./modules/model) by Iroha2 schema
 - [x] [model](./modules/model) with models generated by [codegen](./modules/codegen)

build.gradle

@@ -14,7 +14,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version "$kotlinVer"
     id 'org.jmailen.kotlinter' version "$kotlinLinterVer"
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 allprojects {
@@ -58,6 +58,10 @@ subprojects {
     }
 
     java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(8)
+        }
+
         withJavadocJar()
         withSourcesJar()
     }
@@ -70,23 +74,18 @@ subprojects {
     compileKotlin {
         kotlinOptions {
             freeCompilerArgs = ["-Xjsr305=strict"]
-            jvmTarget = 1.8
         }
     }
 
     compileTestKotlin {
         kotlinOptions {
             freeCompilerArgs = ["-Xjsr305=strict"]
-            jvmTarget = 1.8
         }
     }
 
     kotlinter {
         ignoreFailures = false
-        indentSize = 4
         reporters = ['checkstyle', 'plain']
-        experimentalRules = false
-        disabledRules = ['no-consecutive-blank-lines']
     }
 
     shadowJar {

docker-compose/docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   iroha:
-    image: hyperledger/iroha2:dev-nightly-94aebf4ee05d8527eac8866898c629cc66b8b9dc
+    image: hyperledger/iroha2:dev-nightly-0a9fc8ede7a126da87628ae306a845a29f89094c
     environment:
       TORII_P2P_ADDR: iroha:1337
       TORII_API_URL: iroha:8080
@@ -14,14 +14,15 @@ services:
       IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
       WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
     ports:
+      - "1337:1337"
       - "8080:8080"
       - "8180:8180"
     volumes:
       - "../modules/test-tools/src/main/resources:/config"
     command: iroha --submit-genesis
 
   iroha1:
-    image: hyperledger/iroha2:dev-nightly-94aebf4ee05d8527eac8866898c629cc66b8b9dc
+    image: hyperledger/iroha2:dev-nightly-0a9fc8ede7a126da87628ae306a845a29f89094c
     environment:
       TORII_P2P_ADDR: iroha1:1338
       TORII_API_URL: iroha1:8081
@@ -33,13 +34,14 @@ services:
       IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
       WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
     ports:
-      - "8081:8080"
-      - "8181:8180"
+      - "1338:1338"
+      - "8081:8081"
+      - "8181:8181"
     volumes:
       - "../modules/test-tools/src/main/resources:/config"
 
   iroha2:
-    image: hyperledger/iroha2:dev-nightly-94aebf4ee05d8527eac8866898c629cc66b8b9dc
+    image: hyperledger/iroha2:dev-nightly-0a9fc8ede7a126da87628ae306a845a29f89094c
     environment:
       TORII_P2P_ADDR: iroha2:1339
       TORII_API_URL: iroha2:8082
@@ -51,13 +53,14 @@ services:
       IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
       WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
     ports:
-      - "8082:8080"
-      - "8182:8180"
+      - "1339:1339"
+      - "8082:8082"
+      - "8182:8182"
     volumes:
       - "../modules/test-tools/src/main/resources:/config"
 
   iroha3:
-    image: hyperledger/iroha2:dev-nightly-94aebf4ee05d8527eac8866898c629cc66b8b9dc
+    image: hyperledger/iroha2:dev-nightly-0a9fc8ede7a126da87628ae306a845a29f89094c
     environment:
       TORII_P2P_ADDR: iroha3:1340
       TORII_API_URL: iroha3:8083
@@ -69,7 +72,8 @@ services:
       IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
       WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
     ports:
-      - "8083:8080"
-      - "8183:8180"
+      - "1340:1340"
+      - "8083:8083"
+      - "8183:8183"
     volumes:
       - "../modules/test-tools/src/main/resources:/config"

gradle.properties

@@ -1,20 +1,20 @@
 # kotlin
-kotlinVer=1.6.0
-kotlinLinterVer=3.9.0
-ktorVer=2.0.1
-coroutinesVer=1.6.0
+kotlinVer=1.8.22
+kotlinLinterVer=3.15.0
+ktorVer=2.3.2
+coroutinesVer=1.7.2
 # json serde
-jacksonKotlinVer=2.13.0
+jacksonKotlinVer=2.15.2
 # codegen
-kotlinPoetVer=1.9.0
+kotlinPoetVer=1.14.2
 # crypto
-bouncyCastleVer=1.68
+bouncyCastleVer=1.70
 i2pCryptoEddsa=0.3.0
 multihashVersion=1.3.0
-googleTinkVer=1.6.1
+googleTinkVer=1.9.0
 # testing
-testContainersVer=1.15.3
-junitVersion=5.8.1
+testContainersVer=1.18.3
+junitVersion=5.9.3
 # logging
 logbackVer=1.2.3
 org.gradle.jvmargs=-XX:MetaspaceSize=128M -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists