Merge pull request #272 from 0xcregis/271-fix-anychain-kms-eliminate-…

…gbk-encoding-for-zh-cn-mnemonic fix: remove GBK encoding for zh-cn mnemonic
0xcregis · Aug 19, 2024 · 34c0bda · 34c0bda
2 parents 34d98eb + 82accdf
commit 34c0bda
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/anychain-kms/Cargo.toml b/anychain-kms/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "anychain-kms"
 description = "A Rust library providing Key Management Schema for AnyChain. Handles general security and signature algorithms."
-version = "0.1.9"
+version = "0.1.10"
 keywords = ["cryptography", "security", "signature", "algorithm"]
 
 # Workspace inherited keys

diff --git a/anychain-kms/src/bip39/mnemonic.rs b/anychain-kms/src/bip39/mnemonic.rs
@@ -6,7 +6,7 @@ use super::MnemonicType;
 use anyhow::Error;
 // use encoding::codec::simpchinese::*;
 // use encoding::Encoding;
-use encoding_rs::GB18030;
+// use encoding_rs::GB18030;
 use std::fmt;
 use std::mem;
 use unicode_normalization::UnicodeNormalization;
@@ -265,19 +265,20 @@ impl Mnemonic {
     }
 
     pub fn as_bytes(&self) -> Vec<u8> {
-        //use GBK encoding if language is zh-cn
-        if self.lang == Language::ChineseSimplified {
-            // let mut d = GB18030_ENCODING.raw_encoder();
-            // let mut d = encoding_rs::GB18030;
-            // d.raw_feed(&self.phrase, &mut bytes);
-            let mut d = GB18030.new_encoder();
-            let mut bytes = Vec::<u8>::new();
-            let (_complete, _read, _written, _) =
-                d.encode_from_utf8(&self.phrase, &mut bytes, true);
-            bytes
-        } else {
-            self.phrase().as_bytes().to_vec()
-        }
+        // // use GBK encoding if language is zh-cn
+        // if self.lang == Language::ChineseSimplified {
+        //     // let mut d = GB18030_ENCODING.raw_encoder();
+        //     // let mut d = encoding_rs::GB18030;
+        //     // d.raw_feed(&self.phrase, &mut bytes);
+        //     let mut d = GB18030.new_encoder();
+        //     let mut bytes = Vec::<u8>::new();
+        //     let (_complete, _read, _written, _) =
+        //         d.encode_from_utf8(&self.phrase, &mut bytes, true);
+        //     bytes
+        // } else {
+        //     self.phrase().as_bytes().to_vec()
+        // }
+        self.phrase().as_bytes().to_vec()
     }
 }