2.1.22

Houn · Houn · commit afb2bf33eea9 · 2024-11-28T23:14:01.000+08:00
diff --git a/particle-aa/CHANGELOG.md b/particle-aa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.22
+
+## 2.1.21
+
 ## 2.1.20
 
 ## 2.1.10
diff --git a/particle-aa/android/build.gradle b/particle-aa/android/build.gradle
@@ -54,7 +54,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    def sdkVersion = "2.1.20"
+    def sdkVersion = "2.1.21"
     implementation("network.particle:aa-service:$sdkVersion")
     implementation("com.github.xxhong:CollectsPkg:2.1.0")
     implementation("commons-codec:commons-codec:1.15")
diff --git a/particle-aa/example/pubspec.yaml b/particle-aa/example/pubspec.yaml
@@ -27,9 +27,9 @@ dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
 
-  particle_connect: ^2.1.20
-  particle_base: ^2.1.20
-  particle_auth_core: ^2.1.20
+  particle_connect: ^2.1.22
+  particle_base: ^2.1.22
+  particle_auth_core: ^2.1.22
   # particle_auth_core: ^2.0.0
   #  path: ../../particle-auth-core/
   # particle_connect: ^2.0.0
diff --git a/particle-aa/pubspec.yaml b/particle-aa/pubspec.yaml
@@ -1,6 +1,6 @@
 name: particle_aa
 description: A flutter plugin project for particle aa
-version: 2.1.20
+version: 2.1.22
 homepage: https://particle.network
 
 environment:
@@ -12,7 +12,7 @@ dependencies:
       sdk: flutter
   plugin_platform_interface: ^2.1.6
 
-  particle_base: ^2.1.20
+  particle_base: ^2.1.22
 
 #   particle_base: ^2.0.0
 #    path: ../particle-base/
diff --git a/particle-auth-core/CHANGELOG.md b/particle-auth-core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.22
+
+## 2.1.21
+
 ## 2.1.20
 
 ## 2.1.10
diff --git a/particle-auth-core/pubspec.yaml b/particle-auth-core/pubspec.yaml
@@ -1,6 +1,6 @@
 name: particle_auth_core
 description: A flutter plugin project for particle auth core
-version: 2.1.20
+version: 2.1.22
 homepage: https://particle.network
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   plugin_platform_interface: ^2.1.6
-  particle_base: ^2.1.20
+  particle_base: ^2.1.22
   # particle_base: ^2.0.0
   #  path: ../particle-base/
 
diff --git a/particle-base/CHANGELOG.md b/particle-base/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.22
+
+## 2.1.21
+
 ## 2.1.20
 
 ## 2.1.10
diff --git a/particle-base/android/build.gradle b/particle-base/android/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-    def sdkVersion = "2.1.20"
+    def sdkVersion = "2.1.21"
     implementation("network.particle:base-service:$sdkVersion")
     implementation("com.github.xxhong:CollectsPkg:2.1.0")
     implementation("commons-codec:commons-codec:1.15")
diff --git a/particle-base/pubspec.yaml b/particle-base/pubspec.yaml
@@ -1,6 +1,6 @@
 name: particle_base
 description: A flutter plugin project for particle base
-version: 2.1.20
+version: 2.1.22
 homepage: https://particle.network
 
 environment:
diff --git a/particle-connect/CHANGELOG.md b/particle-connect/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.22
+
+## 2.1.21
+
 ## 2.1.20
 
 ## 2.1.10
diff --git a/particle-connect/android/build.gradle b/particle-connect/android/build.gradle
@@ -51,7 +51,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    def sdkVersion = "2.1.20"
+    def sdkVersion = "2.1.21"
     api("network.particle:base-service:$sdkVersion")
     api("network.particle:auth-service:$sdkVersion")
 
diff --git a/particle-connect/android/src/main/kotlin/network/particle/connect_plugin/module/ConnectBridge.kt b/particle-connect/android/src/main/kotlin/network/particle/connect_plugin/module/ConnectBridge.kt
@@ -543,8 +543,9 @@ object ConnectBridge {
             )
             return
         }
-        val typedData = MessageProcess.start(signData.message)
-        connectAdapter.signTypedData(signData.publicAddress, typedData, object : SignCallback {
+        val typedData = MessageProcess.processTypedData(signData.message)
+        val escapedJson = typedData.replace("\"", "\\\"")
+        connectAdapter.signTypedData(signData.publicAddress, escapedJson, object : SignCallback {
             override fun onError(error: ConnectError) {
                 LogUtils.d("onError", error.toString())
                 result.success(
diff --git a/particle-connect/android/src/main/kotlin/network/particle/connect_plugin/utils/MessageProcess.kt b/particle-connect/android/src/main/kotlin/network/particle/connect_plugin/utils/MessageProcess.kt
@@ -17,6 +17,20 @@ object MessageProcess {
 
     }
 
+
+    fun processTypedData(message: String): String {
+        return if (ParticleNetwork.isEvmChain()) {
+            if (isHexadecimal(message)) {
+                String(com.particle.base.utils.HexUtils.decode(com.particle.base.utils.HexUtils.removePrefix(message)))
+            } else {
+                message
+            }
+        } else {
+            com.particle.base.utils.Base58Utils.encode(message.toByteArray(Charsets.UTF_8))
+        }
+
+    }
+
     private fun isHexadecimal(input: String): Boolean {
         val regex = Regex("[0-9A-Fa-f]+")
         return input.isNotEmpty() && input.startsWith("0x") && input.substring(2).matches(regex)
diff --git a/particle-connect/pubspec.yaml b/particle-connect/pubspec.yaml
@@ -1,6 +1,6 @@
 name: particle_connect
 description: A flutter plugin project for particle connect
-version: 2.1.20
+version: 2.1.22
 homepage: https://particle.network/
 
 environment:
@@ -11,8 +11,8 @@ dependencies:
   flutter:
     sdk: flutter
   plugin_platform_interface: ^2.1.6
-  particle_base: ^2.1.20
-  particle_auth_core: ^2.1.20
+  particle_base: ^2.1.22
+  particle_auth_core: ^2.1.22
   # particle_base: ^2.0.0
   #  path: ../particle-base/
   # particle_auth_core: ^2.0.0
diff --git a/particle-wallet/CHANGELOG.md b/particle-wallet/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.22
+
+## 2.1.21
+
 ## 2.1.20
 
 ## 2.1.10
diff --git a/particle-wallet/android/build.gradle b/particle-wallet/android/build.gradle
@@ -59,7 +59,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    def sdkVersion = "2.1.20"
+    def sdkVersion = "2.1.21"
     implementation("network.particle:auth-service:$sdkVersion")
     implementation("network.particle:api-service:$sdkVersion")
     implementation("network.particle:wallet-service:$sdkVersion") {
diff --git a/particle-wallet/pubspec.yaml b/particle-wallet/pubspec.yaml
@@ -1,6 +1,6 @@
 name: particle_wallet
 description: A flutter plugin project for particle wallet
-version: 2.1.20
+version: 2.1.22
 homepage: https://particle.network
 
 environment:
@@ -10,9 +10,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  particle_connect: ^2.1.20
-  particle_auth_core: ^2.1.20
-  particle_base: ^2.1.20
+  particle_connect: ^2.1.22
+  particle_auth_core: ^2.1.22
+  particle_base: ^2.1.22
 
   plugin_platform_interface: ^2.1.6
 
diff --git a/pub.py b/pub.py
@@ -158,8 +158,8 @@ def publish(self):
 
 
 if __name__ == "__main__":
-    version = '2.1.20'
-    sleep_time = 30
+    version = '2.1.22'
+    sleep_time = 60
     print("Base Start")
     ParticleAuth(version).publish()
     print("Base Finish")

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- def sdkVersion = "2.1.20"`
	`52`	`+ def sdkVersion = "2.1.21"`
`53`	`53`	`implementation("network.particle:base-service:$sdkVersion")`
`54`	`54`	`implementation("com.github.xxhong:CollectsPkg:2.1.0")`
`55`	`55`	`implementation("commons-codec:commons-codec:1.15")`