update protobuf

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.12 (June 03, 2024)
+
+
 ## 1.0.10 (February 17, 2023)
 
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
 
   defaultConfig {
     applicationId "io.arcblock.did.did_wallet_sdk_android"
-    minSdk 21
-    targetSdk 31
+    minSdk 24
+    targetSdk 33
     versionCode 1
     versionName "1.0"
 

config.gradle

@@ -2,9 +2,9 @@ ext {
   def room_version = '1.1.1'
   def work_version = '1.0.0'
   android = [
-    compileSdkVersion: 31,
+    compileSdkVersion: 33,
     buildToolsVersion: "30.0.2",
-    minSdkVersion: 21,
+    minSdkVersion: 24,
     targetSdkVersion: 30,
     versionCode      : 1,
     versionName      : "1.0.0"

protobuf/src/main/proto/state.proto

@@ -209,6 +209,9 @@ message StakeState {
   // Who can slash assets from this stake
   repeated string slashers = 11;
 
+  // Added in v1.18.222
+  string nonce = 12;
+
   StateContext context = 30;
   google.protobuf.Any data = 50;
 }

protobuf/src/main/proto/trace-type.proto

@@ -229,6 +229,7 @@ message IndexedStakeState {
   repeated TokenInfo revoked_tokens = 11;
   repeated string revoked_assets = 12;
   repeated string slashers = 13;
+  string nonce = 14;
   google.protobuf.Any data = 50;
 }
 

protobuf/src/main/proto/tx.proto

@@ -311,7 +311,7 @@ message CreateFactoryTx {
 message StakeTx {
   string address = 1;
 
-  // used to create stake address = createDid(tx.sender, itx.to)
+  // used to create stake address = createDid(tx.sender, itx.to, nonce)
   string receiver = 2;
 
   // Can stake any combination of tokens + assets
@@ -329,6 +329,10 @@ message StakeTx {
   // Who can slash assets from this stake
   repeated string slashers = 7;
 
+  // Added in v1.18.222
+  // extra nonce used to calculate stake address
+  string nonce = 8;
+
   // ocap won't touch this field. Only app shall handle it.
   google.protobuf.Any data = 50;
 }

version

@@ -1 +1 @@
-1.0.11
+1.0.12

wallet-sdk/build.gradle

@@ -43,11 +43,27 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
+
   packagingOptions {
     exclude 'META-INF/rxjava.properties'
     exclude 'lib/x86/*.so'
     exclude 'lib/x86_64/*.so'
   }
+
+  configurations.all {
+    c -> c.resolutionStrategy.eachDependency {
+      DependencyResolveDetails dependency ->
+        if (dependency.requested.group == 'org.bouncycastle') {
+          dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.69'
+        } else if (dependency.requested.group == "com.google.protobuf") {
+          dependency.useTarget 'com.google.protobuf:protobuf-java:3.6.1'
+        }
+    }
+  }
 }
 
 dependencies {